From 3c0443a9d366ee64fcc1cb1561e17dbcc68bb2bc Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 15 Apr 2010 14:57:22 +0530
Subject: [PATCH 01/84] [IMP] product:convert the price_list wizard into
 osv_memory wizard

bzr revid: sbh@tinyerp.com-20100415092722-snzdrw61zoolk367
---
 addons/product/__terp__.py                   |  2 +-
 addons/product/product_wizard.xml            | 11 ----
 addons/product/wizard/__init__.py            |  2 +-
 addons/product/wizard/product_price.py       | 67 ++++++++++++++++++++
 addons/product/wizard/product_price_view.xml | 33 ++++++++++
 addons/product/wizard/wizard_price.py        | 59 -----------------
 6 files changed, 102 insertions(+), 72 deletions(-)
 delete mode 100644 addons/product/product_wizard.xml
 create mode 100644 addons/product/wizard/product_price.py
 create mode 100644 addons/product/wizard/product_price_view.xml
 delete mode 100644 addons/product/wizard/wizard_price.py

diff --git a/addons/product/__terp__.py b/addons/product/__terp__.py
index 4128e992c82..b3e18ced10a 100644
--- a/addons/product/__terp__.py
+++ b/addons/product/__terp__.py
@@ -49,13 +49,13 @@
     'update_xml': [
         'security/product_security.xml',
         'security/ir.model.access.csv',
+        'wizard/product_price_view.xml',
         'product_data.xml',
         'product_report.xml',
         'product_view.xml',
         'pricelist_view.xml',
         'partner_view.xml',
         'company_view.xml',
-        'product_wizard.xml',
         'process/product_process.xml'
     ],
     'installable': True,
diff --git a/addons/product/product_wizard.xml b/addons/product/product_wizard.xml
deleted file mode 100644
index f226cd4e543..00000000000
--- a/addons/product/product_wizard.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-	<data>
-	<wizard
-			 id="report_wizard_price"
-			 string="Price List"
-			 model="product.product"
-			 name="product.price_list"
-			 keyword="client_print_multi"/>
-	</data>
-</openerp>
diff --git a/addons/product/wizard/__init__.py b/addons/product/wizard/__init__.py
index fed1bcf3783..47f5f2641fc 100644
--- a/addons/product/wizard/__init__.py
+++ b/addons/product/wizard/__init__.py
@@ -18,7 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-import wizard_price
+import product_price
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/product/wizard/product_price.py b/addons/product/wizard/product_price.py
new file mode 100644
index 00000000000..e5d73945c13
--- /dev/null
+++ b/addons/product/wizard/product_price.py
@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+  
+
+class product_price_list(osv.osv_memory):
+    _name = 'product.price_list'
+    _description = 'Product Price List'
+
+    _columns = {
+        'price_list': fields.many2one('product.pricelist', 'PriceList', required=True),
+        'qty1': fields.integer('Quantity-1'),
+        'qty2': fields.integer('Quantity-2'),
+        'qty3': fields.integer('Quantity-3'),
+        'qty4': fields.integer('Quantity-4'),
+        'qty5': fields.integer('Quantity-5'),
+    }
+    _defaults = {
+        'qty1': lambda *a: 0,
+        'qty2': lambda *a: 0,
+        'qty3': lambda *a: 0,
+        'qty4': lambda *a: 0,
+        'qty5': lambda *a: 0,
+    }
+
+    def print_report(self, cr, uid, ids, context=None):
+
+        """
+              To get the date and print the report
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary
+             @return : return report
+        """
+        datas = {'ids': context.get('active_ids', [])}
+        res = self.read(cr, uid, ids, ['price_list','qty1', 'qty2','qty3','qty4','qty5'], context)
+        res = res and res[0] or {}
+        datas['form'] = res
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'product.pricelist',
+            'datas': datas,
+       }
+product_price_list()        
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
new file mode 100644
index 00000000000..17d9010ed43
--- /dev/null
+++ b/addons/product/wizard/product_price_view.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+    <!--   Product Price List -->
+
+		<record id="view_product_price_list" model="ir.ui.view">
+		      <field name="name">Price List</field>
+		      <field name="model">product.price_list</field>
+		      <field name="type">form</field>
+		      <field name="arch" type="xml">
+				<form string="Price list">
+				    <field name="price_list" />
+				    <field name="qty1" colspan="2" />
+				    <field name="qty2" colspan="2" />
+				    <field name="qty3" colspan="2" />
+				    <field name="qty4" colspan="2" />
+				    <field name="qty5" colspan="2" />
+					<button icon='gtk-cancel' special="cancel"
+				                  string="Close" />
+					<button name="print_report" string="Print Report"
+				                  colspan="1" type="object" icon="gtk-print" />
+				</form>
+		      </field>
+    	</record>
+
+        <act_window id="action_product_price_list"
+    		key2="client_action_multi" name="Price List"
+    		res_model="product.price_list" src_model="product.product"
+    		view_mode="form" target="new" view_type="form" />
+
+</data>
+</openerp>
diff --git a/addons/product/wizard/wizard_price.py b/addons/product/wizard/wizard_price.py
deleted file mode 100644
index 12c810b802d..00000000000
--- a/addons/product/wizard/wizard_price.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-
-qty1_form = '''<?xml version="1.0"?>
-<form string="Price list">
-    <field name="price_list" />
-    <field name="qty1" colspan="2" />
-    <field name="qty2" colspan="2" />
-    <field name="qty3" colspan="2" />
-    <field name="qty4" colspan="2" />
-    <field name="qty5" colspan="2" />
-
-</form>'''
-qty1_fields = {
-        'price_list' : {'string' : 'PriceList', 'type' : 'many2one', 'relation' : 'product.pricelist', 'required':True },
-        'qty1': {'string':'Quantity-1', 'type':'integer', 'default':0},
-        'qty2': {'string':'Quantity-2', 'type':'integer', 'default':0},
-        'qty3': {'string':'Quantity-3', 'type':'integer', 'default':0},
-        'qty4': {'string':'Quantity-4', 'type':'integer', 'default':0},
-        'qty5': {'string':'Quantity-5', 'type':'integer', 'default':0},
-}
-
-
-class wizard_qty(wizard.interface):
-
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'form', 'arch':qty1_form, 'fields':qty1_fields, 'state':[('end','Cancel'),('price','Print')]}
-        },
-        'price': {
-            'actions': [],
-            'result': {'type':'print', 'report':'product.pricelist', 'state':'end'}
-        }
-
-    }
-wizard_qty('product.price_list')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From e40bbfcbd2326d30334ad6bf201026545b7c40b7 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 15 Apr 2010 18:33:34 +0530
Subject: [PATCH 02/84] [Add] POS:Add the search view

bzr revid: sbh@tinyerp.com-20100415130334-oci5n62z2objgw66
---
 addons/point_of_sale/pos_view.xml | 40 +++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 828af84636a..617060e060d 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -144,6 +144,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_pos_pos_form"/>
             <field name="domain">[['date_order','>=',time.strftime('%Y-%m-%d')]]</field>
+            <field name="search_view_id" ref="view_pos_order_filter"/>	  
         </record>
 
 
@@ -165,6 +166,32 @@
                 </tree>
             </field>
         </record>
+        <record id="view_pos_order_filter" model="ir.ui.view">
+            <field name="name">pos.order.list.select</field>
+            <field name="model">pos.order</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Sales Order">
+                    <filter icon="terp-sale" string="Quotations" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-sale" string="Running" domain="[('state','in',('payment','advance'))]"/>
+                    <separator orientation="vertical"/>
+                    <field name="name" select="1"/>
+                    <field name="partner_id" select="1"/>
+                    <field name="user_id" select="1" widget="selection">
+                        <filter icon="terp-partner" string="My Sale" domain="[('user_id','=',uid)]" help="My Sale Orders" />
+                    </field>
+                    <field name="date_order" select="1" string="Order date" />
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="11" col="11">
+                        <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
+                        <filter string="Salesman" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
+                    </group>
+               </search>
+            </field>
+        </record>
+        
         <menuitem name="Point of Sale" id="menu_point_root" sequence="10"/>
         <menuitem name="Point of Sale" id="menu_point_of_sale" parent="menu_point_root" sequence="1" />
         <menuitem name="Sales Order" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1"/>
@@ -176,8 +203,11 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.order</field>
             <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_pos_order_tree"/>
             <field name="domain">['|',('state_2','=','to_verify'),('state','=','advance')]</field>
+			<field name="search_view_id" ref="view_pos_order_filter"/>	             
+ 				           
         </record>
 invoiced
 
@@ -189,6 +219,8 @@ invoiced
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_pos_order_tree"/>
             <field name="domain">[('state','!=', 'invoiced')]</field>
+			<field name="search_view_id" ref="view_pos_order_filter"/>	             
+		    	             
         </record>
         <menuitem name="Invoicing" id="menu_point_of_sale_invoicing" parent="menu_point_root" sequence="4" />
 		<menuitem name="Sales to Invoice" action="action_pos_order_tobinvoiced" id="menu_point_of_sale_tobinvoiced" parent="menu_point_of_sale_invoicing"/>
@@ -198,8 +230,8 @@ invoiced
             <field name="res_model">pos.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_pos_order_tree"/>
             <field name="domain">[('state','=', 'paid')]</field>
+ 			<field name="search_view_id" ref="view_pos_order_filter"/>	               
         </record>
         <record model="ir.actions.act_window" id="action_pos_order_tree2">
             <field name="name">Point of Sale</field>
@@ -207,8 +239,8 @@ invoiced
             <field name="res_model">pos.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_pos_order_tree"/>
             <field name="domain">[('date_order','&lt;=', time.strftime('%Y-%m-%d 23:59:59'))]</field>
+ 			<field name="search_view_id" ref="view_pos_order_filter"/>	               
         </record>
 
 <!--        <menuitem name="Orders of the day" parent="menu_point_ofsale" id="menu_action_pos_order_tree2" action="action_pos_order_tree2"/-->
@@ -219,7 +251,7 @@ invoiced
             <field name="res_model">pos.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_pos_order_tree"/>
+			<field name="search_view_id" ref="view_pos_order_filter"/>            
         </record>
 <!--        <menuitem name="All orders" parent="menu_point_ofsale" id="menu_action_pos_order_tree3" action="action_pos_order_tree3"/-->
 
@@ -229,7 +261,7 @@ invoiced
             <field name="res_model">pos.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
-            <field name="view_id" ref="view_pos_pos_form"/>
+			<field name="search_view_id" ref="view_pos_order_filter"/>            
         </record>
 
         <record model="ir.ui.view" id="view_pos_order_line">

From d5d3a0bb0a3d5d29abdd1cb791f16ddcdeb9aa17 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 20 Apr 2010 19:06:28 +0530
Subject: [PATCH 03/84] [IMP] point_of_sale:remove the account_receivable in
 res.company and contact_mode_id

bzr revid: sbh@tinyerp.com-20100420133628-rzr9rneiutktgdhs
---
 addons/point_of_sale/pos.py                   | 26 -------------
 addons/point_of_sale/pos_view.xml             | 38 -------------------
 .../security/ir.model.access.csv              |  1 -
 .../point_of_sale/singer_statement_demo.xml   | 11 ------
 4 files changed, 76 deletions(-)

diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index c87efa486b3..d064e6555cf 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -43,30 +43,6 @@ class pos_config_journal(osv.osv):
     }
 
 pos_config_journal()
-
-class res_mode_contact(osv.osv):
-
-    """ Contact mode for Partner  """    
-    
-    _name = "res.mode.contact"
-    _description = "Contact mode"
-    
-    _columns={
-        'name': fields.char('Mode', size=64, select=1),
-        'active': fields.boolean('Active', select=2),
-    }
-res_mode_contact()
-
-class contact_mode_partner(osv.osv):
-
-  
-    _inherit = 'res.partner'
-    _columns = {
-        'contact_mode_id': fields.many2one('res.mode.contact','Contact Mode'),
-     }
-contact_mode_partner()
-
-
 class pos_company_discount(osv.osv):
   
     """ Company Discount and Cashboxes """   
@@ -75,8 +51,6 @@ class pos_company_discount(osv.osv):
     _columns = {
         'company_discount': fields.float('Max Discount(%)', digits=(16,2)),
         'max_diff': fields.float('Max Difference for Cashboxes', digits=(16,2)),
-        'account_receivable': fields.many2one('account.account',
-            'Default Receivable', states={'draft': [('readonly', False)]}),
      }
 
 pos_company_discount()
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 617060e060d..b69bc04e8a2 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -144,7 +144,6 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_pos_pos_form"/>
             <field name="domain">[['date_order','>=',time.strftime('%Y-%m-%d')]]</field>
-            <field name="search_view_id" ref="view_pos_order_filter"/>	  
         </record>
 
 
@@ -695,47 +694,10 @@ invoiced
                     <page string="Other">
                       <field  name="company_discount" colspan="4"/>
                       <field  name="max_diff" colspan="4"/>
-                      <field  name="account_receivable" required="1" colspan="4"/>
                     </page>
                 </notebook>
         	</field>
        	</record>
-
-
-        <record model="ir.ui.view" id="form_mode_p_contact">
-            <field name="name">Contact Mode</field>
-            <field name="model">res.mode.contact</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-             <form string="Contact Mode">
-                    <field  name="name" select="1"/>
-                    <field  name="active" select="2"/>
-              </form>
-            </field>
-          </record>
-
-        <record model="ir.ui.view" id="tree_mode_p_contact">
-            <field name="name">Contact Mode</field>
-            <field name="model">res.mode.contact</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-             <tree string="Contact Mode">
-                    <field  name="name"/>
-                    <field  name="active"/>
-              </tree>
-            </field>
-          </record>
-
-        <record model="ir.actions.act_window" id="action_mode_p">
-            <field name="name">Contact Mode</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.mode.contact</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <menuitem name="Contact Mode" parent="base.menu_base_config" action="action_mode_p" id="menu_mode_po"/>
-
         <record model="ir.ui.view" id="view_partner_contact">
             <field name="name">view.partner.contact</field>
             <field name="model">res.partner</field>
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index 0cfc0fae9b7..599df9581ee 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -13,7 +13,6 @@
 "access_sale_shop_pos_user","sale.shop pos_user","sale.model_sale_shop","point_of_sale.group_pos_user",1,0,0,0
 "access_pos_order_stock_worker","pos.order stock_worker","model_pos_order","stock.group_stock_user",1,0,0,0
 "access_stock_move_pos_user","stock.move pos_user","stock.model_stock_move","point_of_sale.group_pos_user",1,1,1,1
-"access_res_mode_contact","res.mode.contact","model_res_mode_contact","point_of_sale.group_pos_user",1,0,0,0
 "access_report_sales_by_user_pos","report.sales.by.user.pos","model_report_sales_by_user_pos","point_of_sale.group_pos_user",1,0,0,0
 "access_report_sales_by_user_pos_month","report.sales.by.user.pos.month","model_report_sales_by_user_pos_month","point_of_sale.group_pos_user",1,0,0,0
 "access_report_sales_by_margin_pos","report.sales.by.margin.pos","model_report_sales_by_margin_pos","point_of_sale.group_pos_user",1,0,0,0
diff --git a/addons/point_of_sale/singer_statement_demo.xml b/addons/point_of_sale/singer_statement_demo.xml
index edc8299c609..68f889cddee 100644
--- a/addons/point_of_sale/singer_statement_demo.xml
+++ b/addons/point_of_sale/singer_statement_demo.xml
@@ -316,17 +316,6 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
 
-        <record id="base.main_company" model="res.company">
-            <field name="account_receivable" ref="account.a_recv"/>
-        </record>
-          <record id="point_of_sale.pos_order_posadvance" model="pos.order">
-      <field name="sale_journal" ref="sales_journal_comp2"/>
-    </record>
-
-
-        <record id="base.main_company" model="res.company">
-            <field name="account_receivable" ref="account.a_recv"/>
-        </record>
           <record id="point_of_sale.pos_order_posadvance" model="pos.order">
       <field name="sale_journal" ref="sales_journal_comp2"/>
     </record>

From f36d5eb94e3464f056b9159579862f06ee70842a Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 20 Apr 2010 19:20:58 +0530
Subject: [PATCH 04/84] [IMP] point_of_sale:rename the field

bzr revid: sbh@tinyerp.com-20100420135058-9cjehpszb5nam3ww
---
 addons/point_of_sale/pos.py                  | 26 ++++++++++----------
 addons/point_of_sale/pos_view.xml            | 12 ++++-----
 addons/point_of_sale/report/pos_receipt.rml  |  2 +-
 addons/point_of_sale/wizard/wizard_return.py |  2 +-
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index d064e6555cf..9ae385cff3c 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -123,7 +123,7 @@ class pos_order(osv.osv):
         tot =0.0
         val=None
         for order in self.browse(cr, uid, ids):
-            cr.execute("select date_payment2 from pos_order where id=%d"%(order.id))
+            cr.execute("select date_payment from pos_order where id=%d"%(order.id))
             date_p=cr.fetchone()
             date_p=date_p and date_p[0] or None
             if date_p:
@@ -150,7 +150,7 @@ class pos_order(osv.osv):
         tot =0.0
         val=None
         for order in self.browse(cr, uid, ids):
-            cr.execute("select date_payment from pos_order where id=%d"%(order.id))
+            cr.execute("select date_validation from pos_order where id=%d"%(order.id))
             date_p=cr.fetchone()
             date_p=date_p and date_p[0] or None
             if date_p:
@@ -316,12 +316,12 @@ class pos_order(osv.osv):
         'shop_id': fields.many2one('sale.shop', 'Shop', required=True,
             states={'draft': [('readonly', False)]}, readonly=True),
         'date_order': fields.datetime('Date Ordered', readonly=True),
-        'date_payment': fields.function(_get_date_payment, method=True, string='Validation Date', type='date',  store=True),
-        'date_payment2': fields.function(_get_date_payment2, method=True, string='Payment Date', type='date',  store=True),
+        'date_validation': fields.function(_get_date_payment, method=True, string='Validation Date', type='date',  store=True),
+        'date_payment': fields.function(_get_date_payment2, method=True, string='Payment Date', type='date',  store=True),
         'date_validity': fields.date('Validity Date', required=True),
         'user_id': fields.many2one('res.users', 'Connected Salesman', readonly=True),
-        'user_id1': fields.many2one('res.users', 'Salesman', required=True),
-        'user_id2': fields.many2one('res.users', 'Salesman Manager'),
+        'user_saleman': fields.many2one('res.users', 'Salesman', required=True),
+        'sale_manager': fields.many2one('res.users', 'Salesman Manager'),
         'amount_tax': fields.function(_amount_tax, method=True, string='Taxes'),
         'amount_total': fields.function(_amount_total, method=True, string='Total'),
         'amount_paid': fields.function(_total_payment, 'Paid', states={'draft': [('readonly', False)]}, readonly=True, method=True),
@@ -393,7 +393,7 @@ class pos_order(osv.osv):
 
     _defaults = {
         'user_id': lambda self, cr, uid, context: uid,
-        'user_id2': lambda self, cr, uid, context: uid,
+        'sale_manager': lambda self, cr, uid, context: uid,
         'state': lambda *a: 'draft',
         'price_type': lambda *a: 'tax_excluded',
         'state_2': lambda *a: 'to_verify',
@@ -600,7 +600,7 @@ class pos_order(osv.osv):
 
     def button_validate(self, cr, uid, ids, *args):
                 
-        """ Check the access for the sale order  and update the date_payment
+        """ Check the access for the sale order  and update the date_validation
         @return: True
         """        
         res_obj = self.pool.get('res.company')
@@ -611,12 +611,12 @@ class pos_order(osv.osv):
         if part_company:
             raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
         for order in self.browse(cr, uid, ids):
-            if not order.date_payment:
+            if not order.date_validation:
                 cr.execute("select max(date) from account_bank_statement_line where pos_statement_id=%d"%(order.id))
                 val=cr.fetchone()
                 val=val and val[0] or None
                 if val:
-                    cr.execute("Update pos_order set date_payment='%s' where id = %d"%(val, order.id))
+                    cr.execute("Update pos_order set date_validation='%s' where id = %d"%(val, order.id))
         return True
 
 
@@ -746,7 +746,7 @@ class pos_order(osv.osv):
         inv_ids = []
 
         for order in self.browse(cr, uid, ids, context):
-            curr_c = order.user_id1.company_id
+            curr_c = order.user_saleman.company_id
             if order.invoice_id:
                 inv_ids.append(order.invoice_id.id)
                 continue
@@ -1023,8 +1023,8 @@ class pos_order(osv.osv):
                     create_contract_nb = True
                     break
             if create_contract_nb:
-                seq = self.pool.get('ir.sequence').get(cr, uid, 'pos.user_%s' % pos.user_id1.login)
-                vals['contract_number'] ='%s-%s' % (pos.user_id1.login, seq)
+                seq = self.pool.get('ir.sequence').get(cr, uid, 'pos.user_%s' % pos.user_saleman.login)
+                vals['contract_number'] ='%s-%s' % (pos.user_saleman.login, seq)
         self.write(cr, uid, ids, vals)
 
     def action_paid(self, cr, uid, ids, context=None):
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index b69bc04e8a2..a214cc9fe86 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -11,7 +11,7 @@
                     <notebook >
                         <page string="Order lines">
                             <group colspan="4" col="6">
-                                <field name="user_id1" />
+                                <field name="user_saleman" />
                                 <field name="partner_id" on_change="onchange_partner_pricelist(partner_id)"/>
                                 <field name="contract_number" select="1" />
                             </group>
@@ -90,14 +90,14 @@
                                 <field name="shop_id" widget="selection"  />
                                 <field name="name" select="1"/>
                                 <field name="user_id" />
-                                <field name="user_id2" />
+                                <field name="sale_manager" />
                                 <field name="price_type" />
                             </group>
                             <group colspan="2" col="2" name="Type">
                                 <separator string="Dates" colspan="4"/>
                                 <field name="date_order" select="1" />
-                                <field name="date_payment" select="1"  />
-                                <field name="date_payment2" select="1"  groups="base.group_extended"/>
+                                <field name="date_validation" select="1"  />
+                                <field name="date_payment" select="1"  groups="base.group_extended"/>
                             </group>
                             <group colspan="4">
                                 <separator string="Invoicing" colspan="4"/>
@@ -155,8 +155,8 @@
                 <tree string="POS Orders">
                     <field name="name"/>
                     <field name="date_order" select="1"/>
+                    <field name="date_validation"/>
                     <field name="date_payment"/>
-                    <field name="date_payment2"/>
                     <field name="user_id"/>
                     <field name="invoice_id"/>
                     <field name="state" select="1"/>
@@ -864,8 +864,8 @@ invoiced
                     <field name="name"/>
                     <field name="date_order" select="1"/>
                     <field name="partner_id" />
+                    <field name="date_validation"/>
                     <field name="date_payment"/>
-                    <field name="date_payment2"/>
                     <field name="user_id"/>
                     <field name="invoice_id"/>
                     <field name="note" select="1" />
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index 1d2e6edc9d0..807d9e497d6 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -103,7 +103,7 @@
         <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
         <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
         <para style="terp_default_Centre_9">Shop : [[ o.shop_id.name ]]</para>
-        <para style="terp_default_Centre_9">Vendeur : [[ o.user_id1.name ]]</para>
+        <para style="terp_default_Centre_9">Vendeur : [[ o.user_saleman.name ]]</para>
         <para style="terp_default_Centre_9">Date : [[ formatLang(o.date_order,date = True) ]]</para>
         <para style="P4">
             <font color="white"> </font>
diff --git a/addons/point_of_sale/wizard/wizard_return.py b/addons/point_of_sale/wizard/wizard_return.py
index 673610e8c2c..bc21e33362d 100644
--- a/addons/point_of_sale/wizard/wizard_return.py
+++ b/addons/point_of_sale/wizard/wizard_return.py
@@ -152,7 +152,7 @@ def _check(self, cr, uid, data, context):
                 action = 'invoice'
             else:
                 action = 'paid'
-        elif order.date_payment:
+        elif order.date_validation:
             action = 'receipt'
         else:
             action='paid'

From 90a928648cda5fbdb9e7d832a51b4c551de7d38d Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Thu, 22 Apr 2010 12:53:31 +0530
Subject: [PATCH 05/84] [IMP] stock: Postgres view of stock moves with filters

bzr revid: mso@mso-20100422072331-pqsvqctax37chmt1
---
 addons/stock/__openerp__.py                   |  1 +
 addons/stock/report/__init__.py               |  1 +
 addons/stock/report/report_stock_move.py      | 62 ++++++++++++
 .../stock/report/report_stock_move_view.xml   | 99 +++++++++++++++++++
 4 files changed, 163 insertions(+)
 create mode 100755 addons/stock/report/report_stock_move.py
 create mode 100755 addons/stock/report/report_stock_move_view.xml

diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 86d743c5a6d..b9856de1224 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -65,6 +65,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "product_data.xml",
         "product_view.xml",
         "partner_view.xml",
+        "report/report_stock_move_view.xml",
         "report/report_stock_view.xml",
         "report/report_stock_picking_view.xml",
         "security/stock_security.xml",
diff --git a/addons/stock/report/__init__.py b/addons/stock/report/__init__.py
index 6e0bc044d3e..a0a4bcb8ea5 100644
--- a/addons/stock/report/__init__.py
+++ b/addons/stock/report/__init__.py
@@ -27,6 +27,7 @@ import picking
 import lot_overview
 import lot_overview_all
 import report_stock
+import report_stock_move
 import report_stock_picking
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
new file mode 100755
index 00000000000..b5388b336e6
--- /dev/null
+++ b/addons/stock/report/report_stock_move.py
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import tools
+from osv import fields,osv
+
+
+class report_stock_move(osv.osv):
+    _name = "report.stock.move"
+    _description = "Stock Statistics"
+    _auto = False
+    _columns = {
+        'date': fields.date('Date', readonly=True),
+        'year': fields.char('Year', size=4, readonly=True),
+        'day': fields.char('Day', size=128, readonly=True),
+        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
+            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
+            ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+        'product_id':fields.many2one('product.product', 'Product', readonly=True),
+        'location_id':fields.many2one('stock.location', 'Location', readonly=True),
+        'product_qty':fields.integer('Qty',readonly=True),
+        'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
+                                  help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Avaiable\'.\n When the picking it done the state is \'Done\'.\
+                                  \nThe state is \'Waiting\' if the move is waiting for another one.'),
+
+    }
+    
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_stock_move')
+        cr.execute("""
+            create or replace view report_stock_move as (
+                select min(m.id) as id,
+                m.date as date,
+                to_char(date_trunc('day',m.date), 'YYYY') as year,
+                to_char(date_trunc('day',m.date), 'MM') as month,
+                to_char(date_trunc('day',m.date), 'YYYY-MM-DD') as day,
+                m.location_id as location_id,
+                m.product_id as product_id,
+                m.state as state,
+                sum(m.product_qty) as product_qty                  
+                from stock_move as m group by m.product_id, m.location_id, m.id, m.date, m.state
+            )
+        """)
+report_stock_move()
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
new file mode 100755
index 00000000000..c44ce4773ef
--- /dev/null
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+    <record id="view_stock_tree" model="ir.ui.view">
+        <field name="name">report.stock.move.tree</field>
+        <field name="model">report.stock.move</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Stock Orders Statistics">
+                <field name="date"/>
+                <field name="year" invisible="1" />
+                <field name="month" invisible="1"/>
+                <field name="day" invisible="1"/>
+                <field name="product_id"/>
+                <field name="product_qty"/>
+                <field name="location_id"/>
+                <field name="state"/>
+           </tree>
+        </field>
+    </record>
+
+    <record id="view_stock_graph" model="ir.ui.view">
+         <field name="name">report.stock.move.graph</field>
+         <field name="model">report.stock.move</field>
+         <field name="type">graph</field>
+         <field name="arch" type="xml">
+             <graph string="Stock Moves Statistics" type="bar">
+                 <field name="product_id"/>
+                 <field name="product_qty"/>
+             </graph>
+         </field>
+    </record>
+
+    <record id="view_stock_search" model="ir.ui.view">
+        <field name="name">report.stock.move.search</field>
+        <field name="model">report.stock.move</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Stock Move">
+                <group>
+                <filter icon="terp-stock"
+                    string="This Year"
+                    domain="[('year','=',time.strftime('%%Y'))]"
+                    help="Stock Moves of the year"/>
+                <filter icon="terp-stock"
+                    string="This Month"
+                    domain="[('month','=',time.strftime('%%m'))]"
+                    help="Stock Moves of this month"/>
+	            <filter icon="gtk-media-rewind"
+                    string="Current Stock"
+                    separator="1"
+                    domain="[('date', '=', time.strftime('%%Y-%%m-%%d')]"
+                    help="Stock Moves of today"/>
+                <separator orientation="vertical"/>
+
+                <filter string="Waiting"
+                    	icon="terp-stock"
+                    	domain="[('state','=','waiting')]"
+                    	help = "Confirmed Stock-Moves"/>
+
+                <filter string="Available"
+                    	icon="terp-stock"
+                    	domain="[('state','=','assigned')]"
+                    	help = "Available Stock-Moves"/>
+
+                <filter string="Done"
+                    	icon="terp-stock"
+                    	domain="[('state','=','done')]"
+                    	help = "Completed Stock-Moves"/>
+                
+                <separator orientation="vertical"/>                                        
+                <field name="product_id" select="1" widget="selection"/>
+                <field name="location_id" select="1" widget="selection"/>
+                </group>
+                <newline/>
+                <group expand="1" string="Group By..." >
+                    <filter string="Product" icon="terp-stock" context="{'group_by':'product_id'}"/>
+                    <filter string="Location" icon="terp-stock" context="{'group_by':'location_id'}"/>
+                    <filter string="State" icon="terp-stock" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Day" icon="terp-stock" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-stock" context="{'group_by':'date'}"/>
+                    <filter string="Year" icon="terp-stock" context="{'group_by':'year'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_stock_move_report" model="ir.actions.act_window">
+        <field name="name">Stock Moves</field>
+        <field name="res_model">report.stock.move</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+ 		<field name="search_view_id"  ref="view_stock_search"/>
+ 	
+    </record>
+	<menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="5"/>
+</data>
+</openerp>
\ No newline at end of file

From 9158885ce20e491e7bf5a47c6bce43fee01f0857 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 22 Apr 2010 13:40:06 +0530
Subject: [PATCH 06/84] [IMP] Point_of_sale: remove the unused code and review
 the code

bzr revid: sbh@tinyerp.com-20100422081006-ol38gg4of999y62f
---
 .../point_of_sale/account_bank_statement.py   | 13 +--
 addons/point_of_sale/multi_company_demo.xml   | 10 +-
 .../multi_company_stock_data.xml              | 98 ------------------
 addons/point_of_sale/pos_data.xml             |  2 -
 addons/point_of_sale/pos_demo.xml             | 28 ++----
 addons/point_of_sale/pos_report.xml           | 33 -------
 addons/point_of_sale/pos_view.xml             | 99 -------------------
 addons/point_of_sale/pos_wizard.xml           | 60 -----------
 addons/point_of_sale/pos_workflow.xml         |  1 -
 .../stock/report/report_stock_move_view.xml   |  4 +
 10 files changed, 13 insertions(+), 335 deletions(-)

diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
index 57276219861..612826705fb 100644
--- a/addons/point_of_sale/account_bank_statement.py
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -132,8 +132,6 @@ class account_bank_statement(osv.osv):
     _columns = {
           'journal_id': fields.many2one('account.journal', 'Journal', required=True),
           'balance_start': fields.function(_get_starting_balance, method=True, string='Starting Balance', type='float',digits=(16,2)),
-         # 'balance_start': fields.float('Starting Balance',digits=(16,2)),
-         # 'balance_end': fields.float('Balance',digits=(16,2)),
           'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirm'),('open','Open')],
                                     'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
           'total_entry_encoding':fields.function(_get_sum_entry_encoding, method=True, string="Total of Entry encoding"),
@@ -244,17 +242,8 @@ class account_bank_statement(osv.osv):
                     raise osv.except_osv(_('Invalid action !'), _(' You can not confirm your cashbox, Please enter ending details, missing value matches to "%s"')%(abs(Decimal(str(val))-(Decimal(str(val_statement_line))+Decimal(str(val2))))))
 
             self.write(cr, uid, statement.id, {'balance_end_real':Decimal(str(val_statement_line))+Decimal(str(val2)),'closing_date':time.strftime("%Y-%m-%d %H:%M:%S"),'state':'draft'})
-           # self.write(cr, uid, statement.id, {'balance_end_real':bal_st+val_statement_line,'closing_date':time.strftime("%Y-%m-%d %H:%M:%S"),'state':'draft'})
         return  super(account_bank_statement, self).button_confirm(cr, uid, ids, context=None)
 
 account_bank_statement()
-
-#class singer_account_bank_statement_line(osv.osv):
-#    _inherit = 'account.bank.statement.line'
-#    _columns = {
-#           'pos_statement_id': fields.many2one('pos.order',ondelete='cascade'),
-#     }
-#
-#singer_account_bank_statement_line()
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/multi_company_demo.xml b/addons/point_of_sale/multi_company_demo.xml
index dfc59cc09c8..37a4ebf58bb 100644
--- a/addons/point_of_sale/multi_company_demo.xml
+++ b/addons/point_of_sale/multi_company_demo.xml
@@ -2,11 +2,10 @@
 <openerp>
     <data noupdate="0">
         <record id="second_partner" model="res.partner">
-            <field name="name">Tiny Editor</field>
+            <field name="name">OpenERP Editor</field>
         </record>
-
         <record id="second_company" model="res.company">
-            <field name="name">Tiny Editor</field>
+            <field name="name">OpenERP Editor</field>
             <field name="partner_id" ref="base.main_partner"/>
             <field name="parent_id" ref="base.main_company"/>
             <field name="rml_header1">Free Business Solutions</field>
@@ -15,7 +14,6 @@
             <field name="currency_id" ref="base.EUR"/>
 
         </record>
-
         <record id="ter_partner" model="res.partner">
             <field name="name">Tiny Integrator</field>
         </record>
@@ -28,11 +26,7 @@
             <field name="rml_footer1">Web: http://tiny.be - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07</field>
             <field name="rml_footer2">IBAN: BE74 1262 0132 6907 - SWIFT: GKCCBEBB - VAT: BE0477.472.701</field>
             <field name="currency_id" ref="base.EUR"/>
-
         </record>
-
-  
-
     </data>
 </openerp>
 
diff --git a/addons/point_of_sale/multi_company_stock_data.xml b/addons/point_of_sale/multi_company_stock_data.xml
index 539a27ff1a2..a74ea0a56e9 100644
--- a/addons/point_of_sale/multi_company_stock_data.xml
+++ b/addons/point_of_sale/multi_company_stock_data.xml
@@ -2,104 +2,6 @@
 <openerp>
 
 <data>
-        <!-- <record id="res_partner_tinyshop0" model="res.partner">
-            <field eval="0" name="customer"/>
-            <field eval="0" name="supplier"/>
-            <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;Tiny Shop 1&quot;&quot;&quot;" name="name"/>
-        </record>
-        <record id="res_partner_address_fabien0" model="res.partner.address">
-            <field eval="&quot;&quot;&quot;Fabien&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;92000&quot;&quot;&quot;" name="zip"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
-            <field name="partner_id" ref="res_partner_tinyshop0"/>
-            <field name="country_id" ref="base.fr"/>
-            <field eval="&quot;&quot;&quot;Avenue de Paris&quot;&quot;&quot;" name="street"/>
-            <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;default&quot;&quot;&quot;" name="type"/>
-        </record>
-        <record id="res_company_shop0" model="res.company">
-            <field eval="5.0" name="security_lead"/>
-            <field name="currency_id" ref="base.EUR"/>
-            <field eval="1.0" name="po_lead"/>
-            <field name="partner_id" ref="res_partner_tinyshop0"/>
-            <field eval="1.0" name="manufacturing_lead"/>
-            <field name="parent_id" ref="base.main_company"/>
-            <field eval="80.0" name="schedule_range"/>
-            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
-
-        </record>
-        <record id="res_partner_tinyshop1" model="res.partner">
-            <field eval="1" name="customer"/>
-            <field eval="0" name="supplier"/>
-            <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;Tiny Shop 2&quot;&quot;&quot;" name="name"/>
-       </record>
-        <record id="res_partner_address_eric0" model="res.partner.address">
-            <field eval="&quot;&quot;&quot;Eric&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;1500&quot;&quot;&quot;" name="zip"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
-            <field name="partner_id" ref="res_partner_tinyshop1"/>
-            <field name="country_id" ref="base.fr"/>
-            <field eval="&quot;&quot;&quot;Avenue de la Resistance&quot;&quot;&quot;" name="street"/>
-            <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;default&quot;&quot;&quot;" name="type"/>
-            <field name="partner_id" ref="res_partner_tinyshop1"/>
-            <field eval="1" name="active"/>
-        </record>
-        <record id="res_company_tinyshop0" model="res.company">
-            <field name="currency_id" ref="base.EUR"/>
-            <field eval="1.0" name="po_lead"/>
-            <field name="partner_id" ref="res_partner_tinyshop1"/>
-            <field eval="1.0" name="manufacturing_lead"/>
-            <field name="parent_id" ref="base.main_company"/>
-            <field eval="80.0" name="schedule_range"/>
-            <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
-        </record>
-
-
-        <record id="res_users_shopuser0" model="res.users">
-            <field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
-            <field eval="[(6,0,[ref('base.group_partner_manager')])]" name="groups_id"/>
-            <field model="res.partner.address" name="address_id" search="[('name','=','Fabien')]"/>
-            <field eval="[(6,0,[ref('purchase.res_roles_purchase0'),ref('sale.res_roles_salesman0')])]" name="roles_id"/>
-            <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;shop1&quot;&quot;&quot;" name="password"/>
-            <field eval="&quot;&quot;&quot;en_US&quot;&quot;&quot;" name="context_lang"/>
-            <field eval="&quot;&quot;&quot;Shop 1 User&quot;&quot;&quot;" name="name"/>
-            <field name="company_id" ref="res_company_shop0"/>
-            <field eval="&quot;&quot;&quot;shop1&quot;&quot;&quot;" name="login"/>
-            <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
-        </record>
-        <record id="res_users_shopuser1" model="res.users">
-            <field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
-            <field eval="[(6,0,[ref('base.group_partner_manager')])]" name="groups_id"/>
-            <field model="res.partner.address" name="address_id" search="[('name','=','Eric')]"/>
-            <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="password"/>
-            <field eval="&quot;&quot;&quot;Shop 2 User&quot;&quot;&quot;" name="name"/>
-            <field name="company_id" ref="res_company_tinyshop0"/>
-            <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="login"/>
-            <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
-        </record>
-
-        <record id="res_groups_posuserposline0" model="res.groups">
-			<field eval="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
-			<field eval="&quot;&quot;&quot;POS_user_pos_line&quot;&quot;&quot;" name="name"/>
-		</record>
-
-		<record id="res_groups_posuser0" model="res.groups">
-			<field eval="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
-			<field eval="&quot;&quot;&quot;POS_user&quot;&quot;&quot;" name="name"/>
-		</record>-->
-
-        <record forcecreate="True" id="property_product_pricelist_multi" model="ir.property">
-            <field name="name">property_product_pricelist</field>
-            <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_product_pricelist')]"/>
-            <field eval="'product.pricelist,'+str(ref('product.list0'))" name="value"/>
-            <field name="company_id" ref="res_company_shop0"/>
-        </record>
-
-
         <record forcecreate="True" id="property_stock_account_output_prd_multi" model="ir.property">
             <field name="name">property_stock_account_output</field>
             <field name="fields_id" search="[('model','=','product.template'),('name','=','property_stock_account_output')]"/>
diff --git a/addons/point_of_sale/pos_data.xml b/addons/point_of_sale/pos_data.xml
index 8ff4697804e..b36bd0827c2 100644
--- a/addons/point_of_sale/pos_data.xml
+++ b/addons/point_of_sale/pos_data.xml
@@ -11,7 +11,6 @@
             <field name="list_price">0.0</field>
             <field name="standard_price">0.0</field>
             <field name="uom_id" ref="product.product_uom_unit"/>
-            <!--  <field name="company_id" ref="base.main_company"/>  -->
             <field name="uom_po_id" ref="product.product_uom_unit"/>
         </record>
 
@@ -22,7 +21,6 @@
             <field name="list_price">100.0</field>
             <field name="standard_price">100.0</field>
             <field name="uom_id" ref="product.product_uom_unit"/>
-            <!--  <field name="company_id" ref="multi_company_stock.res_company_tinyshop0"/> -->
             <field name="uom_po_id" ref="product.product_uom_unit"/>
         </record>
 
diff --git a/addons/point_of_sale/pos_demo.xml b/addons/point_of_sale/pos_demo.xml
index 789d96b897d..f3573abc791 100644
--- a/addons/point_of_sale/pos_demo.xml
+++ b/addons/point_of_sale/pos_demo.xml
@@ -57,8 +57,8 @@
 			<field name="shop_id" ref="sale.shop"/>
 			<field eval="&quot;&quot;&quot;2009-05-29&quot;&quot;&quot;" name="date_order"/>
 			<field name="partner_id" ref="base.res_partner_5"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field name="user_id1" ref="base.user_root"/>
+			<field name="user_saleman" ref="base.user_root"/>
+			<field name="sale_manager" ref="base.user_root"/>
 			<field eval="&quot;&quot;&quot;POS/001&quot;&quot;&quot;" name="name"/>
 			<field name="company_id" ref="res_company_tinyshop0"/>
 			<field eval="0" name="invoice_wanted"/>
@@ -93,8 +93,8 @@
       <field name="shop_id" ref="sale.shop"/>
 			<field eval="&quot;&quot;&quot;2009-05-29&quot;&quot;&quot;" name="date_order"/>
 			<field name="partner_id" ref="base.res_partner_3"/>
-			<field name="user_id" ref="res_users_sofia0"/>
-			<field name="user_id1" ref="base.user_root"/>
+			<field name="user_saleman" ref="res_users_sofia0"/>
+			<field name="sale_manager" ref="base.user_root"/>
 			<field eval="&quot;&quot;&quot;POS/002&quot;&quot;&quot;" name="name"/>
 			<field name="company_id" ref="res_company_shop0"/>
 			<field eval="&quot;&quot;&quot;tax_excluded&quot;&quot;&quot;" name="price_type"/>
@@ -135,8 +135,8 @@
 			<field eval="&quot;&quot;&quot;2009-11-29&quot;&quot;&quot;" name="date_validity"/>
 			<field eval="&quot;&quot;&quot;2009-05-29&quot;&quot;&quot;" name="date_order"/>
 			<field name="partner_id" ref="base.res_partner_3"/>
-			<field name="user_id" ref="res_users_sofia0"/>
-			<field name="user_id1" ref="base.user_root"/>
+			<field name="user_saleman" ref="res_users_sofia0"/>
+			<field name="sale_manager" ref="base.user_root"/>
 			<field eval="&quot;&quot;&quot;POS/0012&quot;&quot;&quot;" name="name"/>
 			<field name="company_id" ref="res_company_shop0"/>
 			<field eval="0" name="invoice_wanted"/>
@@ -144,16 +144,6 @@
 			<field name="pricelist_id" ref="product.list0"/>
       <field name="shop_id" ref="sale.shop"/>
     </record>
-
-<!--		<record id="pos_order_line_orderlineadv" model="pos.order.line">
-			<field eval="0.0" name="discount"/>
-			<field name="product_id" ref="advance_product_pos"/>
-			<field eval="&quot;&quot;&quot;Order Line/Advance&quot;&quot;&quot;" name="name"/>
-			<field name="order_id" ref="pos_order_posadvance"/>
-			<field eval="50.0" name="price_unit"/>
-		    <field name="company_id" ref="res_company_shop0"/>
-			<field eval="-1.0" name="qty"/>
-		</record-->
           <record id="data_fiscalyear" model="account.fiscalyear">
             <field eval="'Fiscal Year Shop '+time.strftime('%Y')" name="name"/>
             <field eval="'FY'+time.strftime('%Y')" name="code"/>
@@ -194,12 +184,6 @@ do black box testing on entries on this chart of account, without modifying
 your own chart of account.
 </field>
         </record>
-<!--        <record id="stock_location.product_pulled_flow_d1" model="product.pulled.flow">
-          <field name="partner_addr_id" ref="multi_company_stock.res_partner_address_fabien0"/>
-        </record>
 
-        <record id="stock_location.product_pulled_flow_d2" model="product.pulled.flow">
-          <field name="partner_addr_id" ref="multi_company_stock.res_partner_address_eric0"/>
-        </record-->
   </data>
 </openerp>
diff --git a/addons/point_of_sale/pos_report.xml b/addons/point_of_sale/pos_report.xml
index 2e9ff5e6107..9123502d288 100644
--- a/addons/point_of_sale/pos_report.xml
+++ b/addons/point_of_sale/pos_report.xml
@@ -1,39 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <openerp>
 	<data>
-		<!--report
-			id="pos_receipt"
-			string="Receipt"
-			model="pos.order"
-			name="pos.receipt"
-			rml="point_of_sale/report/pos_receipt.rml"
-			auto="False"
-			header="False"
-			multi="True"
-			/-->
-
-
-<!--
-		<report
-			id="pos_receipt_with_remboursment"
-			string="Refund Receipt"
-			model="pos.order"
-			name="pos.receipt.with.remboursment"
-			rml="point_of_sale/report/pos_receipt_with_remboursment.rml"
-			auto="False"
-			header="False"
-			multi="True"
-			/>
-		<report
-			id="pos_receipt_without_remboursment"
-			string="Voucher Receipt"
-			model="pos.order"
-			name="pos.receipt.without.remboursment"
-			rml="point_of_sale/report/pos_receipt_without_remboursment.rml"
-			auto="False"
-			header="False"
-			multi="True"
-			/-->
 
 		<report
 			id="pos_invoice_report"
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index a4cd8fc9f10..b72848e2131 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -58,28 +58,14 @@
                                     states="paid, draft"
                                         attrs="{'invisible':[('state_2','=','accepted')]}"/>
                               </group>
-
                             <separator colspan="4" string="Actions"/>
                             <group colspan="4" col="6">
-
                                 <field name="state" select="1"/>
-
-                                <!--
-                                <button name="%(pos_add_product)d" string="_Add product" type="action" states="draft"/>
-                                -->
-
                                 <button name="%(action_pos_payment)d" string="Ma_ke Payment" icon="gtk-ok" type="action" states="draft,advance" context="{'record_id':'active_id'}" />
                                 <button name="%(action_report_pos_receipt)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
-
-
-                                <!--
-                                <button name="action_cancel" string="Cancel" type="object" states="paid" />
-                                -->
                                 <button name="set_to_draft" string="Set to draft" states="paid" icon="gtk-execute" type="object" />
-
                                 <button name="%(pos_return_picking)d" string="Return Picking" type="action" icon="gtk-ok" states="paid"
                                     attrs="{'invisible':[('state','!=','paid'),('state','!=','invoiced')]}"/>
-
                             </group>
                         </page>
 
@@ -122,7 +108,6 @@
                                 </form>
                             </field>
                         </page>
-
                         <page string="Notes" >
                             <separator string="Notes" colspan="4" />
                             <group colspan="4">
@@ -135,8 +120,6 @@
                 </form>
             </field>
         </record>
-
-
         <record model="ir.actions.act_window" id="action_pos_pos_form">
             <field name="name">Point of Sale</field>
             <field name="type">ir.actions.act_window</field>
@@ -145,8 +128,6 @@
             <field name="view_id" ref="view_pos_pos_form"/>
             <field name="domain">[['date_order','>=',time.strftime('%Y-%m-%d')]]</field>
         </record>
-
-
         <record model="ir.ui.view" id="view_pos_order_tree">
             <field name="name">Sales</field>
             <field name="model">pos.order</field>
@@ -208,7 +189,6 @@
 			<field name="search_view_id" ref="view_pos_order_filter"/>	             
  				           
         </record>
-invoiced
 
         <record model="ir.actions.act_window" id="action_pos_order_tobinvoiced">
             <field name="name">Sales to Invoice</field>
@@ -242,8 +222,6 @@ invoiced
  			<field name="search_view_id" ref="view_pos_order_filter"/>	               
         </record>
 
-<!--        <menuitem name="Orders of the day" parent="menu_point_ofsale" id="menu_action_pos_order_tree2" action="action_pos_order_tree2"/-->
-
         <record model="ir.actions.act_window" id="action_pos_order_tree3">
             <field name="name">Point of Sale</field>
             <field name="type">ir.actions.act_window</field>
@@ -252,8 +230,6 @@ invoiced
             <field name="view_mode">tree,form</field>
 			<field name="search_view_id" ref="view_pos_order_filter"/>            
         </record>
-<!--        <menuitem name="All orders" parent="menu_point_ofsale" id="menu_action_pos_order_tree3" action="action_pos_order_tree3"/-->
-
         <record model="ir.actions.act_window" id="action_pos_order_tree_open">
             <field name="name">Opened Sales</field>
             <field name="type">ir.actions.act_window</field>
@@ -699,53 +675,6 @@ invoiced
             </field>
            </record>
 
-
-        <record model="ir.ui.view" id="form_mode_p_contact">
-            <field name="name">Contact Mode</field>
-            <field name="model">res.mode.contact</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-             <form string="Contact Mode">
-                    <field  name="name" select="1"/>
-                    <field  name="active"/>
-              </form>
-            </field>
-          </record>
-
-        <record model="ir.ui.view" id="tree_mode_p_contact">
-            <field name="name">Contact Mode</field>
-            <field name="model">res.mode.contact</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-             <tree string="Contact Mode">
-                    <field  name="name"/>
-                    <field  name="active"/>
-              </tree>
-            </field>
-          </record>
-
-        <record model="ir.actions.act_window" id="action_mode_p">
-            <field name="name">Contact Mode</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.mode.contact</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <menuitem name="Contact Mode" parent="base.menu_base_config" action="action_mode_p" id="menu_mode_po"/>
-
-        <record model="ir.ui.view" id="view_partner_contact">
-            <field name="name">view.partner.contact</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-              <field name="website" position="after">
-                    <field  name="contact_mode_id"/>
-              </field>
-            </field>
-          </record>
-
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.inherit</field>
             <field name="model">product.product</field>
@@ -778,7 +707,6 @@ invoiced
                         <field name="default_code" select="1"/>
                         <field groups="base.group_extended" name="ean13"/>
                     </group>
-
                    </group>
                    <notebook colspan="4">
                         <page string="Information">
@@ -859,13 +787,6 @@ invoiced
                     parent="menu_point_config_product"
                     action="action_product_output"
                     id="products_for_output_operations"/>
-
-<!--        <wizard
-            string="Refloat Box entries"
-            model="account.bank.statement"
-            name="pos.entry"
-            menu="False"
-            id="pos_entries"/>-->
             
         <menuitem name="Register Management" parent="menu_point_root"
             id="menu_point_config" sequence="3"/>
@@ -875,22 +796,12 @@ invoiced
             action="action_box_entries"
             id="menu_wizard_enter_jrnl" sequence="3" />
             
-    <!--    <wizard
-            string="Enter negative operations"
-            model="account.bank.statement"
-            name="pos.out"
-            menu="False"
-            id="pos_entries2"/>-->
         <menuitem
             name="Output Operations" parent="menu_point_config"
             string="Refloat"
             action="action_box_out"
             id="menu_wizard_enter_jrnl2" sequence="3" />
 
-<!--        <menuitem name="Sales Waiting Validation" parent="menu_point_config" id="menu_point_ofsale_date_payment"-->
-<!--            action="action_pos_pos_form_user" sequence="4"/>-->
-
-
         <record model="ir.ui.view" id="view_pos_order_tree_all_sales">
             <field name="name">POS Sales</field>
             <field name="model">pos.order</field>
@@ -918,8 +829,6 @@ invoiced
             <field name="view_type">form</field>
             <field name="view_id" ref="view_pos_order_tree_all_sales" />
         </record>
-<!--        <menuitem name="All Sales" parent="menu_point_of_sale" id="menu_pos_all_sales" action="action_pos_all_sales" sequence="5" />-->
-
         <record model="ir.ui.view" id="view_pos_order_tree_all_sales_lines">
             <field name="name">POS Sales Lines</field>
             <field name="model">pos.order.line</field>
@@ -942,7 +851,6 @@ invoiced
             <field name="view_type">form</field>
             <field name="view_id" ref="view_pos_order_tree_all_sales_lines" />
         </record>
-<!--        <menuitem name="Toutes les lignes de ventes" parent="menu_point_root" id="menu_pos_all_sales_lines" action="action_pos_all_sales_lines" sequence="5" />-->
 
         <!--  Miscelleanous Operations/Reporting -->
         <menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep" sequence="5"/>
@@ -956,8 +864,6 @@ invoiced
                         id="menu_action_sale_of_day_tree2" action="action_trans_pos_tree_today"/>
         <menuitem name="Accepted Sales" parent="menu_action_all_sales_tree3"
                         id="menu_action_sale_of_day_accept" action="action_pos_order_accepted"/>
-<!--        <menuitem name="Open Sales" parent="menu_action_all_sales_tree3"
-                        id="menu_action_open_sales_treeop" action="action_pos_order_tree_open"/-->
 
         <menuitem name="Sales Reports" parent="menu_point_report_sale" id="menu_sales_report" sequence="2"/>
 
@@ -1005,11 +911,6 @@ invoiced
         <menuitem name="Sales Lines of the day" parent="menu_action_pos_order_line"
                     id="menu_action_pos_order_line_day" action="action_pos_order_line_day"/>
 
-<!--        <menuitem name="Open Sales Line" parent="menu_action_pos_order_line"
-                    id="menu_action_open_sales_line" action="action_pos_order_line_form"/-->
-
-<!--        <menuitem icon="STOCK_PRINT" action="wizard_pos_payment_report"
-                id="menu_pos_payment_report" parent="menu_cashboxes_by_day" type="wizard" sequence="4"/-->
 
         <menuitem icon="STOCK_PRINT" action="action_report_pos_sale_user"
                 id="menu_pos_sales_user" parent="menu_trans_pos_tree" sequence="3" groups="base.group_extended" />
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
index 50e3630c4d7..956316b4e97 100644
--- a/addons/point_of_sale/pos_wizard.xml
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -8,67 +8,7 @@
         name="pos.return.picking"
         string="Return Goods"/>
 
-
-
-<!--		<wizard string="Box Entries" model="account.bank.statement"
-				name="pos.entry" id="pos_entry" menu="False"/>-->
-
-<!--		<wizard string="Payment" model="pos.order"
-				name="pos.payment" id="pos_payment" menu="False"/>-->
-
-			<!--<wizard string="Create Invoices" model="pos.order"
-				name="pos.create_invoice" id="pos_invoice" multi="True"/>-->
-
 		<wizard string="Add products" model="pos.order"
 				name="pos.add_product" id="pos_add_product"  menu="False"/>
-
-			<!--<wizard string="Cancel" model="pos.order"
-				name="pos.cancel" id="pos_cancel" multi="True"/>-->
-
-<!--
-		<wizard string="Discount" model="pos.order"
-				name="pos.discount" id="pos_discount" menu="False"/>-->
-
-<!--		<wizard id="wizard_pos_payment_report" menu="False"
-				model="pos.order" name="pos.payment.report" string="All paid lines for the current User"/-->
-<!--
-		<wizard id="wizard_pos_sales_user" menu="False"
-				model="pos.order" name="pos.sales.user" string="Sales Report"/>-->
-
-<!--
-		<wizard id="wizard_pos_payment_report_date" menu="False"
-				model="pos.order" name="pos.payment.report.date" string="Sales lines Report"/>
-
-		<wizard id="wizard_pos_payment_report_user" menu="False"
-				model="pos.order" name="pos.payment.report.user" string="Sales lines by Users"/>
--->
-  
-		<wizard id="wizard_pos_sales_user_today_current_user" menu="False"
-				model="pos.order" name="pos.sales.user.today.current.user" string="Sales for Current User"/>
-
-<!--		<wizard id="wizard_pos_details" menu="False"
-				model="pos.order" name="pos.details" string="Sales Details"/>-->
-
-<!--		<wizard string="Get From Order" model="pos.order"
-				name="pos.sale.get" id="pos_sale_get"/>
-
-		<wizard string="Scan Product" model="pos.order"
-				name="pos.scan_product" id="pos_scan_product"/-->
-<!--  		<wizard
-        	id="close_statement"
-        	model="account.bank.statement"
-        	menu="True"
-        	name="statement.close"
-        	string="Close Statements"/>-->
-
-
-       <wizard
-        	id="wizard_all_closed_cashbox_of_the_day"
-        	model="account.bank.statement"
-        	menu="False"
-        	name="all.closed.cashbox.of.the.day"
-        	string="All Cashboxes Of the day"/>
-
-
 	</data>
 </openerp>
diff --git a/addons/point_of_sale/pos_workflow.xml b/addons/point_of_sale/pos_workflow.xml
index d3f1313c13f..11cd9481343 100644
--- a/addons/point_of_sale/pos_workflow.xml
+++ b/addons/point_of_sale/pos_workflow.xml
@@ -66,7 +66,6 @@
 		<field name="act_from" ref="act_paid"/>
 		<field name="act_to" ref="act_done"/>
 		<field name="signal">done</field>
-	<!--	<field name="role_id" ref="role_pos"/-->
 	</record>
 
 	<record model="workflow.transition" id="trans_paid_invoice">
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index c44ce4773ef..515b10e8a33 100755
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -94,6 +94,10 @@
  		<field name="search_view_id"  ref="view_stock_search"/>
  	
     </record>
+		<menuitem
+            id="stock.next_id_61"
+            name="Reporting"
+            parent="stock.menu_stock_root" groups="base.group_user"/>    
 	<menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="5"/>
 </data>
 </openerp>
\ No newline at end of file

From 40f68c8043437dc982c303c5d2fa4dbe8c18d563 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 23 Apr 2010 14:50:32 +0530
Subject: [PATCH 07/84] Point_of_sale Task Id 578: Rename field,merge the
 account_bank_statement,remove the unused code

bzr revid: sbh@tinyerp.com-20100423092032-pcksh6rn4oj4rnxr
---
 addons/point_of_sale/__init__.py              |   2 +-
 addons/point_of_sale/__openerp__.py           |   2 -
 .../point_of_sale/account_bank_statement.py   | 249 ------------------
 addons/point_of_sale/multi_company_demo.xml   |   4 +-
 addons/point_of_sale/pos.py                   |  27 +-
 .../pos_account_bank_statement.py             | 208 ++++++++++++++-
 addons/point_of_sale/pos_wizard.xml           |   3 -
 addons/point_of_sale/posrule_data.xml         |  60 -----
 addons/point_of_sale/statement_view.xml       |   6 +-
 9 files changed, 216 insertions(+), 345 deletions(-)
 delete mode 100644 addons/point_of_sale/account_bank_statement.py

diff --git a/addons/point_of_sale/__init__.py b/addons/point_of_sale/__init__.py
index 1a83d3f3b44..9f9f5a21960 100644
--- a/addons/point_of_sale/__init__.py
+++ b/addons/point_of_sale/__init__.py
@@ -25,7 +25,7 @@ import stock
 import wizard
 import report
 import pos_account_bank_statement
-import account_bank_statement
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 95228bb044c..afd96f59b08 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -37,7 +37,6 @@ Main features :
     """,
     'author': 'Tiny',
     'depends': ['sale', 'delivery'],
-#    'depends': ['sale', 'purchase', 'account', 'account_tax_include','board','mrp','board_manufacturing','delivery','profile_manufacturing','account','multi_company'],
     'init_xml': [],
 
     'update_xml': [
@@ -73,7 +72,6 @@ Main features :
         'statement_view.xml',
         'statement_report.xml',
         'statement_data.xml',
-        'statement_wizard.xml',    
     ],
     'demo_xml': ['pos_demo.xml','singer_statement_demo.xml','multi_company_stock_data.xml'],
     'installable': True,
diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
deleted file mode 100644
index 612826705fb..00000000000
--- a/addons/point_of_sale/account_bank_statement.py
+++ /dev/null
@@ -1,249 +0,0 @@
-# encoding: utf-8
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2008 PC Solutions (<http://pcsol.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import osv, fields
-import time
-from mx import DateTime
-from decimal import Decimal
-from tools.translate import _
-
-
-class account_journal(osv.osv):
-
-    _inherit = 'account.journal'
-    _columns = {
-        'auto_cash': fields.boolean('Automatic Opening', help="This field authorize the automatic creation of the cashbox"),
-        'special_journal':fields.boolean('Special Journal', help="Will put all the orders in waiting status till being accepted"),
-        'check_dtls': fields.boolean('Check Details', help="This field authorize Validation of Cashbox without checking ending details"),
-        'statement_sequence_id': fields.many2one('ir.sequence', 'Statement Sequence', \
-            help="The sequence used for statement numbers in this journal."),
-        }
-    _defaults = {
-        'check_dtls': lambda *a:True,
-        'auto_cash': lambda *a:True,
-        }
-account_journal()
-
-
-class singer_statement(osv.osv):
-    
-    """ Singer Statements """
-    
-    _name = 'singer.statement'
-    _description = 'Statements'
-
-    def _sub_total(self, cr, uid, ids, name, arg, context=None):
-       
-        """ Calculates Sub total"
-        @param name: Names of fields.
-        @param arg: User defined arguments
-        @return: Dictionary of values.
-        """
-        res = {}
-        for obj in self.browse(cr, uid, ids):
-            res[obj.id] = obj.pieces * obj.number
-        return res
-
-    def on_change_sub(self, cr, uid, ids, pieces, number,*a):
-
-        """ Calculates Sub total on change of number
-        @param pieces: Names of fields.
-        @param number:
-        """           
-        sub=pieces*number
-        return {'value':{'subtotal': sub or 0.0}}
-
-    _columns = {
-          'pieces': fields.float('Values', digits=(16,2)),
-          'number': fields.integer('Number'),
-          'subtotal': fields.function(_sub_total, method=True, string='Sub Total', type='float',digits=(16,2)),
-          'starting_id': fields.many2one('account.bank.statement',ondelete='cascade'),
-          'ending_id': fields.many2one('account.bank.statement',ondelete='cascade'),
-     }
-
-singer_statement()
-
-class account_bank_statement(osv.osv):
-    
-    _inherit = 'account.bank.statement'
-    
-    def _get_starting_balance(self, cr, uid, ids, name, arg, context=None):
-
-        """ Find starting balance  "
-        @param name: Names of fields.
-        @param arg: User defined arguments
-        @return: Dictionary of values.
-        """          
-        res ={}
-        for statement in self.browse(cr, uid, ids):
-            amount_total=0.0
-            for line in statement.starting_details_ids:
-                amount_total+= line.pieces * line.number
-            res[statement.id]=amount_total
-        return res
-
-    def _get_sum_entry_encoding(self, cr, uid, ids, name, arg, context=None):
-
-        """ Find encoding total of statements "
-        @param name: Names of fields.
-        @param arg: User defined arguments
-        @return: Dictionary of values.
-        """              
-        res2={}
-        for statement in self.browse(cr, uid, ids):
-            encoding_total=0.0
-            for line in statement.line_ids:
-               encoding_total+= line.amount
-            res2[statement.id]=encoding_total
-        return res2
-
-    def _default_journal_id(self, cr, uid, context={}):
-
-        """ To get default journal for the object" 
-        @param name: Names of fields.
-        @return: journal 
-        """  
-        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
-        journal = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('auto_cash','=',False), ('company_id', '=', company_id)])
-        if journal:
-            return journal[0]
-        else:
-            return False
-
-    _columns = {
-          'journal_id': fields.many2one('account.journal', 'Journal', required=True),
-          'balance_start': fields.function(_get_starting_balance, method=True, string='Starting Balance', type='float',digits=(16,2)),
-          'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirm'),('open','Open')],
-                                    'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
-          'total_entry_encoding':fields.function(_get_sum_entry_encoding, method=True, string="Total of Entry encoding"),
-          'date':fields.datetime("Opening Date"),
-          'closing_date':fields.datetime("Closing Date"),
-          'starting_details_ids': fields.one2many('singer.statement', 'starting_id', string='Starting Details'),
-          'ending_details_ids': fields.one2many('singer.statement', 'ending_id', string='Ending Details'),
-          'name': fields.char('Name', size=64, required=True, readonly=True),
-
-    }
-    _defaults = {
-          'state': lambda *a: 'draft',
-          'name': lambda *a: '/',
-          'date': lambda *a:time.strftime("%Y-%m-%d %H:%M:%S"),
-          'journal_id': _default_journal_id,
-
-         }
-
-    def create(self, cr, uid, vals, context=None):
-        
-        company_id = vals and vals.get('company_id',False)
-        if company_id:
-            open_jrnl = self.search(cr, uid, [('company_id', '=', vals['company_id']), ('journal_id', '=', vals['journal_id']), ('state', '=', 'open')])
-            if open_jrnl:
-                raise osv.except_osv('Error', u'Une caisse de type espèce est déjà ouverte')
-            if 'starting_details_ids' in vals:
-                vals['starting_details_ids'] = starting_details_ids = map(list, vals['starting_details_ids'])
-                for i in starting_details_ids:
-                    if i and i[0] and i[1]:
-                        i[0], i[1] = 0, 0
-        res = super(account_bank_statement, self).create(cr, uid, vals, context=context)
-        return res
-
-    def onchange_journal_id(self, cursor, user, statement_id, journal_id, context=None):
-        
-        """ Changes balance start and starting details if journal_id changes" 
-        @param statement_id: Changed statement_id
-        @param journal_id: Changed journal_id
-        @return:  Dictionary of changed values
-        """  
-        id_s=[]
-        if not journal_id:
-            return {'value': {'balance_start': 0.0}}
-        balance_start=0.0
-        cash_obj = self.pool.get('singer.statement')
-        statement_obj = self.pool.get('account.bank.statement')
-        cursor.execute("Select a.id from account_bank_statement a where journal_id=%d and user_id=%d order by a.id desc limit 1"%(journal_id,user))
-        res2=cursor.fetchone()
-        res2=res2 and res2[0] or None
-        if res2:
-            statmt_id=statement_obj.browse(cursor,user,res2)
-            check_det=statmt_id.journal_id.check_dtls
-            if not check_det:
-                balance_start=statmt_id.balance_end_real or 0.0
-                return {'value': {'balance_start': balance_start}}
-        cursor.execute("Select a.id from account_bank_statement a, singer_statement s where journal_id=%d and user_id=%d order by a.id desc limit 1"%(journal_id,user))
-        res1=cursor.fetchone()
-        res1=res1 and res1[0] or None
-        if res1:
-            cursor.execute("Select sum(ss.pieces*ss.number),ss.ending_id from singer_statement ss, account_bank_statement s where ss.ending_id=s.id and s.journal_id=%d and s.user_id=%d and s.id=%d group by ss.ending_id,s.id order by s.id desc"%(journal_id,user, res1))
-            res = cursor.fetchone()
-            balance_start = res and res[0] or 0.0
-            cash_end=res and res[1] or None
-            id_s=statement_obj.browse(cursor,user,cash_end).ending_details_ids
-        new=[]
-        if id_s:
-            for s in id_s:
-                new.append(s.id)
-        return {'value': {'balance_start': balance_start, 'starting_details_ids':new}}
-
-    def button_open(self, cr, uid, ids, context=None):
-        
-        """ Changes statement state to Running.
-        @return: True 
-        """       
-        obj_inv = self.browse(cr, uid, ids)[0]
-        s_id=obj_inv.journal_id
-        if s_id.statement_sequence_id:
-            s_id=s_id.id
-            number = self.pool.get('ir.sequence').get_id(cr, uid, s_id)
-        else:
-            number = self.pool.get('ir.sequence').get(cr, uid,
-                            'account.bank.statement')
-
-        self.write(cr, uid, ids, {'date':time.strftime("%Y-%m-%d %H:%M:%S"), 'state':'open', 'name':number})
-        return True
-
-    def button_confirm(self, cr, uid, ids, context=None):
-        
-        """ Check the starting and ending detail of  statement 
-        @return: True 
-        """         
-        val = 0.0
-        val2 = 0.0
-        val_statement_line = 0.0
-        diff = self.pool.get('res.users').browse(cr,uid,uid).company_id.max_diff or 0.0
-        for statement in self.browse(cr, uid, ids):
-            bal = statement.balance_end
-            bal_st=statement.balance_start
-            for st in statement.line_ids:
-                val_statement_line += st.amount
-            for stat in statement.starting_details_ids:
-                val2 += stat.subtotal
-            for stat in statement.ending_details_ids:
-                val += stat.subtotal
-            if statement.journal_id.check_dtls:
-                if Decimal(str(val)).quantize(Decimal('.001')) != (Decimal(str(val_statement_line)) + Decimal(str(val2))).quantize(Decimal('.001')):
-                    raise osv.except_osv(_('Invalid action !'), _(' You can not confirm your cashbox, Please enter ending details, missing value matches to "%s"')%(abs(Decimal(str(val))-(Decimal(str(val_statement_line))+Decimal(str(val2))))))
-
-            self.write(cr, uid, statement.id, {'balance_end_real':Decimal(str(val_statement_line))+Decimal(str(val2)),'closing_date':time.strftime("%Y-%m-%d %H:%M:%S"),'state':'draft'})
-        return  super(account_bank_statement, self).button_confirm(cr, uid, ids, context=None)
-
-account_bank_statement()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/point_of_sale/multi_company_demo.xml b/addons/point_of_sale/multi_company_demo.xml
index 37a4ebf58bb..e0e58ad75d7 100644
--- a/addons/point_of_sale/multi_company_demo.xml
+++ b/addons/point_of_sale/multi_company_demo.xml
@@ -15,11 +15,11 @@
 
         </record>
         <record id="ter_partner" model="res.partner">
-            <field name="name">Tiny Integrator</field>
+            <field name="name">OpenERP Integrator</field>
         </record>
 
         <record id="ter_company" model="res.company">
-            <field name="name">Tiny Integrator</field>
+            <field name="name">OpenERP Integrator</field>
             <field name="partner_id" ref="base.main_partner"/>
             <field name="parent_id" ref="base.main_company"/>
             <field name="rml_header1">Free Business Solutions</field>
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 9ae385cff3c..a68adbf59b6 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -227,12 +227,6 @@ class pos_order(osv.osv):
             res[order.id] = val
         return res
 
-#    def payment_get(self, cr, uid, ids, context=None):
-#        """  Calculates Total Returned  from the order
-#        @return: Dictionary of values """          
-#        cr.execute("select id from pos_payment where order_id =ANY(%s)",(ids,))
-#        return [i[0] for i in cr.fetchall()]
-
     def _sale_journal_get(self, cr, uid, context):
         
         """ To get  sale journal for this order" 
@@ -253,7 +247,6 @@ class pos_order(osv.osv):
                
         company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
         res = self.pool.get('sale.shop').search(cr, uid, [])
-       # res = self.pool.get('sale.shop').search(cr, uid, [('company_id', '=', company.id)])
         if res:
             return res[0]
         else:
@@ -345,19 +338,9 @@ class pos_order(osv.osv):
         'first_name': fields.char('First Name', size=64),
         'state_2': fields.function(_get_v,type='selection',selection=[('to_verify', 'To Verify'), ('accepted', 'Accepted'),
             ('refused', 'Refused')], string='State', readonly=True, method=True, store=True),
-        
-    #    'last_name': fields.char('Last Name', size=64),
-    #    'street': fields.char('Street', size=64),
-    #    'zip2': fields.char('Zip', size=64),
-    #    'city': fields.char('City', size=64),
-    #    'mobile': fields.char('Mobile', size=64),
-    #    'email': fields.char('Email', size=64),
         'note': fields.text('Internal Notes'),
         'nb_print': fields.integer('Number of Print', readonly=True),
         'sale_journal': fields.many2one('account.journal', 'Journal', required=True, states={'draft': [('readonly', False)]}, readonly=True, ),
-      #  'account_receivable': fields.many2one('account.account',
-      #      'Default Receivable', required=True, states={'draft': [('readonly', False)]},
-      #      readonly=True, ),
         'invoice_wanted': fields.boolean('Create Invoice'),
         'note_2': fields.char('Customer Note',size=64),
         'type_rec': fields.char('Type of Receipt',size=64),
@@ -543,7 +526,6 @@ class pos_order(osv.osv):
                     cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order.shop_id.warehouse_id.id))
                     res=cr.fetchone()
                     location_id=res and res[0] or None
-#                    location_id = order and order.shop_id and order.shop_id.warehouse_id and order.shop_id.warehouse_id.lot_stock_id.id or None
                     stock_dest_id = int(val.split(',')[1])
                     if line.qty < 0:
                         location_id, stock_dest_id = stock_dest_id, location_id
@@ -1002,9 +984,7 @@ class pos_order(osv.osv):
                                                                         'statement_id': False,
                                                                         'account_id':order_account
                                                                      })
-           #     account_move_obj.button_validate(cr, uid, [move_id, payment_move_id], context=context)
             self.write(cr,uid,order.id,{'state':'done'})
-         #       account_move_line_obj.reconcile(cr, uid, to_reconcile, type='manual', context=context)
         return True
 
     def cancel_picking(self, cr, uid, ids, context=None):
@@ -1045,7 +1025,6 @@ class pos_order(osv.osv):
         for order in self.browse(cr, uid, ids, context=context):
             if not order.journal_entry:
                 self.create_account_move(cr, uid, ids, context={})
-        #self.write(cr, uid, ids, {'state': 'done'})
         return True
 
     def compute_state(self, cr, uid, id):
@@ -1119,7 +1098,6 @@ class pos_order_line(osv.osv):
             price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
             if line.discount!=0.0:
                 res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
-#                res[line.id] = price * line.qty * (1 - (line.discount or 0.0) / 100.0)
             else:
                 res[line.id]=line.price_unit*line.qty
         return res
@@ -1192,9 +1170,7 @@ class pos_order_line(osv.osv):
         'company_id':fields.many2one('res.company', 'Company', required=True),
         'notice': fields.char('Discount Notice', size=128, required=True),
         'serial_number': fields.char('Serial Number', size=128),
-#        'contract_number': fields.char('Contract Number', size=512),
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], required=True, change_default=True),
-#        'price_unit': fields.float('Unit Price'),
         'price_unit': fields.function(_get_amount, method=True, string='Unit Price', store=True),
         'price_ded': fields.float('Discount(Amount)'),
         'qty': fields.float('Quantity'),
@@ -1496,10 +1472,9 @@ class report_sales_by_margin_pos_month(osv.osv):
     _description = "Sales by margin monthly"
     _auto = False
     _columns = {
-#        'pos_name': fields.char('POS Order', size=64, readonly=True),
+
         'product_name':fields.char('Product Name', size=64, readonly=True),
         'date_order': fields.date('Order Date',required=True, select=True),
-        #'amount': fields.float('Total', readonly=True, select=True),
         'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
         'qty': fields.float('Qty', readonly=True, select=True),
         'net_margin_per_qty':fields.float('Net margin per Qty', readonly=True, select=True),
diff --git a/addons/point_of_sale/pos_account_bank_statement.py b/addons/point_of_sale/pos_account_bank_statement.py
index ccce315fe36..deb6973a1c3 100644
--- a/addons/point_of_sale/pos_account_bank_statement.py
+++ b/addons/point_of_sale/pos_account_bank_statement.py
@@ -25,15 +25,221 @@ import time
 import netsvc
 
 
+class account_journal(osv.osv):
+
+    _inherit = 'account.journal'
+    _columns = {
+        'auto_cash': fields.boolean('Automatic Opening', help="This field authorize the automatic creation of the cashbox"),
+        'special_journal':fields.boolean('Special Journal', help="Will put all the orders in waiting status till being accepted"),
+        'check_dtls': fields.boolean('Check Details', help="This field authorize Validation of Cashbox without checking ending details"),
+        'statement_sequence_id': fields.many2one('ir.sequence', 'Statement Sequence', \
+            help="The sequence used for statement numbers in this journal."),
+        }
+    _defaults = {
+        'check_dtls': lambda *a:True,
+        'auto_cash': lambda *a:True,
+        }
+account_journal()
+
+class singer_statement(osv.osv):
+    
+    """ Singer Statements """
+    
+    _name = 'singer.statement'
+    _description = 'Statements'
+
+    def _sub_total(self, cr, uid, ids, name, arg, context=None):
+       
+        """ Calculates Sub total"
+        @param name: Names of fields.
+        @param arg: User defined arguments
+        @return: Dictionary of values.
+        """
+        res = {}
+        for obj in self.browse(cr, uid, ids):
+            res[obj.id] = obj.pieces * obj.number
+        return res
+
+    def on_change_sub(self, cr, uid, ids, pieces, number,*a):
+
+        """ Calculates Sub total on change of number
+        @param pieces: Names of fields.
+        @param number:
+        """           
+        sub=pieces*number
+        return {'value':{'subtotal': sub or 0.0}}
+
+    _columns = {
+          'pieces': fields.float('Values', digits=(16,2)),
+          'number': fields.integer('Number'),
+          'subtotal': fields.function(_sub_total, method=True, string='Sub Total', type='float',digits=(16,2)),
+          'starting_id': fields.many2one('account.bank.statement',ondelete='cascade'),
+          'ending_id': fields.many2one('account.bank.statement',ondelete='cascade'),
+     }
+
+singer_statement()
+
 class account_bank_statement(osv.osv):
     
     _inherit = 'account.bank.statement'
+    def _get_starting_balance(self, cr, uid, ids, name, arg, context=None):
+
+        """ Find starting balance  "
+        @param name: Names of fields.
+        @param arg: User defined arguments
+        @return: Dictionary of values.
+        """          
+        res ={}
+        for statement in self.browse(cr, uid, ids):
+            amount_total=0.0
+            for line in statement.starting_details_ids:
+                amount_total+= line.pieces * line.number
+            res[statement.id]=amount_total
+        return res
+
+    def _get_sum_entry_encoding(self, cr, uid, ids, name, arg, context=None):
+
+        """ Find encoding total of statements "
+        @param name: Names of fields.
+        @param arg: User defined arguments
+        @return: Dictionary of values.
+        """              
+        res2={}
+        for statement in self.browse(cr, uid, ids):
+            encoding_total=0.0
+            for line in statement.line_ids:
+               encoding_total+= line.amount
+            res2[statement.id]=encoding_total
+        return res2
+
+    def _default_journal_id(self, cr, uid, context={}):
+
+        """ To get default journal for the object" 
+        @param name: Names of fields.
+        @return: journal 
+        """  
+        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
+        journal = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('auto_cash','=',False), ('company_id', '=', company_id)])
+        if journal:
+            return journal[0]
+        else:
+            return False
+    
     _columns = {
-        'company_id':fields.many2one('res.company', 'Company', required=True),
+           'company_id':fields.many2one('res.company', 'Company', required=True),
+          'journal_id': fields.many2one('account.journal', 'Journal', required=True),
+          'balance_start': fields.function(_get_starting_balance, method=True, string='Starting Balance', type='float',digits=(16,2)),
+          'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirm'),('open','Open')],
+                                    'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
+          'total_entry_encoding':fields.function(_get_sum_entry_encoding, method=True, string="Total of Entry encoding"),
+          'date':fields.datetime("Opening Date"),
+          'closing_date':fields.datetime("Closing Date"),
+          'starting_details_ids': fields.one2many('singer.statement', 'starting_id', string='Starting Details'),
+          'ending_details_ids': fields.one2many('singer.statement', 'ending_id', string='Ending Details'),
+          'name': fields.char('Name', size=64, required=True, readonly=True),
+        
     }
     _defaults = {
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
+        'state': lambda *a: 'draft',
+        'name': lambda *a: '/',
+        'date': lambda *a:time.strftime("%Y-%m-%d %H:%M:%S"),
+        'journal_id': _default_journal_id,
     }
+    def create(self, cr, uid, vals, context=None):
+        
+        company_id = vals and vals.get('company_id',False)
+        if company_id:
+            open_jrnl = self.search(cr, uid, [('company_id', '=', vals['company_id']), ('journal_id', '=', vals['journal_id']), ('state', '=', 'open')])
+            if open_jrnl:
+                raise osv.except_osv('Error', u'Une caisse de type espèce est déjà ouverte')
+            if 'starting_details_ids' in vals:
+                vals['starting_details_ids'] = starting_details_ids = map(list, vals['starting_details_ids'])
+                for i in starting_details_ids:
+                    if i and i[0] and i[1]:
+                        i[0], i[1] = 0, 0
+        res = super(account_bank_statement, self).create(cr, uid, vals, context=context)
+        return res
+
+    def onchange_journal_id(self, cursor, user, statement_id, journal_id, context=None):
+        
+        """ Changes balance start and starting details if journal_id changes" 
+        @param statement_id: Changed statement_id
+        @param journal_id: Changed journal_id
+        @return:  Dictionary of changed values
+        """  
+        id_s=[]
+        if not journal_id:
+            return {'value': {'balance_start': 0.0}}
+        balance_start=0.0
+        cash_obj = self.pool.get('singer.statement')
+        statement_obj = self.pool.get('account.bank.statement')
+        cursor.execute("Select a.id from account_bank_statement a where journal_id=%d and user_id=%d order by a.id desc limit 1"%(journal_id,user))
+        res2=cursor.fetchone()
+        res2=res2 and res2[0] or None
+        if res2:
+            statmt_id=statement_obj.browse(cursor,user,res2)
+            check_det=statmt_id.journal_id.check_dtls
+            if not check_det:
+                balance_start=statmt_id.balance_end_real or 0.0
+                return {'value': {'balance_start': balance_start}}
+        cursor.execute("Select a.id from account_bank_statement a, singer_statement s where journal_id=%d and user_id=%d order by a.id desc limit 1"%(journal_id,user))
+        res1=cursor.fetchone()
+        res1=res1 and res1[0] or None
+        if res1:
+            cursor.execute("Select sum(ss.pieces*ss.number),ss.ending_id from singer_statement ss, account_bank_statement s where ss.ending_id=s.id and s.journal_id=%d and s.user_id=%d and s.id=%d group by ss.ending_id,s.id order by s.id desc"%(journal_id,user, res1))
+            res = cursor.fetchone()
+            balance_start = res and res[0] or 0.0
+            cash_end=res and res[1] or None
+            id_s=statement_obj.browse(cursor,user,cash_end).ending_details_ids
+        new=[]
+        if id_s:
+            for s in id_s:
+                new.append(s.id)
+        return {'value': {'balance_start': balance_start, 'starting_details_ids':new}}
+
+    def button_open(self, cr, uid, ids, context=None):
+        
+        """ Changes statement state to Running.
+        @return: True 
+        """       
+        obj_inv = self.browse(cr, uid, ids)[0]
+        s_id=obj_inv.journal_id
+        if s_id.statement_sequence_id:
+            s_id=s_id.id
+            number = self.pool.get('ir.sequence').get_id(cr, uid, s_id)
+        else:
+            number = self.pool.get('ir.sequence').get(cr, uid,
+                            'account.bank.statement')
+
+        self.write(cr, uid, ids, {'date':time.strftime("%Y-%m-%d %H:%M:%S"), 'state':'open', 'name':number})
+        return True
+
+    def button_confirm(self, cr, uid, ids, context=None):
+        
+        """ Check the starting and ending detail of  statement 
+        @return: True 
+        """         
+        val = 0.0
+        val2 = 0.0
+        val_statement_line = 0.0
+        diff = self.pool.get('res.users').browse(cr,uid,uid).company_id.max_diff or 0.0
+        for statement in self.browse(cr, uid, ids):
+            bal = statement.balance_end
+            bal_st=statement.balance_start
+            for st in statement.line_ids:
+                val_statement_line += st.amount
+            for stat in statement.starting_details_ids:
+                val2 += stat.subtotal
+            for stat in statement.ending_details_ids:
+                val += stat.subtotal
+            if statement.journal_id.check_dtls:
+                if Decimal(str(val)).quantize(Decimal('.001')) != (Decimal(str(val_statement_line)) + Decimal(str(val2))).quantize(Decimal('.001')):
+                    raise osv.except_osv(_('Invalid action !'), _(' You can not confirm your cashbox, Please enter ending details, missing value matches to "%s"')%(abs(Decimal(str(val))-(Decimal(str(val_statement_line))+Decimal(str(val2))))))
+
+            self.write(cr, uid, statement.id, {'balance_end_real':Decimal(str(val_statement_line))+Decimal(str(val2)),'closing_date':time.strftime("%Y-%m-%d %H:%M:%S"),'state':'draft'})
+        return  super(account_bank_statement, self).button_confirm(cr, uid, ids, context=None)
+
 account_bank_statement()
 
 class account_bank_statement_line(osv.osv):
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
index 956316b4e97..805739168f0 100644
--- a/addons/point_of_sale/pos_wizard.xml
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -7,8 +7,5 @@
         menu="False"
         name="pos.return.picking"
         string="Return Goods"/>
-
-		<wizard string="Add products" model="pos.order"
-				name="pos.add_product" id="pos_add_product"  menu="False"/>
 	</data>
 </openerp>
diff --git a/addons/point_of_sale/posrule_data.xml b/addons/point_of_sale/posrule_data.xml
index 05313a72d51..b85fe0b8e4c 100644
--- a/addons/point_of_sale/posrule_data.xml
+++ b/addons/point_of_sale/posrule_data.xml
@@ -1,61 +1,6 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
-        <!-- <record id="res_partner_tinyshop0" model="res.partner">
-            <field eval="0" name="customer"/>
-            <field eval="0" name="supplier"/>
-            <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;Tiny Shop 1&quot;&quot;&quot;" name="name"/>
-        </record>
-        <record id="res_partner_address_fabien0" model="res.partner.address">
-            <field eval="&quot;&quot;&quot;Fabien&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;92000&quot;&quot;&quot;" name="zip"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
-            <field name="partner_id" ref="stock.res_partner_tinyshop0"/>
-            <field name="country_id" ref="base.fr"/>
-            <field eval="&quot;&quot;&quot;Avenue de Paris&quot;&quot;&quot;" name="street"/>
-            <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;default&quot;&quot;&quot;" name="type"/>
-        </record>
-        <record id="res_company_shop0" model="res.company">
-            <field eval="5.0" name="security_lead"/>
-            <field name="currency_id" ref="base.EUR"/>
-            <field eval="1.0" name="po_lead"/>
-            <field name="partner_id" ref="res_partner_tinyshop0"/>
-            <field eval="1.0" name="manufacturing_lead"/>
-            <field name="parent_id" ref="base.main_company"/>
-            <field eval="80.0" name="schedule_range"/>
-            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
-
-        </record>
-        <record id="res_partner_tinyshop1" model="res.partner">
-            <field eval="1" name="customer"/>
-            <field eval="0" name="supplier"/>
-            <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;Tiny Shop 2&quot;&quot;&quot;" name="name"/>
-       </record>
-        <record id="res_partner_address_eric0" model="res.partner.address">
-            <field eval="&quot;&quot;&quot;Eric&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;1500&quot;&quot;&quot;" name="zip"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
-            <field name="partner_id" ref="res_partner_tinyshop1"/>
-            <field name="country_id" ref="base.fr"/>
-            <field eval="&quot;&quot;&quot;Avenue de la Resistance&quot;&quot;&quot;" name="street"/>
-            <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;default&quot;&quot;&quot;" name="type"/>
-            <field name="partner_id" ref="res_partner_tinyshop1"/>
-            <field eval="1" name="active"/>
-        </record>-->
-<!--        <record id="res_company_tinyshop0" model="res.company">-->
-<!--            <field name="currency_id" ref="base.EUR"/>-->
-<!--            <field eval="1.0" name="po_lead"/>-->
-<!--            <field name="partner_id" ref="res_partner_tinyshop1"/>-->
-<!--            <field eval="1.0" name="manufacturing_lead"/>-->
-<!--            <field name="parent_id" ref="base.main_company"/>-->
-<!--            <field eval="80.0" name="schedule_range"/>-->
-<!--            <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>-->
-<!--        </record>-->
-
 
    		<record id="res_users_shopuser0" model="res.users">
             <field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
@@ -575,11 +520,6 @@
             id="stock.next_id_61"
             name="Reporting"
             parent="stock.menu_stock_root" groups="base.group_user"/>
-<!--        <menuitem-->
-<!--            id="stock.next_id_62"-->
-<!--            name="Traceability"-->
-<!--            parent="stock.next_id_61" groups="base.group_user"/>-->
-<!--        <menuitem id="stock.menu_traceability_low" name="Low Level" parent="stock.menu_traceability" groups="base.group_user"/>-->
 		<menuitem action="stock.action_picking_tree" id="stock.menu_action_picking_tree" parent="stock.menu_stock_root" sequence="19" groups="res_groups_posuser0"/>
         <menuitem id="mrp.menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4" groups="base.group_user"/>
         <menuitem parent="stock.next_id_61" action="stock.action_stock_line_date" id="stock.menu_report_stock_line_date" groups="base.group_user"/>
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index 80b2b1ec756..cef2748b5e4 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -434,7 +434,11 @@
             string="Close Register"
             action="action_pos_close_statement"
             id="menu_close_statement" sequence="2" />
-
+       
+       <menuitem icon="STOCK_PRINT"
+       			 action="action_report_all_closed_cashbox_of_the_day"
+				 id="menu_all_closed_cashbox_of_the_day"
+				 parent="menu_point_report_register"/>
             
 	</data>
 </openerp>

From db92ea20a9528d5d82adc0885d1e8a8440673288 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 23 Apr 2010 15:23:26 +0530
Subject: [PATCH 08/84] Point_of_sale Task Id 578: add the report file and
 merge the code,remove the unused file

bzr revid: sbh@tinyerp.com-20100423095326-87d65n0fgjmh8exh
---
 addons/point_of_sale/pos.py                   | 228 +----------------
 addons/point_of_sale/report/__init__.py       |   1 +
 .../report/point_of_sale_report.py            | 242 ++++++++++++++++++
 addons/point_of_sale/sale_wizard.xml          |   6 -
 addons/point_of_sale/stock.py                 |  38 ---
 5 files changed, 252 insertions(+), 263 deletions(-)
 create mode 100644 addons/point_of_sale/report/point_of_sale_report.py
 delete mode 100644 addons/point_of_sale/sale_wizard.xml
 delete mode 100644 addons/point_of_sale/stock.py

diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index a68adbf59b6..ebabe10e48a 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -345,7 +345,7 @@ class pos_order(osv.osv):
         'note_2': fields.char('Customer Note',size=64),
         'type_rec': fields.char('Type of Receipt',size=64),
         'remboursed': fields.boolean('Remboursed'),
-        'contract_number': fields.char('Contract Number', size=512, select=1),
+        'contract_number': fields.char('Contact Number', size=512, select=1),
         'journal_entry': fields.boolean('Journal Entry'),
     }
 
@@ -1298,224 +1298,6 @@ class pos_payment(osv.osv):
 
 pos_payment()
 
-
-class report_transaction_pos(osv.osv):
-    _name = "report.transaction.pos"
-    _description = "transaction for the pos"
-    _auto = False
-    _columns = {
-        'date_create': fields.char('Date', size=16, readonly=True),
-        'journal_id': fields.many2one('account.journal', 'Sales Journal', readonly=True),
-        'jl_id': fields.many2one('account.journal', 'Cash Journals', readonly=True),
-        'user_id': fields.many2one('res.users', 'User', readonly=True),
-        'no_trans': fields.float('Number of Transaction', readonly=True),
-        'amount': fields.float('Amount', readonly=True),
-        'invoice_id': fields.float('Nbr Invoice', readonly=True),
-        'invoice_am': fields.float('Invoice Amount', readonly=True),
-        'product_nb': fields.float('Product Nb.', readonly=True),
-        'disc': fields.float('Disc.', readonly=True),
-    }
-
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_transaction_pos')
-        cr.execute("""
-            create or replace view report_transaction_pos as (
-               select
-                    min(absl.id) as id,
-                    count(absl.id) as no_trans,
-                    sum(absl.amount) as amount,
-                    sum(line.price_ded) as disc,
-                    to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text as date_create,
-                    po.user_id as user_id,
-                    po.sale_journal as journal_id,
-                    abs.journal_id as jl_id,
-                    count(po.invoice_id) as invoice_id,
-                    count(p.id) as product_nb
-                from
-                    account_bank_statement_line as absl,
-                    account_bank_statement as abs,
-                    product_product as p,
-                    pos_order_line as line,
-                    pos_order as po
-                where
-                    absl.pos_statement_id = po.id and
-                    line.order_id=po.id and
-                    line.product_id=p.id and
-                    absl.statement_id=abs.id
-
-                group by
-                    po.user_id,po.sale_journal, abs.journal_id,
-                    to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text
-                )
-        """)
-                    #to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')
-                    #to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text as date_create,
-report_transaction_pos()
-
-class report_sales_by_user_pos(osv.osv):
-    _name = "report.sales.by.user.pos"
-    _description = "Sales by user"
-    _auto = False
-    _columns = {
-        'date_order': fields.date('Order Date',required=True, select=True),
-        'amount': fields.float('Total', readonly=True, select=True),
-        'qty': fields.float('Quantity', readonly=True, select=True),
-        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
-    }
-
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_sales_by_user_pos')
-        cr.execute("""
-            create or replace view report_sales_by_user_pos as (
-                select
-                    min(po.id) as id,
-                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text as date_order,
-                    po.user_id as user_id,
-                    sum(pol.qty)as qty,
-                    sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as amount
-                from
-                    pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt
-                where
-                    pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id
-               group by
-                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text,
-                    po.user_id
-
-                )
-        """)
-report_sales_by_user_pos()
-
-class report_sales_by_user_pos_month(osv.osv):
-    _name = "report.sales.by.user.pos.month"
-    _description = "Sales by user monthly"
-    _auto = False
-    _columns = {
-        'date_order': fields.date('Order Date',required=True, select=True),
-        'amount': fields.float('Total', readonly=True, select=True),
-        'qty': fields.float('Quantity', readonly=True, select=True),
-        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
-    }
-
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_sales_by_user_pos_month')
-        cr.execute("""
-            create or replace view report_sales_by_user_pos_month as (
-                select
-                    min(po.id) as id,
-                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text as date_order,
-                    po.user_id as user_id,
-                    sum(pol.qty)as qty,
-                    sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as amount
-                from
-                    pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt
-                where
-                    pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id
-               group by
-                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text,
-                    po.user_id
-
-                )
-        """)
-report_sales_by_user_pos_month()
-
-class report_sales_by_margin_pos(osv.osv):
-    _name = "report.sales.by.margin.pos"
-    _description = "Sales by margin"
-    _auto = False
-    _columns = {
-#        'pos_name': fields.char('POS Order', size=64, readonly=True),
-        'product_name':fields.char('Product Name', size=64, readonly=True),
-        'date_order': fields.date('Order Date',required=True, select=True),
-     #   'amount': fields.float('Total', readonly=True, select=True),
-        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
-        'qty': fields.float('Qty', readonly=True, select=True),
-        'net_margin_per_qty':fields.float('Net margin per Qty', readonly=True, select=True),
-        'total':fields.float('Margin', readonly=True, select=True),
-
-    }
-
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_sales_by_margin_pos')
-        cr.execute("""
-            create or replace view report_sales_by_margin_pos as (
-                select
-                    min(pol.id) as id,
-                    po.user_id as user_id,
-                    pt.name as product_name,
-                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text as date_order,
-                    sum(pol.qty) as qty,
-                    pt.list_price-pt.standard_price as net_margin_per_qty,
-                    (pt.list_price-pt.standard_price) *sum(pol.qty) as total
-                from
-                    product_template as pt,
-                    product_product as pp,
-                    pos_order_line as pol,
-                    pos_order as po
-                where
-                    pol.product_id = pp.product_tmpl_id and
-                    pp.product_tmpl_id = pt.id and
-                    po.id = pol.order_id
-
-                group by
-                    pt.name,
-                    pt.list_price,
-                    pt.standard_price,
-                    po.user_id,
-                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text
-
-                )
-        """)
-report_sales_by_margin_pos()
-
-class report_sales_by_margin_pos_month(osv.osv):
-    _name = "report.sales.by.margin.pos.month"
-    _description = "Sales by margin monthly"
-    _auto = False
-    _columns = {
-
-        'product_name':fields.char('Product Name', size=64, readonly=True),
-        'date_order': fields.date('Order Date',required=True, select=True),
-        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
-        'qty': fields.float('Qty', readonly=True, select=True),
-        'net_margin_per_qty':fields.float('Net margin per Qty', readonly=True, select=True),
-        'total':fields.float('Margin', readonly=True, select=True),
-
-    }
-
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_sales_by_margin_pos_month')
-        cr.execute("""
-            create or replace view report_sales_by_margin_pos_month as (
-                select
-                    min(pol.id) as id,
-                    po.user_id as user_id,
-                    pt.name as product_name,
-                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text as date_order,
-                    sum(pol.qty) as qty,
-                    pt.list_price-pt.standard_price as net_margin_per_qty,
-                    (pt.list_price-pt.standard_price) *sum(pol.qty) as total
-                from
-                    product_template as pt,
-                    product_product as pp,
-                    pos_order_line as pol,
-                    pos_order as po
-                where
-                    pol.product_id = pp.product_tmpl_id and
-                    pp.product_tmpl_id = pt.id and
-                    po.id = pol.order_id
-
-                group by
-                    pt.name,
-                    pt.list_price,
-                    pt.standard_price,
-                    po.user_id,
-                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text
-
-                )
-        """)
-report_sales_by_margin_pos_month()
-
-
 class account_move_line(osv.osv):
     _inherit = 'account.move.line'
     def create(self, cr, user, vals, context={}):
@@ -1565,5 +1347,13 @@ class product_product(osv.osv):
     _defaults = {
         'disc_controle': lambda *a: True,
 }
+class stock_picking(osv.osv):
+
+    _inherit = 'stock.picking'
+    _columns = {
+        'pos_order': fields.many2one('pos.order', 'Pos order'),
+    }
+stock_picking()
+
 product_product()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/report/__init__.py b/addons/point_of_sale/report/__init__.py
index a5798add7b4..4af503ff9da 100644
--- a/addons/point_of_sale/report/__init__.py
+++ b/addons/point_of_sale/report/__init__.py
@@ -36,5 +36,6 @@ import pos_payment_report_user
 import pos_sales_user_today_current_user
 import pos_receipt_with_remboursment
 import pos_receipt_without_remboursment
+import point_of_sale_report
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/report/point_of_sale_report.py b/addons/point_of_sale/report/point_of_sale_report.py
new file mode 100644
index 00000000000..10ba94662a2
--- /dev/null
+++ b/addons/point_of_sale/report/point_of_sale_report.py
@@ -0,0 +1,242 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+import time
+import netsvc
+import tools
+
+class report_transaction_pos(osv.osv):
+    _name = "report.transaction.pos"
+    _description = "transaction for the pos"
+    _auto = False
+    _columns = {
+        'date_create': fields.char('Date', size=16, readonly=True),
+        'journal_id': fields.many2one('account.journal', 'Sales Journal', readonly=True),
+        'jl_id': fields.many2one('account.journal', 'Cash Journals', readonly=True),
+        'user_id': fields.many2one('res.users', 'User', readonly=True),
+        'no_trans': fields.float('Number of Transaction', readonly=True),
+        'amount': fields.float('Amount', readonly=True),
+        'invoice_id': fields.float('Nbr Invoice', readonly=True),
+        'invoice_am': fields.float('Invoice Amount', readonly=True),
+        'product_nb': fields.float('Product Nb.', readonly=True),
+        'disc': fields.float('Disc.', readonly=True),
+    }
+
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_transaction_pos')
+        cr.execute("""
+            create or replace view report_transaction_pos as (
+               select
+                    min(absl.id) as id,
+                    count(absl.id) as no_trans,
+                    sum(absl.amount) as amount,
+                    sum(line.price_ded) as disc,
+                    to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text as date_create,
+                    po.user_id as user_id,
+                    po.sale_journal as journal_id,
+                    abs.journal_id as jl_id,
+                    count(po.invoice_id) as invoice_id,
+                    count(p.id) as product_nb
+                from
+                    account_bank_statement_line as absl,
+                    account_bank_statement as abs,
+                    product_product as p,
+                    pos_order_line as line,
+                    pos_order as po
+                where
+                    absl.pos_statement_id = po.id and
+                    line.order_id=po.id and
+                    line.product_id=p.id and
+                    absl.statement_id=abs.id
+
+                group by
+                    po.user_id,po.sale_journal, abs.journal_id,
+                    to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text
+                )
+        """)
+                    #to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')
+                    #to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text as date_create,
+report_transaction_pos()
+
+class report_sales_by_user_pos(osv.osv):
+    _name = "report.sales.by.user.pos"
+    _description = "Sales by user"
+    _auto = False
+    _columns = {
+        'date_order': fields.date('Order Date',required=True, select=True),
+        'amount': fields.float('Total', readonly=True, select=True),
+        'qty': fields.float('Quantity', readonly=True, select=True),
+        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
+    }
+
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_sales_by_user_pos')
+        cr.execute("""
+            create or replace view report_sales_by_user_pos as (
+                select
+                    min(po.id) as id,
+                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text as date_order,
+                    po.user_id as user_id,
+                    sum(pol.qty)as qty,
+                    sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as amount
+                from
+                    pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt
+                where
+                    pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id
+               group by
+                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text,
+                    po.user_id
+
+                )
+        """)
+report_sales_by_user_pos()
+
+class report_sales_by_user_pos_month(osv.osv):
+    _name = "report.sales.by.user.pos.month"
+    _description = "Sales by user monthly"
+    _auto = False
+    _columns = {
+        'date_order': fields.date('Order Date',required=True, select=True),
+        'amount': fields.float('Total', readonly=True, select=True),
+        'qty': fields.float('Quantity', readonly=True, select=True),
+        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
+    }
+
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_sales_by_user_pos_month')
+        cr.execute("""
+            create or replace view report_sales_by_user_pos_month as (
+                select
+                    min(po.id) as id,
+                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text as date_order,
+                    po.user_id as user_id,
+                    sum(pol.qty)as qty,
+                    sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as amount
+                from
+                    pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt
+                where
+                    pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id
+               group by
+                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text,
+                    po.user_id
+
+                )
+        """)
+report_sales_by_user_pos_month()
+
+class report_sales_by_margin_pos(osv.osv):
+    _name = "report.sales.by.margin.pos"
+    _description = "Sales by margin"
+    _auto = False
+    _columns = {
+#        'pos_name': fields.char('POS Order', size=64, readonly=True),
+        'product_name':fields.char('Product Name', size=64, readonly=True),
+        'date_order': fields.date('Order Date',required=True, select=True),
+     #   'amount': fields.float('Total', readonly=True, select=True),
+        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
+        'qty': fields.float('Qty', readonly=True, select=True),
+        'net_margin_per_qty':fields.float('Net margin per Qty', readonly=True, select=True),
+        'total':fields.float('Margin', readonly=True, select=True),
+
+    }
+
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_sales_by_margin_pos')
+        cr.execute("""
+            create or replace view report_sales_by_margin_pos as (
+                select
+                    min(pol.id) as id,
+                    po.user_id as user_id,
+                    pt.name as product_name,
+                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text as date_order,
+                    sum(pol.qty) as qty,
+                    pt.list_price-pt.standard_price as net_margin_per_qty,
+                    (pt.list_price-pt.standard_price) *sum(pol.qty) as total
+                from
+                    product_template as pt,
+                    product_product as pp,
+                    pos_order_line as pol,
+                    pos_order as po
+                where
+                    pol.product_id = pp.product_tmpl_id and
+                    pp.product_tmpl_id = pt.id and
+                    po.id = pol.order_id
+
+                group by
+                    pt.name,
+                    pt.list_price,
+                    pt.standard_price,
+                    po.user_id,
+                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text
+
+                )
+        """)
+report_sales_by_margin_pos()
+
+class report_sales_by_margin_pos_month(osv.osv):
+    _name = "report.sales.by.margin.pos.month"
+    _description = "Sales by margin monthly"
+    _auto = False
+    _columns = {
+
+        'product_name':fields.char('Product Name', size=64, readonly=True),
+        'date_order': fields.date('Order Date',required=True, select=True),
+        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
+        'qty': fields.float('Qty', readonly=True, select=True),
+        'net_margin_per_qty':fields.float('Net margin per Qty', readonly=True, select=True),
+        'total':fields.float('Margin', readonly=True, select=True),
+
+    }
+
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_sales_by_margin_pos_month')
+        cr.execute("""
+            create or replace view report_sales_by_margin_pos_month as (
+                select
+                    min(pol.id) as id,
+                    po.user_id as user_id,
+                    pt.name as product_name,
+                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text as date_order,
+                    sum(pol.qty) as qty,
+                    pt.list_price-pt.standard_price as net_margin_per_qty,
+                    (pt.list_price-pt.standard_price) *sum(pol.qty) as total
+                from
+                    product_template as pt,
+                    product_product as pp,
+                    pos_order_line as pol,
+                    pos_order as po
+                where
+                    pol.product_id = pp.product_tmpl_id and
+                    pp.product_tmpl_id = pt.id and
+                    po.id = pol.order_id
+
+                group by
+                    pt.name,
+                    pt.list_price,
+                    pt.standard_price,
+                    po.user_id,
+                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text
+
+                )
+        """)
+report_sales_by_margin_pos_month()
+
diff --git a/addons/point_of_sale/sale_wizard.xml b/addons/point_of_sale/sale_wizard.xml
deleted file mode 100644
index ca741e2c808..00000000000
--- a/addons/point_of_sale/sale_wizard.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-	<data>
-		<wizard string="Pos payment" model="sale.order" name="sale.pos_payment" id="pos_payment" />
-	</data>
-</openerp>
diff --git a/addons/point_of_sale/stock.py b/addons/point_of_sale/stock.py
deleted file mode 100644
index 95630569a7c..00000000000
--- a/addons/point_of_sale/stock.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import osv, fields
-import time
-import netsvc
-
-
-class stock_picking(osv.osv):
-
-    _inherit = 'stock.picking'
-    _columns = {
-        'pos_order': fields.many2one('pos.order', 'Pos order'),
-     #   'company_id':fields.many2one('res.company', 'Company', required=True),
-    }
-stock_picking()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From a1e3c5c8999d7d2fe1b457f172bcc969cd377357 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 23 Apr 2010 15:58:01 +0530
Subject: [PATCH 09/84] Point_of_sale Task Id 578: Merge the code of account
 relatd in pos_account_bank_statement

bzr revid: sbh@tinyerp.com-20100423102801-jvoekq0y1t2qxagc
---
 addons/point_of_sale/__init__.py              |  3 +-
 addons/point_of_sale/pos.py                   | 63 -------------------
 .../pos_account_bank_statement.py             | 51 ++++++++++++++-
 3 files changed, 52 insertions(+), 65 deletions(-)

diff --git a/addons/point_of_sale/__init__.py b/addons/point_of_sale/__init__.py
index 9f9f5a21960..5f6680b869c 100644
--- a/addons/point_of_sale/__init__.py
+++ b/addons/point_of_sale/__init__.py
@@ -21,10 +21,11 @@
 ##############################################################################
 
 import pos
+import pos_account_bank_statement
 import stock
 import wizard
 import report
-import pos_account_bank_statement
+
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index ebabe10e48a..c996ba48c21 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -1038,31 +1038,6 @@ class pos_order(osv.osv):
 
 pos_order()
 
-class account_bank_statement(osv.osv):
-    _inherit = 'account.bank.statement'
-    _columns={
-        'user_id': fields.many2one('res.users',ondelete='cascade',string='User', readonly=True),
-    }
-    _defaults = {
-        'user_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).id
-    }
-account_bank_statement()
-
-class account_bank_statement_line(osv.osv):
-    _inherit = 'account.bank.statement.line'
-    def _get_statement_journal(self, cr, uid, ids, context, *a):
-        res = {}
-        for line in self.browse(cr, uid, ids):
-            res[line.id] = line.statement_id and line.statement_id.journal_id and line.statement_id.journal_id.name or None
-        return res
-    _columns={
-        'journal_id': fields.function(_get_statement_journal, method=True,store=True, string='Journal', type='char', size=64),
-        'am_out':fields.boolean("To count"),
-        'is_acc':fields.boolean("Is accompte"),
-        'pos_statement_id': fields.many2one('pos.order',ondelete='cascade'),
-    }
-account_bank_statement_line()
-
 class pos_order_line(osv.osv):
     _name = "pos.order.line"
     _description = "Lines of Point of Sale"
@@ -1298,44 +1273,6 @@ class pos_payment(osv.osv):
 
 pos_payment()
 
-class account_move_line(osv.osv):
-    _inherit = 'account.move.line'
-    def create(self, cr, user, vals, context={}):
-        pos_obj = self.pool.get('pos.order')
-        val_name = vals.get('name', '')
-        val_ref = vals.get('ref', '')
-        if (val_name and 'POS' in val_name) and (val_ref and 'PACK' in val_ref):
-            aaa = re.search(r'Stock move.\((.*)\)', vals.get('name'))
-            name_pos = aaa.groups()[0]
-            pos_id = name_pos.replace('POS ','')
-            if pos_id and pos_id.isdigit():
-                pos_curr = pos_obj.browse(cr,user,int(pos_id))
-                pos_curr = pos_curr  and pos_curr.contract_number or ''
-                vals['ref'] = pos_curr or vals.get('ref')
-        return super(account_move_line, self).create(cr, user, vals, context)
-
-account_move_line()
-
-
-class account_move(osv.osv):
-    _inherit = 'account.move'
-    def create(self, cr, user, vals, context={}):
-        pos_obj = self.pool.get('pos.order')
-        val_name = vals.get('name', '')
-        val_ref = vals.get('ref', '')
-        if (val_name and 'POS' in val_name) and (val_ref and 'PACK' in val_ref):
-            aaa = re.search(r'Stock move.\((.*)\)', vals.get('name'))
-            name_pos = aaa.groups()[0]
-            pos_id = name_pos.replace('POS ','')
-            if pos_id and pos_id.isdigit():
-                pos_curr = pos_obj.browse(cr,user,int(pos_id))
-                pos_curr = pos_curr  and pos_curr.contract_number or ''
-                vals['ref'] = pos_curr or vals.get('ref')
-        return super(account_move, self).create(cr, user, vals, context)
-
-account_move()
-
-
 class product_product(osv.osv):
     _inherit = 'product.product'
     _columns = {
diff --git a/addons/point_of_sale/pos_account_bank_statement.py b/addons/point_of_sale/pos_account_bank_statement.py
index deb6973a1c3..c23a3cf3dd5 100644
--- a/addons/point_of_sale/pos_account_bank_statement.py
+++ b/addons/point_of_sale/pos_account_bank_statement.py
@@ -137,7 +137,7 @@ class account_bank_statement(osv.osv):
           'starting_details_ids': fields.one2many('singer.statement', 'starting_id', string='Starting Details'),
           'ending_details_ids': fields.one2many('singer.statement', 'ending_id', string='Ending Details'),
           'name': fields.char('Name', size=64, required=True, readonly=True),
-        
+          'user_id': fields.many2one('res.users',ondelete='cascade',string='User', readonly=True),          
     }
     _defaults = {
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
@@ -145,6 +145,7 @@ class account_bank_statement(osv.osv):
         'name': lambda *a: '/',
         'date': lambda *a:time.strftime("%Y-%m-%d %H:%M:%S"),
         'journal_id': _default_journal_id,
+        'user_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).id        
     }
     def create(self, cr, uid, vals, context=None):
         
@@ -260,15 +261,63 @@ class account_bank_statement_line(osv.osv):
         if user.company_id:
             return user.company_id.id
         return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
+
+    def _get_statement_journal(self, cr, uid, ids, context, *a):
+        res = {}
+        for line in self.browse(cr, uid, ids):
+            res[line.id] = line.statement_id and line.statement_id.journal_id and line.statement_id.journal_id.name or None
+        return res
     
     _inherit = 'account.bank.statement.line'
     _columns = {
         'company_id':fields.many2one('res.company', 'Company', required=True),
+        'journal_id': fields.function(_get_statement_journal, method=True,store=True, string='Journal', type='char', size=64),
+        'am_out':fields.boolean("To count"),
+        'is_acc':fields.boolean("Is accompte"),
+        'pos_statement_id': fields.many2one('pos.order',ondelete='cascade'),        
     }
     _defaults = {
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
+    
 account_bank_statement_line()
 
+class account_move_line(osv.osv):
+    _inherit = 'account.move.line'
+    def create(self, cr, user, vals, context={}):
+        pos_obj = self.pool.get('pos.order')
+        val_name = vals.get('name', '')
+        val_ref = vals.get('ref', '')
+        if (val_name and 'POS' in val_name) and (val_ref and 'PACK' in val_ref):
+            aaa = re.search(r'Stock move.\((.*)\)', vals.get('name'))
+            name_pos = aaa.groups()[0]
+            pos_id = name_pos.replace('POS ','')
+            if pos_id and pos_id.isdigit():
+                pos_curr = pos_obj.browse(cr,user,int(pos_id))
+                pos_curr = pos_curr  and pos_curr.contract_number or ''
+                vals['ref'] = pos_curr or vals.get('ref')
+        return super(account_move_line, self).create(cr, user, vals, context)
+
+account_move_line()
+
+
+class account_move(osv.osv):
+    _inherit = 'account.move'
+    def create(self, cr, user, vals, context={}):
+        pos_obj = self.pool.get('pos.order')
+        val_name = vals.get('name', '')
+        val_ref = vals.get('ref', '')
+        if (val_name and 'POS' in val_name) and (val_ref and 'PACK' in val_ref):
+            aaa = re.search(r'Stock move.\((.*)\)', vals.get('name'))
+            name_pos = aaa.groups()[0]
+            pos_id = name_pos.replace('POS ','')
+            if pos_id and pos_id.isdigit():
+                pos_curr = pos_obj.browse(cr,user,int(pos_id))
+                pos_curr = pos_curr  and pos_curr.contract_number or ''
+                vals['ref'] = pos_curr or vals.get('ref')
+        return super(account_move, self).create(cr, user, vals, context)
+
+account_move()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From dd8501d46385db109134a3ac8d3414ba91bea6bb Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Fri, 23 Apr 2010 17:20:16 +0530
Subject: [PATCH 10/84] [IMP] delivery,sale: Delivery Cost Improvement on sale,
 Task id-584

bzr revid: mso@mso-20100423115016-feh97hnjecr03m9p
---
 addons/delivery/delivery.py                   | 14 ++++++++---
 addons/delivery/delivery_view.xml             | 11 +++++++++
 .../wizard/delivery_sale_order_view.xml       | 24 ++++++++++---------
 addons/sale/sale_view.xml                     |  2 +-
 4 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 7e7d31975e5..e1696820634 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -28,6 +28,17 @@ class delivery_carrier(osv.osv):
     _name = "delivery.carrier"
     _description = "Carrier and delivery grids"
 
+    def name_get(self, cr, uid, ids, context={}):
+        if not len(ids):
+            return []
+        order_id = context.get('order_id',False)
+        if not order_id:
+            res = super(delivery_carrier, self).name_get(cr, uid, ids, context=context)
+        else:
+            order = self.pool.get('sale.order').browse(cr, uid, [order_id])[0]
+            currency = order.partner_id.property_product_pricelist.currency_id.name or ''
+            res = [(r['id'], r['name']+' ('+(str(r['price']))+' '+currency+')') for r in self.read(cr, uid, ids, ['name', 'price'], context)]
+        return res
     def get_price(self, cr, uid, ids, field_name, arg=None, context={}):
         res={}
         sale_obj=self.pool.get('sale.order')
@@ -94,9 +105,7 @@ class delivery_grid(osv.osv):
     }
     _order = 'sequence'
 
-
     def get_price(self, cr, uid, id, order, dt, context):
-
         total = 0
         weight = 0
         volume = 0
@@ -112,7 +121,6 @@ class delivery_grid(osv.osv):
 
     def get_price_from_picking(self, cr, uid, id, total, weight, volume, context={}):
         grid = self.browse(cr, uid, id, context)
-
         price = 0.0
         ok = False
 
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 16f4a61ed1e..f14d45c79de 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -289,5 +289,16 @@
             </field>
         </record>
 
+        <record model="ir.ui.view" id="edit_project_multicompany">
+            <field name="name">sale.order.multicompany</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="arch" type="xml">
+                    <xpath expr="/form/notebook/page[@string='Sale Order']/group[1]/button[@name='button_dummy']" position="after">
+ 			        	<button name="%(action_delivery_cost)d" states="draft" string="Delivery Costs" type="action" icon="gtk-execute" context="{'order_id':id}"/>                    
+ 			        </xpath>
+            </field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/delivery/wizard/delivery_sale_order_view.xml b/addons/delivery/wizard/delivery_sale_order_view.xml
index 1bdaffd831f..8cb10748432 100644
--- a/addons/delivery/wizard/delivery_sale_order_view.xml
+++ b/addons/delivery/wizard/delivery_sale_order_view.xml
@@ -11,8 +11,9 @@
             <field name="arch" type="xml">
                 <form string="Create Deliveries">
                 	<separator colspan="4" string="Delivery Method" />
-				    <field name="carrier_id"/>
+				    <field name="carrier_id" widget="selection"/>
 				    <newline/>
+				    <separator colspan="4"/>
 				    <group col="2" colspan="4">
                 		<button icon='gtk-cancel' special="cancel"
                 			string="Cancel" />
@@ -22,15 +23,16 @@
                 </form>
             </field>
         </record>
-<!-- 
-        <act_window name="Delivery Costs"		    
-		    res_model="delivery.sale.order"
-		    src_model="sale.order"
-		    view_mode="form"
-		    target="new"        
-            key2="client_action_multi"    
-		    id="act_delivery_cost"/>
- -->
-       
+        
+		<record id="action_delivery_cost" model="ir.actions.act_window">
+            <field name="name">Delivery Costs</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">delivery.sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_make_delivery_wizard"/>
+            <field name="target">new</field>            
+        </record>
+
 	</data>
 </openerp>	
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 156ede282d0..a8d2974407c 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -188,7 +188,7 @@
                                 </tree>
                             </field>
                             <newline/>
-                            <group col="7" colspan="4">
+                            <group col="8" colspan="5">
                                 <field name="amount_untaxed" sum="Untaxed amount"/>
                                 <field name="amount_tax"/>
                                 <field name="amount_total" sum="Total amount"/>

From 9bc41e917012e446eac7b6e9c7d107269cbae8eb Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 23 Apr 2010 20:27:42 +0530
Subject: [PATCH 11/84] Point_of_sale Task Id 578: add the remove file

bzr revid: sbh@tinyerp.com-20100423145742-urqy20q7a3t8g68y
---
 addons/point_of_sale/__init__.py              |   1 +
 .../point_of_sale/account_bank_statement.py   | 248 +++++++++++++++++
 addons/point_of_sale/pos.py                   |  99 ++++++-
 .../pos_account_bank_statement.py             | 258 +-----------------
 4 files changed, 339 insertions(+), 267 deletions(-)
 create mode 100644 addons/point_of_sale/account_bank_statement.py

diff --git a/addons/point_of_sale/__init__.py b/addons/point_of_sale/__init__.py
index 5f6680b869c..ddd7dc3c01f 100644
--- a/addons/point_of_sale/__init__.py
+++ b/addons/point_of_sale/__init__.py
@@ -21,6 +21,7 @@
 ##############################################################################
 
 import pos
+import account_bank_statement
 import pos_account_bank_statement
 import stock
 import wizard
diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
new file mode 100644
index 00000000000..f40be32de80
--- /dev/null
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -0,0 +1,248 @@
+# encoding: utf-8
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 PC Solutions (<http://pcsol.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+import time
+from mx import DateTime
+from decimal import Decimal
+from tools.translate import _
+
+
+class account_journal(osv.osv):
+
+    _inherit = 'account.journal'
+    _columns = {
+        'auto_cash': fields.boolean('Automatic Opening', help="This field authorize the automatic creation of the cashbox"),
+        'special_journal':fields.boolean('Special Journal', help="Will put all the orders in waiting status till being accepted"),
+        'check_dtls': fields.boolean('Check Details', help="This field authorize Validation of Cashbox without checking ending details"),
+        'statement_sequence_id': fields.many2one('ir.sequence', 'Statement Sequence', \
+            help="The sequence used for statement numbers in this journal."),
+        }
+    _defaults = {
+        'check_dtls': lambda *a:True,
+        'auto_cash': lambda *a:True,
+        }
+account_journal()
+
+
+class singer_statement(osv.osv):
+    
+    """ Singer Statements """
+    
+    _name = 'singer.statement'
+    _description = 'Statements'
+
+    def _sub_total(self, cr, uid, ids, name, arg, context=None):
+       
+        """ Calculates Sub total"
+        @param name: Names of fields.
+        @param arg: User defined arguments
+        @return: Dictionary of values.
+        """
+        res = {}
+        for obj in self.browse(cr, uid, ids):
+            res[obj.id] = obj.pieces * obj.number
+        return res
+
+    def on_change_sub(self, cr, uid, ids, pieces, number,*a):
+
+        """ Calculates Sub total on change of number
+        @param pieces: Names of fields.
+        @param number:
+        """           
+        sub=pieces*number
+        return {'value':{'subtotal': sub or 0.0}}
+
+    _columns = {
+          'pieces': fields.float('Values', digits=(16,2)),
+          'number': fields.integer('Number'),
+          'subtotal': fields.function(_sub_total, method=True, string='Sub Total', type='float',digits=(16,2)),
+          'starting_id': fields.many2one('account.bank.statement',ondelete='cascade'),
+          'ending_id': fields.many2one('account.bank.statement',ondelete='cascade'),
+     }
+
+singer_statement()
+
+class account_bank_statement(osv.osv):
+    
+    _inherit = 'account.bank.statement'
+    
+    def _get_starting_balance(self, cr, uid, ids, name, arg, context=None):
+
+        """ Find starting balance  "
+        @param name: Names of fields.
+        @param arg: User defined arguments
+        @return: Dictionary of values.
+        """          
+        res ={}
+        for statement in self.browse(cr, uid, ids):
+            amount_total=0.0
+            for line in statement.starting_details_ids:
+                amount_total+= line.pieces * line.number
+            res[statement.id]=amount_total
+        return res
+
+    def _get_sum_entry_encoding(self, cr, uid, ids, name, arg, context=None):
+
+        """ Find encoding total of statements "
+        @param name: Names of fields.
+        @param arg: User defined arguments
+        @return: Dictionary of values.
+        """              
+        res2={}
+        for statement in self.browse(cr, uid, ids):
+            encoding_total=0.0
+            for line in statement.line_ids:
+               encoding_total+= line.amount
+            res2[statement.id]=encoding_total
+        return res2
+
+    def _default_journal_id(self, cr, uid, context={}):
+
+        """ To get default journal for the object" 
+        @param name: Names of fields.
+        @return: journal 
+        """  
+        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
+        journal = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('auto_cash','=',False), ('company_id', '=', company_id)])
+        if journal:
+            return journal[0]
+        else:
+            return False
+
+    _columns = {
+          'journal_id': fields.many2one('account.journal', 'Journal', required=True),
+          'balance_start': fields.function(_get_starting_balance, method=True, string='Starting Balance', type='float',digits=(16,2)),
+          'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirm'),('open','Open')],
+                                    'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
+          'total_entry_encoding':fields.function(_get_sum_entry_encoding, method=True, string="Total of Entry encoding"),
+          'date':fields.datetime("Opening Date"),
+          'closing_date':fields.datetime("Closing Date"),
+          'starting_details_ids': fields.one2many('singer.statement', 'starting_id', string='Starting Details'),
+          'ending_details_ids': fields.one2many('singer.statement', 'ending_id', string='Ending Details'),
+          'name': fields.char('Name', size=64, required=True, readonly=True),
+
+    }
+    _defaults = {
+          'state': lambda *a: 'draft',
+          'name': lambda *a: '/',
+          'date': lambda *a:time.strftime("%Y-%m-%d %H:%M:%S"),
+          'journal_id': _default_journal_id,
+
+         }
+
+    def create(self, cr, uid, vals, context=None):
+        
+        company_id = vals and vals.get('company_id',False)
+        if company_id:
+            open_jrnl = self.search(cr, uid, [('company_id', '=', vals['company_id']), ('journal_id', '=', vals['journal_id']), ('state', '=', 'open')])
+            if open_jrnl:
+                raise osv.except_osv('Error', u'Une caisse de type espèce est déjà ouverte')
+            if 'starting_details_ids' in vals:
+                vals['starting_details_ids'] = starting_details_ids = map(list, vals['starting_details_ids'])
+                for i in starting_details_ids:
+                    if i and i[0] and i[1]:
+                        i[0], i[1] = 0, 0
+        res = super(account_bank_statement, self).create(cr, uid, vals, context=context)
+        return res
+
+    def onchange_journal_id(self, cursor, user, statement_id, journal_id, context=None):
+        
+        """ Changes balance start and starting details if journal_id changes" 
+        @param statement_id: Changed statement_id
+        @param journal_id: Changed journal_id
+        @return:  Dictionary of changed values
+        """  
+        id_s=[]
+        if not journal_id:
+            return {'value': {'balance_start': 0.0}}
+        balance_start=0.0
+        cash_obj = self.pool.get('singer.statement')
+        statement_obj = self.pool.get('account.bank.statement')
+        cursor.execute("Select a.id from account_bank_statement a where journal_id=%d and user_id=%d order by a.id desc limit 1"%(journal_id,user))
+        res2=cursor.fetchone()
+        res2=res2 and res2[0] or None
+        if res2:
+            statmt_id=statement_obj.browse(cursor,user,res2)
+            check_det=statmt_id.journal_id.check_dtls
+            if not check_det:
+                balance_start=statmt_id.balance_end_real or 0.0
+                return {'value': {'balance_start': balance_start}}
+        cursor.execute("Select a.id from account_bank_statement a, singer_statement s where journal_id=%d and user_id=%d order by a.id desc limit 1"%(journal_id,user))
+        res1=cursor.fetchone()
+        res1=res1 and res1[0] or None
+        if res1:
+            cursor.execute("Select sum(ss.pieces*ss.number),ss.ending_id from singer_statement ss, account_bank_statement s where ss.ending_id=s.id and s.journal_id=%d and s.user_id=%d and s.id=%d group by ss.ending_id,s.id order by s.id desc"%(journal_id,user, res1))
+            res = cursor.fetchone()
+            balance_start = res and res[0] or 0.0
+            cash_end=res and res[1] or None
+            id_s=statement_obj.browse(cursor,user,cash_end).ending_details_ids
+        new=[]
+        if id_s:
+            for s in id_s:
+                new.append(s.id)
+        return {'value': {'balance_start': balance_start, 'starting_details_ids':new}}
+
+    def button_open(self, cr, uid, ids, context=None):
+        
+        """ Changes statement state to Running.
+        @return: True 
+        """       
+        obj_inv = self.browse(cr, uid, ids)[0]
+        s_id=obj_inv.journal_id
+        if s_id.statement_sequence_id:
+            s_id=s_id.id
+            number = self.pool.get('ir.sequence').get_id(cr, uid, s_id)
+        else:
+            number = self.pool.get('ir.sequence').get(cr, uid,
+                            'account.bank.statement')
+
+        self.write(cr, uid, ids, {'date':time.strftime("%Y-%m-%d %H:%M:%S"), 'state':'open', 'name':number})
+        return True
+
+    def button_confirm(self, cr, uid, ids, context=None):
+        
+        """ Check the starting and ending detail of  statement 
+        @return: True 
+        """         
+        val = 0.0
+        val2 = 0.0
+        val_statement_line = 0.0
+        diff = self.pool.get('res.users').browse(cr,uid,uid).company_id.max_diff or 0.0
+        for statement in self.browse(cr, uid, ids):
+            bal = statement.balance_end
+            bal_st=statement.balance_start
+            for st in statement.line_ids:
+                val_statement_line += st.amount
+            for stat in statement.starting_details_ids:
+                val2 += stat.subtotal
+            for stat in statement.ending_details_ids:
+                val += stat.subtotal
+            if statement.journal_id.check_dtls:
+                if Decimal(str(val)).quantize(Decimal('.001')) != (Decimal(str(val_statement_line)) + Decimal(str(val2))).quantize(Decimal('.001')):
+                    raise osv.except_osv(_('Invalid action !'), _(' You can not confirm your cashbox, Please enter ending details, missing value matches to "%s"')%(abs(Decimal(str(val))-(Decimal(str(val_statement_line))+Decimal(str(val2))))))
+
+            self.write(cr, uid, statement.id, {'balance_end_real':Decimal(str(val_statement_line))+Decimal(str(val2)),'closing_date':time.strftime("%Y-%m-%d %H:%M:%S"),'state':'draft'})
+        return  super(account_bank_statement, self).button_confirm(cr, uid, ids, context=None)
+
+account_bank_statement()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index c996ba48c21..58838e38743 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -227,6 +227,12 @@ class pos_order(osv.osv):
             res[order.id] = val
         return res
 
+#    def payment_get(self, cr, uid, ids, context=None):
+#        """  Calculates Total Returned  from the order
+#        @return: Dictionary of values """          
+#        cr.execute("select id from pos_payment where order_id =ANY(%s)",(ids,))
+#        return [i[0] for i in cr.fetchall()]
+
     def _sale_journal_get(self, cr, uid, context):
         
         """ To get  sale journal for this order" 
@@ -247,6 +253,7 @@ class pos_order(osv.osv):
                
         company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
         res = self.pool.get('sale.shop').search(cr, uid, [])
+       # res = self.pool.get('sale.shop').search(cr, uid, [('company_id', '=', company.id)])
         if res:
             return res[0]
         else:
@@ -338,14 +345,24 @@ class pos_order(osv.osv):
         'first_name': fields.char('First Name', size=64),
         'state_2': fields.function(_get_v,type='selection',selection=[('to_verify', 'To Verify'), ('accepted', 'Accepted'),
             ('refused', 'Refused')], string='State', readonly=True, method=True, store=True),
+        
+    #    'last_name': fields.char('Last Name', size=64),
+    #    'street': fields.char('Street', size=64),
+    #    'zip2': fields.char('Zip', size=64),
+    #    'city': fields.char('City', size=64),
+    #    'mobile': fields.char('Mobile', size=64),
+    #    'email': fields.char('Email', size=64),
         'note': fields.text('Internal Notes'),
         'nb_print': fields.integer('Number of Print', readonly=True),
         'sale_journal': fields.many2one('account.journal', 'Journal', required=True, states={'draft': [('readonly', False)]}, readonly=True, ),
+      #  'account_receivable': fields.many2one('account.account',
+      #      'Default Receivable', required=True, states={'draft': [('readonly', False)]},
+      #      readonly=True, ),
         'invoice_wanted': fields.boolean('Create Invoice'),
         'note_2': fields.char('Customer Note',size=64),
         'type_rec': fields.char('Type of Receipt',size=64),
         'remboursed': fields.boolean('Remboursed'),
-        'contract_number': fields.char('Contact Number', size=512, select=1),
+        'contract_number': fields.char('Contract Number', size=512, select=1),
         'journal_entry': fields.boolean('Journal Entry'),
     }
 
@@ -526,6 +543,7 @@ class pos_order(osv.osv):
                     cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order.shop_id.warehouse_id.id))
                     res=cr.fetchone()
                     location_id=res and res[0] or None
+#                    location_id = order and order.shop_id and order.shop_id.warehouse_id and order.shop_id.warehouse_id.lot_stock_id.id or None
                     stock_dest_id = int(val.split(',')[1])
                     if line.qty < 0:
                         location_id, stock_dest_id = stock_dest_id, location_id
@@ -984,7 +1002,9 @@ class pos_order(osv.osv):
                                                                         'statement_id': False,
                                                                         'account_id':order_account
                                                                      })
+           #     account_move_obj.button_validate(cr, uid, [move_id, payment_move_id], context=context)
             self.write(cr,uid,order.id,{'state':'done'})
+         #       account_move_line_obj.reconcile(cr, uid, to_reconcile, type='manual', context=context)
         return True
 
     def cancel_picking(self, cr, uid, ids, context=None):
@@ -1025,6 +1045,7 @@ class pos_order(osv.osv):
         for order in self.browse(cr, uid, ids, context=context):
             if not order.journal_entry:
                 self.create_account_move(cr, uid, ids, context={})
+        #self.write(cr, uid, ids, {'state': 'done'})
         return True
 
     def compute_state(self, cr, uid, id):
@@ -1038,6 +1059,31 @@ class pos_order(osv.osv):
 
 pos_order()
 
+class account_bank_statement(osv.osv):
+    _inherit = 'account.bank.statement'
+    _columns={
+        'user_id': fields.many2one('res.users',ondelete='cascade',string='User', readonly=True),
+    }
+    _defaults = {
+        'user_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).id
+    }
+account_bank_statement()
+
+class account_bank_statement_line(osv.osv):
+    _inherit = 'account.bank.statement.line'
+    def _get_statement_journal(self, cr, uid, ids, context, *a):
+        res = {}
+        for line in self.browse(cr, uid, ids):
+            res[line.id] = line.statement_id and line.statement_id.journal_id and line.statement_id.journal_id.name or None
+        return res
+    _columns={
+        'journal_id': fields.function(_get_statement_journal, method=True,store=True, string='Journal', type='char', size=64),
+        'am_out':fields.boolean("To count"),
+        'is_acc':fields.boolean("Is accompte"),
+        'pos_statement_id': fields.many2one('pos.order',ondelete='cascade'),
+    }
+account_bank_statement_line()
+
 class pos_order_line(osv.osv):
     _name = "pos.order.line"
     _description = "Lines of Point of Sale"
@@ -1073,6 +1119,7 @@ class pos_order_line(osv.osv):
             price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
             if line.discount!=0.0:
                 res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
+#                res[line.id] = price * line.qty * (1 - (line.discount or 0.0) / 100.0)
             else:
                 res[line.id]=line.price_unit*line.qty
         return res
@@ -1145,7 +1192,9 @@ class pos_order_line(osv.osv):
         'company_id':fields.many2one('res.company', 'Company', required=True),
         'notice': fields.char('Discount Notice', size=128, required=True),
         'serial_number': fields.char('Serial Number', size=128),
+#        'contract_number': fields.char('Contract Number', size=512),
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], required=True, change_default=True),
+#        'price_unit': fields.float('Unit Price'),
         'price_unit': fields.function(_get_amount, method=True, string='Unit Price', store=True),
         'price_ded': fields.float('Discount(Amount)'),
         'qty': fields.float('Quantity'),
@@ -1273,6 +1322,44 @@ class pos_payment(osv.osv):
 
 pos_payment()
 
+class account_move_line(osv.osv):
+    _inherit = 'account.move.line'
+    def create(self, cr, user, vals, context={}):
+        pos_obj = self.pool.get('pos.order')
+        val_name = vals.get('name', '')
+        val_ref = vals.get('ref', '')
+        if (val_name and 'POS' in val_name) and (val_ref and 'PACK' in val_ref):
+            aaa = re.search(r'Stock move.\((.*)\)', vals.get('name'))
+            name_pos = aaa.groups()[0]
+            pos_id = name_pos.replace('POS ','')
+            if pos_id and pos_id.isdigit():
+                pos_curr = pos_obj.browse(cr,user,int(pos_id))
+                pos_curr = pos_curr  and pos_curr.contract_number or ''
+                vals['ref'] = pos_curr or vals.get('ref')
+        return super(account_move_line, self).create(cr, user, vals, context)
+
+account_move_line()
+
+
+class account_move(osv.osv):
+    _inherit = 'account.move'
+    def create(self, cr, user, vals, context={}):
+        pos_obj = self.pool.get('pos.order')
+        val_name = vals.get('name', '')
+        val_ref = vals.get('ref', '')
+        if (val_name and 'POS' in val_name) and (val_ref and 'PACK' in val_ref):
+            aaa = re.search(r'Stock move.\((.*)\)', vals.get('name'))
+            name_pos = aaa.groups()[0]
+            pos_id = name_pos.replace('POS ','')
+            if pos_id and pos_id.isdigit():
+                pos_curr = pos_obj.browse(cr,user,int(pos_id))
+                pos_curr = pos_curr  and pos_curr.contract_number or ''
+                vals['ref'] = pos_curr or vals.get('ref')
+        return super(account_move, self).create(cr, user, vals, context)
+
+account_move()
+
+
 class product_product(osv.osv):
     _inherit = 'product.product'
     _columns = {
@@ -1284,13 +1371,5 @@ class product_product(osv.osv):
     _defaults = {
         'disc_controle': lambda *a: True,
 }
-class stock_picking(osv.osv):
-
-    _inherit = 'stock.picking'
-    _columns = {
-        'pos_order': fields.many2one('pos.order', 'Pos order'),
-    }
-stock_picking()
-
 product_product()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/point_of_sale/pos_account_bank_statement.py b/addons/point_of_sale/pos_account_bank_statement.py
index c23a3cf3dd5..60924350014 100644
--- a/addons/point_of_sale/pos_account_bank_statement.py
+++ b/addons/point_of_sale/pos_account_bank_statement.py
@@ -25,222 +25,15 @@ import time
 import netsvc
 
 
-class account_journal(osv.osv):
-
-    _inherit = 'account.journal'
-    _columns = {
-        'auto_cash': fields.boolean('Automatic Opening', help="This field authorize the automatic creation of the cashbox"),
-        'special_journal':fields.boolean('Special Journal', help="Will put all the orders in waiting status till being accepted"),
-        'check_dtls': fields.boolean('Check Details', help="This field authorize Validation of Cashbox without checking ending details"),
-        'statement_sequence_id': fields.many2one('ir.sequence', 'Statement Sequence', \
-            help="The sequence used for statement numbers in this journal."),
-        }
-    _defaults = {
-        'check_dtls': lambda *a:True,
-        'auto_cash': lambda *a:True,
-        }
-account_journal()
-
-class singer_statement(osv.osv):
-    
-    """ Singer Statements """
-    
-    _name = 'singer.statement'
-    _description = 'Statements'
-
-    def _sub_total(self, cr, uid, ids, name, arg, context=None):
-       
-        """ Calculates Sub total"
-        @param name: Names of fields.
-        @param arg: User defined arguments
-        @return: Dictionary of values.
-        """
-        res = {}
-        for obj in self.browse(cr, uid, ids):
-            res[obj.id] = obj.pieces * obj.number
-        return res
-
-    def on_change_sub(self, cr, uid, ids, pieces, number,*a):
-
-        """ Calculates Sub total on change of number
-        @param pieces: Names of fields.
-        @param number:
-        """           
-        sub=pieces*number
-        return {'value':{'subtotal': sub or 0.0}}
-
-    _columns = {
-          'pieces': fields.float('Values', digits=(16,2)),
-          'number': fields.integer('Number'),
-          'subtotal': fields.function(_sub_total, method=True, string='Sub Total', type='float',digits=(16,2)),
-          'starting_id': fields.many2one('account.bank.statement',ondelete='cascade'),
-          'ending_id': fields.many2one('account.bank.statement',ondelete='cascade'),
-     }
-
-singer_statement()
-
 class account_bank_statement(osv.osv):
     
     _inherit = 'account.bank.statement'
-    def _get_starting_balance(self, cr, uid, ids, name, arg, context=None):
-
-        """ Find starting balance  "
-        @param name: Names of fields.
-        @param arg: User defined arguments
-        @return: Dictionary of values.
-        """          
-        res ={}
-        for statement in self.browse(cr, uid, ids):
-            amount_total=0.0
-            for line in statement.starting_details_ids:
-                amount_total+= line.pieces * line.number
-            res[statement.id]=amount_total
-        return res
-
-    def _get_sum_entry_encoding(self, cr, uid, ids, name, arg, context=None):
-
-        """ Find encoding total of statements "
-        @param name: Names of fields.
-        @param arg: User defined arguments
-        @return: Dictionary of values.
-        """              
-        res2={}
-        for statement in self.browse(cr, uid, ids):
-            encoding_total=0.0
-            for line in statement.line_ids:
-               encoding_total+= line.amount
-            res2[statement.id]=encoding_total
-        return res2
-
-    def _default_journal_id(self, cr, uid, context={}):
-
-        """ To get default journal for the object" 
-        @param name: Names of fields.
-        @return: journal 
-        """  
-        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
-        journal = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('auto_cash','=',False), ('company_id', '=', company_id)])
-        if journal:
-            return journal[0]
-        else:
-            return False
-    
     _columns = {
-           'company_id':fields.many2one('res.company', 'Company', required=True),
-          'journal_id': fields.many2one('account.journal', 'Journal', required=True),
-          'balance_start': fields.function(_get_starting_balance, method=True, string='Starting Balance', type='float',digits=(16,2)),
-          'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirm'),('open','Open')],
-                                    'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
-          'total_entry_encoding':fields.function(_get_sum_entry_encoding, method=True, string="Total of Entry encoding"),
-          'date':fields.datetime("Opening Date"),
-          'closing_date':fields.datetime("Closing Date"),
-          'starting_details_ids': fields.one2many('singer.statement', 'starting_id', string='Starting Details'),
-          'ending_details_ids': fields.one2many('singer.statement', 'ending_id', string='Ending Details'),
-          'name': fields.char('Name', size=64, required=True, readonly=True),
-          'user_id': fields.many2one('res.users',ondelete='cascade',string='User', readonly=True),          
+        'company_id':fields.many2one('res.company', 'Company', required=True),
     }
     _defaults = {
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
-        'state': lambda *a: 'draft',
-        'name': lambda *a: '/',
-        'date': lambda *a:time.strftime("%Y-%m-%d %H:%M:%S"),
-        'journal_id': _default_journal_id,
-        'user_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).id        
     }
-    def create(self, cr, uid, vals, context=None):
-        
-        company_id = vals and vals.get('company_id',False)
-        if company_id:
-            open_jrnl = self.search(cr, uid, [('company_id', '=', vals['company_id']), ('journal_id', '=', vals['journal_id']), ('state', '=', 'open')])
-            if open_jrnl:
-                raise osv.except_osv('Error', u'Une caisse de type espèce est déjà ouverte')
-            if 'starting_details_ids' in vals:
-                vals['starting_details_ids'] = starting_details_ids = map(list, vals['starting_details_ids'])
-                for i in starting_details_ids:
-                    if i and i[0] and i[1]:
-                        i[0], i[1] = 0, 0
-        res = super(account_bank_statement, self).create(cr, uid, vals, context=context)
-        return res
-
-    def onchange_journal_id(self, cursor, user, statement_id, journal_id, context=None):
-        
-        """ Changes balance start and starting details if journal_id changes" 
-        @param statement_id: Changed statement_id
-        @param journal_id: Changed journal_id
-        @return:  Dictionary of changed values
-        """  
-        id_s=[]
-        if not journal_id:
-            return {'value': {'balance_start': 0.0}}
-        balance_start=0.0
-        cash_obj = self.pool.get('singer.statement')
-        statement_obj = self.pool.get('account.bank.statement')
-        cursor.execute("Select a.id from account_bank_statement a where journal_id=%d and user_id=%d order by a.id desc limit 1"%(journal_id,user))
-        res2=cursor.fetchone()
-        res2=res2 and res2[0] or None
-        if res2:
-            statmt_id=statement_obj.browse(cursor,user,res2)
-            check_det=statmt_id.journal_id.check_dtls
-            if not check_det:
-                balance_start=statmt_id.balance_end_real or 0.0
-                return {'value': {'balance_start': balance_start}}
-        cursor.execute("Select a.id from account_bank_statement a, singer_statement s where journal_id=%d and user_id=%d order by a.id desc limit 1"%(journal_id,user))
-        res1=cursor.fetchone()
-        res1=res1 and res1[0] or None
-        if res1:
-            cursor.execute("Select sum(ss.pieces*ss.number),ss.ending_id from singer_statement ss, account_bank_statement s where ss.ending_id=s.id and s.journal_id=%d and s.user_id=%d and s.id=%d group by ss.ending_id,s.id order by s.id desc"%(journal_id,user, res1))
-            res = cursor.fetchone()
-            balance_start = res and res[0] or 0.0
-            cash_end=res and res[1] or None
-            id_s=statement_obj.browse(cursor,user,cash_end).ending_details_ids
-        new=[]
-        if id_s:
-            for s in id_s:
-                new.append(s.id)
-        return {'value': {'balance_start': balance_start, 'starting_details_ids':new}}
-
-    def button_open(self, cr, uid, ids, context=None):
-        
-        """ Changes statement state to Running.
-        @return: True 
-        """       
-        obj_inv = self.browse(cr, uid, ids)[0]
-        s_id=obj_inv.journal_id
-        if s_id.statement_sequence_id:
-            s_id=s_id.id
-            number = self.pool.get('ir.sequence').get_id(cr, uid, s_id)
-        else:
-            number = self.pool.get('ir.sequence').get(cr, uid,
-                            'account.bank.statement')
-
-        self.write(cr, uid, ids, {'date':time.strftime("%Y-%m-%d %H:%M:%S"), 'state':'open', 'name':number})
-        return True
-
-    def button_confirm(self, cr, uid, ids, context=None):
-        
-        """ Check the starting and ending detail of  statement 
-        @return: True 
-        """         
-        val = 0.0
-        val2 = 0.0
-        val_statement_line = 0.0
-        diff = self.pool.get('res.users').browse(cr,uid,uid).company_id.max_diff or 0.0
-        for statement in self.browse(cr, uid, ids):
-            bal = statement.balance_end
-            bal_st=statement.balance_start
-            for st in statement.line_ids:
-                val_statement_line += st.amount
-            for stat in statement.starting_details_ids:
-                val2 += stat.subtotal
-            for stat in statement.ending_details_ids:
-                val += stat.subtotal
-            if statement.journal_id.check_dtls:
-                if Decimal(str(val)).quantize(Decimal('.001')) != (Decimal(str(val_statement_line)) + Decimal(str(val2))).quantize(Decimal('.001')):
-                    raise osv.except_osv(_('Invalid action !'), _(' You can not confirm your cashbox, Please enter ending details, missing value matches to "%s"')%(abs(Decimal(str(val))-(Decimal(str(val_statement_line))+Decimal(str(val2))))))
-
-            self.write(cr, uid, statement.id, {'balance_end_real':Decimal(str(val_statement_line))+Decimal(str(val2)),'closing_date':time.strftime("%Y-%m-%d %H:%M:%S"),'state':'draft'})
-        return  super(account_bank_statement, self).button_confirm(cr, uid, ids, context=None)
-
 account_bank_statement()
 
 class account_bank_statement_line(osv.osv):
@@ -261,63 +54,14 @@ class account_bank_statement_line(osv.osv):
         if user.company_id:
             return user.company_id.id
         return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
-
-    def _get_statement_journal(self, cr, uid, ids, context, *a):
-        res = {}
-        for line in self.browse(cr, uid, ids):
-            res[line.id] = line.statement_id and line.statement_id.journal_id and line.statement_id.journal_id.name or None
-        return res
     
     _inherit = 'account.bank.statement.line'
     _columns = {
         'company_id':fields.many2one('res.company', 'Company', required=True),
-        'journal_id': fields.function(_get_statement_journal, method=True,store=True, string='Journal', type='char', size=64),
-        'am_out':fields.boolean("To count"),
-        'is_acc':fields.boolean("Is accompte"),
-        'pos_statement_id': fields.many2one('pos.order',ondelete='cascade'),        
     }
     _defaults = {
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
-    
 account_bank_statement_line()
 
-class account_move_line(osv.osv):
-    _inherit = 'account.move.line'
-    def create(self, cr, user, vals, context={}):
-        pos_obj = self.pool.get('pos.order')
-        val_name = vals.get('name', '')
-        val_ref = vals.get('ref', '')
-        if (val_name and 'POS' in val_name) and (val_ref and 'PACK' in val_ref):
-            aaa = re.search(r'Stock move.\((.*)\)', vals.get('name'))
-            name_pos = aaa.groups()[0]
-            pos_id = name_pos.replace('POS ','')
-            if pos_id and pos_id.isdigit():
-                pos_curr = pos_obj.browse(cr,user,int(pos_id))
-                pos_curr = pos_curr  and pos_curr.contract_number or ''
-                vals['ref'] = pos_curr or vals.get('ref')
-        return super(account_move_line, self).create(cr, user, vals, context)
-
-account_move_line()
-
-
-class account_move(osv.osv):
-    _inherit = 'account.move'
-    def create(self, cr, user, vals, context={}):
-        pos_obj = self.pool.get('pos.order')
-        val_name = vals.get('name', '')
-        val_ref = vals.get('ref', '')
-        if (val_name and 'POS' in val_name) and (val_ref and 'PACK' in val_ref):
-            aaa = re.search(r'Stock move.\((.*)\)', vals.get('name'))
-            name_pos = aaa.groups()[0]
-            pos_id = name_pos.replace('POS ','')
-            if pos_id and pos_id.isdigit():
-                pos_curr = pos_obj.browse(cr,user,int(pos_id))
-                pos_curr = pos_curr  and pos_curr.contract_number or ''
-                vals['ref'] = pos_curr or vals.get('ref')
-        return super(account_move, self).create(cr, user, vals, context)
-
-account_move()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From b6f25bc343dba0c33adf706a3dd94fce9221be02 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Sat, 24 Apr 2010 10:39:53 +0530
Subject: [PATCH 12/84] Task 578: Review the code and remove the cr.execute and
 use orm method

bzr revid: sbh@tinyerp.com-20100424050953-4mtjpjaioohl26y2
---
 addons/point_of_sale/pos.py   | 79 +++++++++++++----------------------
 addons/point_of_sale/stock.py | 37 ++++++++++++++++
 2 files changed, 65 insertions(+), 51 deletions(-)
 create mode 100644 addons/point_of_sale/stock.py

diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 58838e38743..3a6b99b0bda 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -123,11 +123,8 @@ class pos_order(osv.osv):
         tot =0.0
         val=None
         for order in self.browse(cr, uid, ids):
-            cr.execute("select date_payment from pos_order where id=%d"%(order.id))
-            date_p=cr.fetchone()
-            date_p=date_p and date_p[0] or None
-            if date_p:
-                res[order.id]=date_p
+            if order.date_payment:
+                res[order.id]=order.date_payment
                 return res
             cr.execute(" SELECT max(l.date) from account_move_line l, account_move m, account_invoice i, account_move_reconcile r, pos_order o where i.move_id=m.id and l.move_id=m.id and l.reconcile_id=r.id and o.id=%d and o.invoice_id=i.id"%(order.id))
             val=cr.fetchone()
@@ -150,21 +147,18 @@ class pos_order(osv.osv):
         tot =0.0
         val=None
         for order in self.browse(cr, uid, ids):
-            cr.execute("select date_validation from pos_order where id=%d"%(order.id))
-            date_p=cr.fetchone()
-            date_p=date_p and date_p[0] or None
-            if date_p:
-                res[order.id]=date_p
+            if order.date_validation:
+                res[order.id]=order.date_validation
                 return res
             discount_allowed=order.company_id.company_discount
             for line in order.lines:
                 if line.discount > discount_allowed:
                     return {order.id: None }
-            if order.amount_paid == order.amount_total and not date_p:
+            if order.amount_paid == order.amount_total and not order.date_validation:
                 cr.execute("select max(date) from account_bank_statement_line where pos_statement_id=%d"%(order.id))
                 val=cr.fetchone()
                 val=val and val[0] or None
-            if order.invoice_id and order.invoice_id.move_id and not date_p and not val:
+            if order.invoice_id and order.invoice_id.move_id and not order.date_validation and not val:
                 for o in order.invoice_id.move_id.line_id:
                     if o.balance==0:
                         if val<o.date_created:
@@ -226,13 +220,6 @@ class pos_order(osv.osv):
                 val += (payment.amount < 0 and payment.amount or 0)
             res[order.id] = val
         return res
-
-#    def payment_get(self, cr, uid, ids, context=None):
-#        """  Calculates Total Returned  from the order
-#        @return: Dictionary of values """          
-#        cr.execute("select id from pos_payment where order_id =ANY(%s)",(ids,))
-#        return [i[0] for i in cr.fetchall()]
-
     def _sale_journal_get(self, cr, uid, context):
         
         """ To get  sale journal for this order" 
@@ -253,13 +240,10 @@ class pos_order(osv.osv):
                
         company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
         res = self.pool.get('sale.shop').search(cr, uid, [])
-       # res = self.pool.get('sale.shop').search(cr, uid, [('company_id', '=', company.id)])
         if res:
             return res[0]
         else:
             return False
-
-
     def copy(self, cr, uid, id, default=None, context={}):
         
         if not default:
@@ -284,15 +268,19 @@ class pos_order(osv.osv):
         flag=False
         res_company = self.pool.get('res.company')
         res_obj = self.pool.get('res.users')
+        res=0.0
+        res2=0.0
         company_disc=self.browse(cr,uid,ids)
         if not company_disc:
             comp=res_obj.browse(cr,uid,uid).company_id.company_discount or 0.0
         else:
             comp= company_disc[0] and company_disc[0].company_id and  company_disc[0].company_id.company_discount  or 0.0
-        cr.execute("select discount from pos_order_line where order_id=%s and discount <= %s"%(ids[0],comp))
-        res=cr.fetchone()
-        cr.execute("select discount from pos_order_line where order_id=%s and discount > %s"%(ids[0],comp))
-        res2=cr.fetchone()
+        for order in self.browse(cr,uid,ids):
+            for line in order.lines:   
+                if line.discount <=comp:
+                    res=line.discount
+                if line.discount >comp:
+                    res2=line.discount                
         cr.execute("select journal_id from account_bank_statement_line where pos_statement_id=%s "%(ids[0]))
         res3=cr.fetchall()
         list_jrnl=[]
@@ -345,19 +333,9 @@ class pos_order(osv.osv):
         'first_name': fields.char('First Name', size=64),
         'state_2': fields.function(_get_v,type='selection',selection=[('to_verify', 'To Verify'), ('accepted', 'Accepted'),
             ('refused', 'Refused')], string='State', readonly=True, method=True, store=True),
-        
-    #    'last_name': fields.char('Last Name', size=64),
-    #    'street': fields.char('Street', size=64),
-    #    'zip2': fields.char('Zip', size=64),
-    #    'city': fields.char('City', size=64),
-    #    'mobile': fields.char('Mobile', size=64),
-    #    'email': fields.char('Email', size=64),
         'note': fields.text('Internal Notes'),
         'nb_print': fields.integer('Number of Print', readonly=True),
         'sale_journal': fields.many2one('account.journal', 'Journal', required=True, states={'draft': [('readonly', False)]}, readonly=True, ),
-      #  'account_receivable': fields.many2one('account.account',
-      #      'Default Receivable', required=True, states={'draft': [('readonly', False)]},
-      #      readonly=True, ),
         'invoice_wanted': fields.boolean('Create Invoice'),
         'note_2': fields.char('Customer Note',size=64),
         'type_rec': fields.char('Type of Receipt',size=64),
@@ -754,9 +732,7 @@ class pos_order(osv.osv):
             if not order.partner_id:
                 raise osv.except_osv(_('Error'), _('Please provide a partner for the sale.'))
 
-            cr.execute('select a.id from account_account a, res_company p where p.account_receivable=a.id and p.id=%s', (curr_c.id, ))
-            res=cr.fetchone()
-            acc=res and res[0] or None
+            acc= order.partner_id.property_account_receivable.id
             inv = {
                 'name': 'Invoice from POS: '+order.name,
                 'origin': order.name,
@@ -808,15 +784,17 @@ class pos_order(osv.osv):
         account_move_line_obj = self.pool.get('account.move.line')
         account_period_obj = self.pool.get('account.period')
         account_tax_obj = self.pool.get('account.tax')
+        res_obj=self.pool.get('res.users')
+        property_obj=self.pool.get('ir.property')
         period = account_period_obj.find(cr, uid, context=context)[0]
 
         for order in self.browse(cr, uid, ids, context=context):
-            curr_c = self.pool.get('res.users').browse(cr, uid, uid).company_id
-            comp_id = self.pool.get('res.users').browse(cr, order.user_id.id, order.user_id.id).company_id
+            curr_c =res_obj.browse(cr, uid, uid).company_id
+            comp_id = res_obj.browse(cr, order.user_id.id, order.user_id.id).company_id
             comp_id=comp_id and comp_id.id or False
             to_reconcile = []
             group_tax = {}
-            account_def = self.pool.get('ir.property').get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
+            account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
             order_account = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def or curr_c.account_receivable.id
 
             # Create an entry for the sale
@@ -1002,9 +980,8 @@ class pos_order(osv.osv):
                                                                         'statement_id': False,
                                                                         'account_id':order_account
                                                                      })
-           #     account_move_obj.button_validate(cr, uid, [move_id, payment_move_id], context=context)
+           
             self.write(cr,uid,order.id,{'state':'done'})
-         #       account_move_line_obj.reconcile(cr, uid, to_reconcile, type='manual', context=context)
         return True
 
     def cancel_picking(self, cr, uid, ids, context=None):
@@ -1016,6 +993,7 @@ class pos_order(osv.osv):
 
     def action_payment(self, cr, uid, ids, context=None):
         vals = {'state': 'payment'}
+        sequence_obj=self.pool.get('ir.sequence')
         for pos in self.browse(cr, uid, ids):
             create_contract_nb = False
             for line in pos.lines:
@@ -1023,7 +1001,7 @@ class pos_order(osv.osv):
                     create_contract_nb = True
                     break
             if create_contract_nb:
-                seq = self.pool.get('ir.sequence').get(cr, uid, 'pos.user_%s' % pos.user_saleman.login)
+                seq = sequence_obj.get(cr, uid, 'pos.user_%s' % pos.user_saleman.login)
                 vals['contract_number'] ='%s-%s' % (pos.user_saleman.login, seq)
         self.write(cr, uid, ids, vals)
 
@@ -1045,7 +1023,6 @@ class pos_order(osv.osv):
         for order in self.browse(cr, uid, ids, context=context):
             if not order.journal_entry:
                 self.create_account_move(cr, uid, ids, context={})
-        #self.write(cr, uid, ids, {'state': 'done'})
         return True
 
     def compute_state(self, cr, uid, id):
@@ -1119,7 +1096,6 @@ class pos_order_line(osv.osv):
             price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
             if line.discount!=0.0:
                 res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
-#                res[line.id] = price * line.qty * (1 - (line.discount or 0.0) / 100.0)
             else:
                 res[line.id]=line.price_unit*line.qty
         return res
@@ -1155,7 +1131,7 @@ class pos_order_line(osv.osv):
         disc=0.0
         if (disc != 0.0 or prod_id) and price_f>0:
             disc=100-(price/price_f*100)
-            return {'value':{'discount':disc, 'price_unit':price_f}}#,'notice':''}}#, 'price_subtotal':(price_f*qty*(1-disc))}}
+            return {'value':{'discount':disc, 'price_unit':price_f}}
         return {}
 
     def onchange_ded(self, cr, uid,ids, val_ded,price_u,*a):
@@ -1192,9 +1168,7 @@ class pos_order_line(osv.osv):
         'company_id':fields.many2one('res.company', 'Company', required=True),
         'notice': fields.char('Discount Notice', size=128, required=True),
         'serial_number': fields.char('Serial Number', size=128),
-#        'contract_number': fields.char('Contract Number', size=512),
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], required=True, change_default=True),
-#        'price_unit': fields.float('Unit Price'),
         'price_unit': fields.function(_get_amount, method=True, string='Unit Price', store=True),
         'price_ded': fields.float('Discount(Amount)'),
         'qty': fields.float('Quantity'),
@@ -1257,7 +1231,7 @@ class pos_order_line(osv.osv):
                    }
             line_id = self.create(cr, uid, vals)
             if not line_id:
-                raise wizard.except_wizard(_('Error'), _('Create line failed !'))
+                raise osv.except_osv(_('Error'), _('Create line failed !'))
         else:
             vals = {
                 'qty': qty,
@@ -1323,6 +1297,7 @@ class pos_payment(osv.osv):
 pos_payment()
 
 class account_move_line(osv.osv):
+    
     _inherit = 'account.move.line'
     def create(self, cr, user, vals, context={}):
         pos_obj = self.pool.get('pos.order')
@@ -1342,7 +1317,9 @@ account_move_line()
 
 
 class account_move(osv.osv):
+    
     _inherit = 'account.move'
+    
     def create(self, cr, user, vals, context={}):
         pos_obj = self.pool.get('pos.order')
         val_name = vals.get('name', '')
diff --git a/addons/point_of_sale/stock.py b/addons/point_of_sale/stock.py
new file mode 100644
index 00000000000..9d2b24d69b8
--- /dev/null
+++ b/addons/point_of_sale/stock.py
@@ -0,0 +1,37 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+import time
+import netsvc
+
+
+class stock_picking(osv.osv):
+
+    _inherit = 'stock.picking'
+    _columns = {
+        'pos_order': fields.many2one('pos.order', 'Pos order'),
+    }
+stock_picking()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

From 1c983a940c243c34ca2f9e89781f699ac837f9a5 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 26 Apr 2010 11:02:24 +0530
Subject: [PATCH 13/84] Task 578: Remove the cr.execute and used orm method

bzr revid: sbh@tinyerp.com-20100426053224-collzkj3nydyk6xm
---
 addons/point_of_sale/account_bank_statement.py | 14 ++++++--------
 addons/point_of_sale/pos.py                    |  8 +++++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
index f40be32de80..8428857489c 100644
--- a/addons/point_of_sale/account_bank_statement.py
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -178,11 +178,9 @@ class account_bank_statement(osv.osv):
         balance_start=0.0
         cash_obj = self.pool.get('singer.statement')
         statement_obj = self.pool.get('account.bank.statement')
-        cursor.execute("Select a.id from account_bank_statement a where journal_id=%d and user_id=%d order by a.id desc limit 1"%(journal_id,user))
-        res2=cursor.fetchone()
-        res2=res2 and res2[0] or None
-        if res2:
-            statmt_id=statement_obj.browse(cursor,user,res2)
+        statement_ids=statement_obj.search(cursor, user, [('journal_id','=',journal_id), ('user_id','=',user)])
+        if statement_ids:
+            statmt_id=statement_obj.browse(cursor,user,statement_ids[0])
             check_det=statmt_id.journal_id.check_dtls
             if not check_det:
                 balance_start=statmt_id.balance_end_real or 0.0
@@ -208,14 +206,14 @@ class account_bank_statement(osv.osv):
         @return: True 
         """       
         obj_inv = self.browse(cr, uid, ids)[0]
+        sequence_obj=self.pool.get('ir.sequence')
         s_id=obj_inv.journal_id
         if s_id.statement_sequence_id:
             s_id=s_id.id
-            number = self.pool.get('ir.sequence').get_id(cr, uid, s_id)
+            number = sequence_obj.get_id(cr, uid, s_id)
         else:
-            number = self.pool.get('ir.sequence').get(cr, uid,
+            number = sequence_obj.get(cr, uid,
                             'account.bank.statement')
-
         self.write(cr, uid, ids, {'date':time.strftime("%Y-%m-%d %H:%M:%S"), 'state':'open', 'name':number})
         return True
 
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 3a6b99b0bda..23bb900aa46 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -270,6 +270,7 @@ class pos_order(osv.osv):
         res_obj = self.pool.get('res.users')
         res=0.0
         res2=0.0
+        statement_obj = self.pool.get('account.bank.statement.line')            
         company_disc=self.browse(cr,uid,ids)
         if not company_disc:
             comp=res_obj.browse(cr,uid,uid).company_id.company_discount or 0.0
@@ -280,9 +281,10 @@ class pos_order(osv.osv):
                 if line.discount <=comp:
                     res=line.discount
                 if line.discount >comp:
-                    res2=line.discount                
-        cr.execute("select journal_id from account_bank_statement_line where pos_statement_id=%s "%(ids[0]))
-        res3=cr.fetchall()
+                    res2=line.discount     
+                                
+       
+        res3= statement_obj.search(cr,uid,[('pos_statement_id','=', ids[0])])
         list_jrnl=[]
         for r in res3:
             cr.execute("select id from account_journal where name= '%s' and special_journal='t'"%(r[0]))

From 90cd229cbb890defc9bebbc535425e925a70d938 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Mon, 26 Apr 2010 11:07:13 +0530
Subject: [PATCH 14/84] [FIX] delivery: modifications on delivery cost wizard
 for task 584

bzr revid: mso@mso-20100426053713-6fms6tta3ogb3gv2
---
 addons/delivery/delivery.py                         | 2 +-
 addons/delivery/wizard/delivery_sale_order.py       | 6 +++++-
 addons/delivery/wizard/delivery_sale_order_view.xml | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index e1696820634..35b3ed481e9 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -36,7 +36,7 @@ class delivery_carrier(osv.osv):
             res = super(delivery_carrier, self).name_get(cr, uid, ids, context=context)
         else:
             order = self.pool.get('sale.order').browse(cr, uid, [order_id])[0]
-            currency = order.partner_id.property_product_pricelist.currency_id.name or ''
+            currency = order.pricelist_id.currency_id.name or ''
             res = [(r['id'], r['name']+' ('+(str(r['price']))+' '+currency+')') for r in self.read(cr, uid, ids, ['name', 'price'], context)]
         return res
     def get_price(self, cr, uid, ids, field_name, arg=None, context={}):
diff --git a/addons/delivery/wizard/delivery_sale_order.py b/addons/delivery/wizard/delivery_sale_order.py
index efc82ae4141..5f066b23bb0 100644
--- a/addons/delivery/wizard/delivery_sale_order.py
+++ b/addons/delivery/wizard/delivery_sale_order.py
@@ -50,7 +50,11 @@ class make_delivery(osv.osv_memory):
         res = super(make_delivery, self).default_get(cr, uid, fields, context=context)
         order_obj = self.pool.get('sale.order')
         for order in order_obj.browse(cr, uid, context.get('active_ids', [])):
-             res.update({'carrier_id': order.partner_id.property_delivery_carrier.id})
+             carrier = order.carrier_id.id
+             if not carrier:
+                  carrier = order.partner_id.property_delivery_carrier.id
+             res.update({'carrier_id': carrier})
+             
         return res
     
     def view_init(self, cr , uid , fields, context=None):
diff --git a/addons/delivery/wizard/delivery_sale_order_view.xml b/addons/delivery/wizard/delivery_sale_order_view.xml
index 8cb10748432..6b6ffcd13cc 100644
--- a/addons/delivery/wizard/delivery_sale_order_view.xml
+++ b/addons/delivery/wizard/delivery_sale_order_view.xml
@@ -17,8 +17,8 @@
 				    <group col="2" colspan="4">
                 		<button icon='gtk-cancel' special="cancel"
                 			string="Cancel" />
-                		<button name="delivery_set" string="Add Delivery Costs"
-                			colspan="1" type="object" icon="gtk-ok" />
+                		<button name="delivery_set" string="Apply"
+                			colspan="1" type="object" icon="gtk-apply" />
                 	</group>
                 </form>
             </field>

From b8a25493df438ddb7ffac532d2c29d50e5a4d181 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 26 Apr 2010 11:14:05 +0530
Subject: [PATCH 15/84] [Fix] point_of_sale: fix the problem of loop

bzr revid: sbh@tinyerp.com-20100426054405-0b2wyp7cqev5xfgw
---
 addons/point_of_sale/pos.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 23bb900aa46..1f1f400abaf 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -287,7 +287,7 @@ class pos_order(osv.osv):
         res3= statement_obj.search(cr,uid,[('pos_statement_id','=', ids[0])])
         list_jrnl=[]
         for r in res3:
-            cr.execute("select id from account_journal where name= '%s' and special_journal='t'"%(r[0]))
+            cr.execute("select id from account_journal where name= '%s' and special_journal='t'"%(r))
             res3=cr.fetchone()
             is_special=res3 and res3[0] or None
             if is_special:

From 932811994b25e82737a62a58a59d60cad3d741a7 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 26 Apr 2010 11:27:11 +0530
Subject: [PATCH 16/84] Task 578 [point_of_sale ]: Remove the cr.execute and
 used orm method

bzr revid: sbh@tinyerp.com-20100426055711-8w9g92z9yngrxxid
---
 addons/point_of_sale/pos.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 1f1f400abaf..1d842cb4726 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -270,7 +270,8 @@ class pos_order(osv.osv):
         res_obj = self.pool.get('res.users')
         res=0.0
         res2=0.0
-        statement_obj = self.pool.get('account.bank.statement.line')            
+        statement_obj = self.pool.get('account.bank.statement.line')   
+        obj_journal = self.pool.get('account.journal')         
         company_disc=self.browse(cr,uid,ids)
         if not company_disc:
             comp=res_obj.browse(cr,uid,uid).company_id.company_discount or 0.0
@@ -284,11 +285,14 @@ class pos_order(osv.osv):
                     res2=line.discount     
                                 
        
-        res3= statement_obj.search(cr,uid,[('pos_statement_id','=', ids[0])])
+        statement_id= statement_obj.search(cr,uid,[('pos_statement_id','=', ids[0])])
+        res3=[]
+        if statement_id:
+            statement=statement_obj.browse(cr,uid,statement_id[0])
+            res3.append(statement.journal_id)
         list_jrnl=[]
         for r in res3:
-            cr.execute("select id from account_journal where name= '%s' and special_journal='t'"%(r))
-            res3=cr.fetchone()
+            res3=obj_journal.search(cr,uid,[('name','=',r),('special_journal','=','t')])
             is_special=res3 and res3[0] or None
             if is_special:
                 list_jrnl.append(is_special)

From 766a1f0bd4b50bca6bcd419708c7db0122f3cfdd Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 26 Apr 2010 12:24:54 +0530
Subject: [PATCH 17/84] [IMP] point_of_sale: check if  context is None then
 pass the dictionary

bzr revid: sbh@tinyerp.com-20100426065454-ee6oqgtup487i9r7
---
 .../point_of_sale/account_bank_statement.py   | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
index 8428857489c..da5fae133e4 100644
--- a/addons/point_of_sale/account_bank_statement.py
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -58,6 +58,8 @@ class singer_statement(osv.osv):
         @param arg: User defined arguments
         @return: Dictionary of values.
         """
+        if context==None:
+            context={}            
         res = {}
         for obj in self.browse(cr, uid, ids):
             res[obj.id] = obj.pieces * obj.number
@@ -92,7 +94,9 @@ class account_bank_statement(osv.osv):
         @param name: Names of fields.
         @param arg: User defined arguments
         @return: Dictionary of values.
-        """          
+        """    
+        if context==None:
+            context={}    
         res ={}
         for statement in self.browse(cr, uid, ids):
             amount_total=0.0
@@ -107,7 +111,9 @@ class account_bank_statement(osv.osv):
         @param name: Names of fields.
         @param arg: User defined arguments
         @return: Dictionary of values.
-        """              
+        """          
+        if context==None:
+            context={}    
         res2={}
         for statement in self.browse(cr, uid, ids):
             encoding_total=0.0
@@ -122,6 +128,9 @@ class account_bank_statement(osv.osv):
         @param name: Names of fields.
         @return: journal 
         """  
+        if context==None:
+            context={}    
+                    
         company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
         journal = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('auto_cash','=',False), ('company_id', '=', company_id)])
         if journal:
@@ -152,6 +161,8 @@ class account_bank_statement(osv.osv):
 
     def create(self, cr, uid, vals, context=None):
         
+        if context==None:
+            context={}            
         company_id = vals and vals.get('company_id',False)
         if company_id:
             open_jrnl = self.search(cr, uid, [('company_id', '=', vals['company_id']), ('journal_id', '=', vals['journal_id']), ('state', '=', 'open')])
@@ -172,6 +183,8 @@ class account_bank_statement(osv.osv):
         @param journal_id: Changed journal_id
         @return:  Dictionary of changed values
         """  
+        if context==None:
+            context={}            
         id_s=[]
         if not journal_id:
             return {'value': {'balance_start': 0.0}}
@@ -205,6 +218,8 @@ class account_bank_statement(osv.osv):
         """ Changes statement state to Running.
         @return: True 
         """       
+        if context==None:
+            context={}            
         obj_inv = self.browse(cr, uid, ids)[0]
         sequence_obj=self.pool.get('ir.sequence')
         s_id=obj_inv.journal_id
@@ -222,6 +237,8 @@ class account_bank_statement(osv.osv):
         """ Check the starting and ending detail of  statement 
         @return: True 
         """         
+        if context==None:
+            context={}            
         val = 0.0
         val2 = 0.0
         val_statement_line = 0.0
@@ -240,7 +257,7 @@ class account_bank_statement(osv.osv):
                     raise osv.except_osv(_('Invalid action !'), _(' You can not confirm your cashbox, Please enter ending details, missing value matches to "%s"')%(abs(Decimal(str(val))-(Decimal(str(val_statement_line))+Decimal(str(val2))))))
 
             self.write(cr, uid, statement.id, {'balance_end_real':Decimal(str(val_statement_line))+Decimal(str(val2)),'closing_date':time.strftime("%Y-%m-%d %H:%M:%S"),'state':'draft'})
-        return  super(account_bank_statement, self).button_confirm(cr, uid, ids, context=None)
+        return  super(account_bank_statement, self).button_confirm(cr, uid, ids, context=context)
 
 account_bank_statement()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 8f23eb90279be5a4cf3925afbb9e80e7318670e5 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 26 Apr 2010 16:00:38 +0530
Subject: [PATCH 18/84] Task ID 578[Point_of_sale] :used multi in functional
 fields

bzr revid: sbh@tinyerp.com-20100426103038-j4iqdb3fova3y22c
---
 addons/point_of_sale/pos.py | 115 ++++++++++++++----------------------
 1 file changed, 44 insertions(+), 71 deletions(-)

diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 1d842cb4726..7c872bda845 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -28,7 +28,7 @@ from tools.translate import _
 from decimal import Decimal
 import tools
 import re
-
+import decimal_precision as dp
 
 class pos_config_journal(osv.osv):
     
@@ -49,8 +49,8 @@ class pos_company_discount(osv.osv):
          
     _inherit = 'res.company'
     _columns = {
-        'company_discount': fields.float('Max Discount(%)', digits=(16,2)),
-        'max_diff': fields.float('Max Difference for Cashboxes', digits=(16,2)),
+        'company_discount': fields.float('Max Discount(%)', digits_compute= dp.get_precision('Point Of Sale')),
+        'max_diff': fields.float('Max Difference for Cashboxes', digits_compute= dp.get_precision('Point Of Sale Discount')),
      }
 
 pos_company_discount()
@@ -123,8 +123,11 @@ class pos_order(osv.osv):
         tot =0.0
         val=None
         for order in self.browse(cr, uid, ids):
-            if order.date_payment:
-                res[order.id]=order.date_payment
+            cr.execute("select date_payment from pos_order where id=%d"%(order.id))
+            date_p=cr.fetchone()
+            date_p=date_p and date_p[0] or None
+            if date_p:
+                res[order.id]=date_p
                 return res
             cr.execute(" SELECT max(l.date) from account_move_line l, account_move m, account_invoice i, account_move_reconcile r, pos_order o where i.move_id=m.id and l.move_id=m.id and l.reconcile_id=r.id and o.id=%d and o.invoice_id=i.id"%(order.id))
             val=cr.fetchone()
@@ -147,18 +150,21 @@ class pos_order(osv.osv):
         tot =0.0
         val=None
         for order in self.browse(cr, uid, ids):
-            if order.date_validation:
-                res[order.id]=order.date_validation
+            cr.execute("select date_validation from pos_order where id=%d"%(order.id))
+            date_p=cr.fetchone()
+            date_p=date_p and date_p[0] or None
+            if date_p:
+                res[order.id]=date_p
                 return res
             discount_allowed=order.company_id.company_discount
             for line in order.lines:
                 if line.discount > discount_allowed:
                     return {order.id: None }
-            if order.amount_paid == order.amount_total and not order.date_validation:
+            if order.amount_paid == order.amount_total and not date_p:
                 cr.execute("select max(date) from account_bank_statement_line where pos_statement_id=%d"%(order.id))
                 val=cr.fetchone()
                 val=val and val[0] or None
-            if order.invoice_id and order.invoice_id.move_id and not order.date_validation and not val:
+            if order.invoice_id and order.invoice_id.move_id and not date_p and not val:
                 for o in order.invoice_id.move_id.line_id:
                     if o.balance==0:
                         if val<o.date_created:
@@ -167,59 +173,36 @@ class pos_order(osv.osv):
                 res[order.id]=val
         return res
 
-    def _amount_tax(self, cr, uid, ids, field_name, arg, context):
-        
-        """  Calculates Taxes of order
-        @return: Dictionary of values """    
-                  
-        res = {}
-        tax_obj = self.pool.get('account.tax')
+    def _amount_all(self, cr, uid, ids, name, args, context=None):
+        tax_obj = self.pool.get('account.tax')        
+        res={}
         for order in self.browse(cr, uid, ids):
-            val = 0.0
+            res[order.id] = {
+                'amount_paid': 0.0,
+                'amount_return':0.0,
+                'amount_tax':0.0,
+            }            
+            for payment in order.statement_ids:
+                 res[order.id]['amount_paid'] +=  payment.amount 
+            for payment in order.payments:
+                res[order.id]['amount_return']  += (payment.amount < 0 and payment.amount or 0)   
             for line in order.lines:
                 if order.price_type!='tax_excluded':
-                    val = reduce(lambda x, y: x+round(y['amount'], 2),
+                    res[order.id]['amount_tax'] = reduce(lambda x, y: x+round(y['amount'], 2),
                         tax_obj.compute_inv(cr, uid, line.product_id.taxes_id,
                             line.price_unit * \
                             (1-(line.discount or 0.0)/100.0), line.qty),
-                            val)
+                            res[order.id]['amount_tax'])
                 else:
-                    val = reduce(lambda x, y: x+round(y['amount'], 2),
+                    res[order.id]['amount_tax'] = reduce(lambda x, y: x+round(y['amount'], 2),
                         tax_obj.compute(cr, uid, line.product_id.taxes_id,
                             line.price_unit * \
                             (1-(line.discount or 0.0)/100.0), line.qty),
-                            val)
-
-            res[order.id] = val
+                            res[order.id]['amount_tax'])                                                    
         return res
-
-    def _total_payment(self, cr, uid, ids, field_name, arg, context):
         
-        """  Calculates Total payment  of order
-        @return: Dictionary of values """     
-             
-        res = {}
-        i=0
-        for order in self.browse(cr, uid, ids):
-            val = 0.0
-            for payment in order.statement_ids:
-                val += payment.amount
-            res[order.id] = val
-            return res
-        return {order.id:val}
 
-    def _total_return(self, cr, uid, ids, field_name, arg, context):
-        
-        """  Calculates Total Returned  from the order
-        @return: Dictionary of values """   
-                  
-        res = {}
-        for order in self.browse(cr, uid, ids):
-            val = 0.0
-            for payment in order.payments:
-                val += (payment.amount < 0 and payment.amount or 0)
-            res[order.id] = val
-        return res
+
     def _sale_journal_get(self, cr, uid, context):
         
         """ To get  sale journal for this order" 
@@ -268,31 +251,21 @@ class pos_order(osv.osv):
         flag=False
         res_company = self.pool.get('res.company')
         res_obj = self.pool.get('res.users')
-        res=0.0
-        res2=0.0
-        statement_obj = self.pool.get('account.bank.statement.line')   
-        obj_journal = self.pool.get('account.journal')         
         company_disc=self.browse(cr,uid,ids)
         if not company_disc:
             comp=res_obj.browse(cr,uid,uid).company_id.company_discount or 0.0
         else:
             comp= company_disc[0] and company_disc[0].company_id and  company_disc[0].company_id.company_discount  or 0.0
-        for order in self.browse(cr,uid,ids):
-            for line in order.lines:   
-                if line.discount <=comp:
-                    res=line.discount
-                if line.discount >comp:
-                    res2=line.discount     
-                                
-       
-        statement_id= statement_obj.search(cr,uid,[('pos_statement_id','=', ids[0])])
-        res3=[]
-        if statement_id:
-            statement=statement_obj.browse(cr,uid,statement_id[0])
-            res3.append(statement.journal_id)
+        cr.execute("select discount from pos_order_line where order_id=%s and discount <= %s"%(ids[0],comp))
+        res=cr.fetchone()
+        cr.execute("select discount from pos_order_line where order_id=%s and discount > %s"%(ids[0],comp))
+        res2=cr.fetchone()
+        cr.execute("select journal_id from account_bank_statement_line where pos_statement_id=%s "%(ids[0]))
+        res3=cr.fetchall()
         list_jrnl=[]
         for r in res3:
-            res3=obj_journal.search(cr,uid,[('name','=',r),('special_journal','=','t')])
+            cr.execute("select id from account_journal where name= '%s' and special_journal='t'"%(r[0]))
+            res3=cr.fetchone()
             is_special=res3 and res3[0] or None
             if is_special:
                 list_jrnl.append(is_special)
@@ -316,10 +289,10 @@ class pos_order(osv.osv):
         'user_id': fields.many2one('res.users', 'Connected Salesman', readonly=True),
         'user_saleman': fields.many2one('res.users', 'Salesman', required=True),
         'sale_manager': fields.many2one('res.users', 'Salesman Manager'),
-        'amount_tax': fields.function(_amount_tax, method=True, string='Taxes'),
+        'amount_tax': fields.function(_amount_all, method=True, string='Taxes',digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
         'amount_total': fields.function(_amount_total, method=True, string='Total'),
-        'amount_paid': fields.function(_total_payment, 'Paid', states={'draft': [('readonly', False)]}, readonly=True, method=True),
-        'amount_return': fields.function(_total_return, 'Returned', method=True),
+        'amount_paid': fields.function(_amount_all, 'Paid', states={'draft': [('readonly', False)]}, readonly=True, method=True,digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
+        'amount_return': fields.function(_amount_all, 'Returned', method=True,digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
         'lines': fields.one2many('pos.order.line', 'order_id', 'Order Lines', states={'draft': [('readonly', False)]}, readonly=True),
         'price_type': fields.selection([
             ('tax_excluded','Tax excluded')
@@ -1176,7 +1149,7 @@ class pos_order_line(osv.osv):
         'serial_number': fields.char('Serial Number', size=128),
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], required=True, change_default=True),
         'price_unit': fields.function(_get_amount, method=True, string='Unit Price', store=True),
-        'price_ded': fields.float('Discount(Amount)'),
+        'price_ded': fields.float('Discount(Amount)',digits_compute=dp.get_precision('Point Of Sale')),
         'qty': fields.float('Quantity'),
         'qty_rfd': fields.float('Refunded Quantity'),
         'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal w/o Tax'),

From 89f73095cf03c916740b54585d3d5d9619287280 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Mon, 26 Apr 2010 18:01:47 +0530
Subject: [PATCH 19/84] [IMP]:Select your interface wizard

bzr revid: nch@tinyerp.com-20100426123147-ihps0qqox9ljrwyk
---
 bin/addons/base/base_update.xml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 17952ea0146..42e4aae4e8e 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -280,17 +280,21 @@
             <field name="arch" type="xml">
               <data>
                 <form position="attributes">
-                  <attribute name="string">Select your Interface</attribute>
+                  <attribute name="string">Choose Your Interface</attribute>
                 </form>
 
                 <group string="res_config_contents" position="replace">
-                  <label colspan="4" align="0.0" string="Choose between the simplified interface and the extended one."/>
-                  <newline/>
-                  <label colspan="4" align="0.0" string="If you are testing OpenERP or using it for the first time, we suggest you use the simplified interface. It has less options and fields but is easier to understand."/>
-                  <newline/>
-                  <label colspan="4" align="0.0" string="You will be able to switch to the extended interface later."/>
-                  <separator string="Choose Your Interface" colspan="4"/>
-                  <field colspan="2" name="view" nolabel="1"/>
+                	<group colspan="4">
+		            	<group colspan="2">
+			              	<label colspan="4" align="0.0" string="Choose between the simplified interface and the extended one."/>
+		              		<label colspan="4" align="0.0" string="If you are testing OpenERP or using it for the first time, we suggest you use the simplified interface. It has less options and fields but is easier to understand."/>
+		              		<label colspan="4" align="0.0" string="You will be able to switch to the extended interface later."/>
+		              	</group>
+		              	<group colspan="2">
+		              		<separator string="Choose Your Interface" colspan="4"/>
+		              		<field colspan="4" name="view" nolabel="1"/>
+						</group>
+					</group>
                 </group>
                 <xpath expr='//button[@name="action_skip"]' position='replace'/>
                 <xpath expr='//button[@name="action_next"]' position='attributes'>

From 1e14ac461cabd1959d9c56a8b7b64dbee5dbbc4d Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 27 Apr 2010 17:48:03 +0530
Subject: [PATCH 20/84] Task 578 : Improve the code,Task :581 Convert
 wizard_return  into osv_memory

bzr revid: sbh@tinyerp.com-20100427121803-7y0wv8quy11264ko
---
 addons/point_of_sale/__openerp__.py           |   3 +-
 addons/point_of_sale/pos_view.xml             |   4 +-
 addons/point_of_sale/pos_wizard.xml           |   8 -
 addons/point_of_sale/wizard/__init__.py       |   3 +-
 .../point_of_sale/wizard/pos_add_product.py   |  20 +
 .../point_of_sale/wizard/pos_add_product.xml  |   4 +-
 addons/point_of_sale/wizard/pos_payment.py    |  19 +-
 addons/point_of_sale/wizard/pos_return.py     | 347 +++++++++++
 .../point_of_sale/wizard/pos_return_view.xml  |  13 +
 addons/point_of_sale/wizard/wizard_return.py  | 550 ------------------
 10 files changed, 398 insertions(+), 573 deletions(-)
 create mode 100644 addons/point_of_sale/wizard/pos_return.py
 create mode 100644 addons/point_of_sale/wizard/pos_return_view.xml
 delete mode 100644 addons/point_of_sale/wizard/wizard_return.py

diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index afd96f59b08..111702c2e74 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -62,8 +62,9 @@ Main features :
         'wizard/pos_payment_report.xml',
         'wizard/pos_payment.xml',
         'wizard/pos_scan_product_view.xml',
+        'wizard/pos_return_view.xml',
         'pos_report.xml',
-        'pos_wizard.xml',
+       # 'pos_wizard.xml',
         'pos_view.xml',
         'pos_sequence.xml',
         'posrule_data.xml',
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index b72848e2131..e9829addbda 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -64,8 +64,8 @@
                                 <button name="%(action_pos_payment)d" string="Ma_ke Payment" icon="gtk-ok" type="action" states="draft,advance" context="{'record_id':'active_id'}" />
                                 <button name="%(action_report_pos_receipt)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
                                 <button name="set_to_draft" string="Set to draft" states="paid" icon="gtk-execute" type="object" />
-                                <button name="%(pos_return_picking)d" string="Return Picking" type="action" icon="gtk-ok" states="paid"
-                                    attrs="{'invisible':[('state','!=','paid'),('state','!=','invoiced')]}"/>
+                                <button name="%(action_view_pos_return)d" string="Return Picking" type="action" icon="gtk-ok" states="paid"
+                                    attrs="{'invisible':[('state','!=','paid'),('state','!=','invoiced')]}"  context="{'record_id':'active_id'}" />                             
                             </group>
                         </page>
 
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
index 805739168f0..4a321d7787f 100644
--- a/addons/point_of_sale/pos_wizard.xml
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -1,11 +1,3 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
-  <wizard
-        id="pos_return_picking"
-        model="pos.order"
-        menu="False"
-        name="pos.return.picking"
-        string="Return Goods"/>
-	</data>
 </openerp>
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index cdfd3f9fb20..d8a4b93e3a2 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -19,7 +19,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import wizard_return
+
 import pos_add_product
 import pos_confirm
 import pos_discount
@@ -39,6 +39,7 @@ import pos_payment_report_date
 import pos_payment_report
 import pos_payment
 import pos_scan_product
+import pos_return
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/pos_add_product.py b/addons/point_of_sale/wizard/pos_add_product.py
index 34769be78e9..b977f901eec 100644
--- a/addons/point_of_sale/wizard/pos_add_product.py
+++ b/addons/point_of_sale/wizard/pos_add_product.py
@@ -61,7 +61,27 @@ class add_product(osv.osv_memory):
             'views': False,
             'type': 'ir.actions.act_window',
         }
+    def close_action(self, cr, uid, ids, context):
 
+        record_id = context and context.get('record_id', False)
+        order_obj= self.pool.get('pos.order')
+        order_line_obj= self.pool.get('pos.order.line')
+        obj=order_obj.browse(cr,uid, record_id)
+        order_obj.write(cr,uid,[record_id],{'state':'done'})
+        if obj.amount_total != obj.amount_paid:
+            return {
+            'name': _('Make Payment'),
+            'context ':context and context.get('record_id', False),
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'pos.make.payment',
+            'view_id': False,
+            'target': 'new',
+            'views': False,
+            'type': 'ir.actions.act_window',
+            
+            }
+        return {}   
 add_product()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_add_product.xml b/addons/point_of_sale/wizard/pos_add_product.xml
index 5d380624f0d..f465f97f097 100644
--- a/addons/point_of_sale/wizard/pos_add_product.xml
+++ b/addons/point_of_sale/wizard/pos_add_product.xml
@@ -12,8 +12,8 @@
 				    <group col="2" colspan="4">
 				    	<field name="product_id"/>
 				    	<field name="quantity"/>
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Close" />
+                		<button icon='gtk-cancel' name="close_action"
+                			string="Close" type="object"  />
                 		<button name="select_product" string="Contiue"
                 			colspan="1" type="object" icon="gtk-ok" />
                 	</group>
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index 8e25f3f0797..3c608e452fa 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -43,7 +43,7 @@ class pos_make_payment(osv.osv_memory):
          @return: A dictionary which of fields with values. 
         """
         res = super(pos_make_payment, self).default_get(cr, uid, fields, context=context)
-        record_id = context and context.get('active_id',False)  
+        record_id = context and context.get('record_id',False)  
         j_obj = self.pool.get('account.journal')
         company_id = self.pool.get('res.users').browse(cr,uid,uid).company_id.id
         journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', company_id)])
@@ -81,7 +81,7 @@ class pos_make_payment(osv.osv_memory):
         
     def view_init(self, cr, uid, fields_list, context=None):
         res = super(pos_make_payment, self).view_init(cr, uid, fields_list, context=context)
-        record_id = context and context.get('active_id', False) or False        
+        record_id = context and context.get('record_id', False) or False        
         order = self.pool.get('pos.order').browse(cr, uid, record_id)
         if not order.lines:
                 raise osv.except_osv('Error!','No order lines defined for this sale ')
@@ -103,8 +103,7 @@ class pos_make_payment(osv.osv_memory):
         res = super(pos_make_payment, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
         if record_id:
             order = self.pool.get('pos.order').browse(cr, uid, record_id)
-            amount = order.amount_total - order.amount_paid
-            if amount==0.0:
+            if order.amount_total == order.amount_paid:
                 res['arch'] = """ <form string="Make Payment" colspan="4">
                                 <group col="2" colspan="2">
                                     <label string="Do you want to print the Receipt?" colspan="4"/>
@@ -122,13 +121,13 @@ class pos_make_payment(osv.osv_memory):
         if the order is not paid: continue payment,
         if the order is paid print invoice (if wanted) or ticket.
         """
-        record_id = context and context.get('active_id',False)      
+        record_id = context and context.get('record_id',False)      
         order_obj = self.pool.get('pos.order')
         jrnl_obj = self.pool.get('account.journal')        
         order = order_obj.browse(cr, uid, record_id, context)
         amount = order.amount_total - order.amount_paid
         data =  self.read(cr, uid, ids)[0]
-
+        
         # Todo need to check ...
         if amount !=0.0:
             invoice_wanted = data['invoice_wanted']
@@ -145,6 +144,7 @@ class pos_make_payment(osv.osv_memory):
             if order.partner_id and order.invoice_wanted:
                 return self.create_invoice(cr,uid,ids,context)
             else:
+                context.update({'flag': True})                
                 order_obj.action_paid(cr,uid,[record_id],context)                
                 order_obj.write(cr, uid, [record_id],{'state':'paid'})                            
                 return self.print_report(cr, uid, ids, context)  
@@ -159,10 +159,10 @@ class pos_make_payment(osv.osv_memory):
     
     def create_invoice(self, cr, uid, ids, context):
         wf_service = netsvc.LocalService("workflow")
-        record_ids = context and context.get('active_ids',False)      
+        record_ids = [context and context.get('record_id',False)]      
         for i in record_ids:
             wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
-        datas = {'ids' : context.get('active_ids', [])}        
+        datas = {'ids' : context.get('record_id', [])}        
         return { 
                 'type' : 'ir.actions.report.xml',
                 'report_name':'pos.invoice',
@@ -180,7 +180,8 @@ class pos_make_payment(osv.osv_memory):
          @param context: A standard dictionary 
          @return : retrun report
         """        
-        datas = {'ids' : context.get('active_ids',[])}
+        record_id=context.get('record_id',[])        
+        datas = {'ids' : [record_id]}
         res =  {}        
         datas['form'] = res
 
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
new file mode 100644
index 00000000000..f0a63eeb00f
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -0,0 +1,347 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+from mx import DateTime
+import time
+import pos_box_entries
+import pos_add_product
+import pos_payment
+
+class pos_return(osv.osv_memory):
+    _name = 'pos.return'
+    _description = 'Point of sale return'
+
+    _columns = {
+                
+    }
+    
+    def default_get(self, cr, uid, fields, context=None):
+        """ 
+             To get default values for the object.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param fields: List of fields for which we want default values 
+             @param context: A standard dictionary 
+             
+             @return: A dictionary which of fields with values. 
+        
+        """ 
+
+        res = super(pos_return, self).default_get(cr, uid, fields, context=context)
+        order_obj=self.pool.get('pos.order')      
+        record_id=context.get('record_id')
+        if not context:
+            context={}
+        for order in order_obj.browse(cr, uid,[record_id]):
+            for line in order.lines:
+                if 'return%s'%(line.id) in fields:
+                    res['return%s'%(line.id)] = line.qty        
+        return res
+                   
+    def view_init(self, cr, uid, fields_list, context=None):
+        res = super(pos_return, self).view_init(cr, uid, fields_list, context=context)
+        order_obj=self.pool.get('pos.order')           
+        if not context:
+            context={}
+        record_id=context.get('record_id')            
+        for order in order_obj.browse(cr, uid,[record_id]):            
+            for line in order.lines:    
+                if 'return%s'%(line.id) not in self._columns:
+                    self._columns['return%s'%(line.id)] = fields.float("Quantity")
+                             
+        return res   
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
+        result = super(pos_return, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
+        if not context:
+            context={}
+        order_obj=self.pool.get('pos.order')
+        record_id = context.get('record_id', False)
+        if record_id:
+            _moves_arch_lst="""<?xml version="1.0"?>
+                            <form string="Return lines">
+                            <label string="Quantities you enter, match to products that will return to the stock." colspan="4"/>"""
+            _line_fields = result['fields']                
+            order=order_obj.browse(cr, uid, record_id)
+            for line in order.lines:    
+                quantity=line.qty    
+                _line_fields.update({
+                                         'return%s'%(line.id) : {
+                                        'string': line.product_id.name,
+                                        'type' : 'float',
+                                        'required': True,  
+                                        'default':quantity
+                                        },                                    
+                            })
+                _moves_arch_lst += """
+                        <field name="return%s"/>
+                         <newline/>      
+                """%(line.id)
+                                
+            _moves_arch_lst+="""
+                    <newline/>      
+                    <separator colspan="4"/>
+                   <button icon='gtk-cancel' special="cancel"
+                               string="Cancel" />
+                                   <button icon='gtk-ok' name= "create_returns"
+                       string="Return goods and Exchange" type="object"/>
+                                   <button icon='gtk-ok' name="create_returns2"
+                        string="Return without Refund" type="object"/>
+                </form>"""    
+                             
+            result['arch'] = _moves_arch_lst
+            result['fields'] = _line_fields   
+        return result    
+       
+       
+    def  create_returns(self, cr, uid, data, context):
+        return {
+                'name': _('Add Product'),
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'pos.add.product',
+                'view_id': False,
+                'target':'new',
+                'views': False,
+                'type': 'ir.actions.act_window',
+        }
+    def create_returns2(self, cr, uid, ids, context):
+        record_id = context.get('record_id', False)        
+        order_obj =self.pool.get('pos.order')
+        line_obj = self.pool.get('pos.order.line')
+        picking_obj = self.pool.get('stock.picking')
+        stock_move_obj = self.pool.get('stock.move')
+        property_obj= self.pool.get("ir.property")
+        uom_obj =self. pool.get('product.uom')
+        wf_service = netsvc.LocalService("workflow")
+        #Todo :Need to clean the code
+        if record_id:
+            picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in',[record_id]), ('state', '=', 'done')])
+            data=self.read(cr,uid,ids)[0]
+            clone_list = []
+            date_cur=time.strftime('%Y-%m-%d')
+
+            for order_id in order_obj.browse(cr, uid, [record_id], context=context):
+                prop_ids = property_obj.search(cr, uid,[('name', '=', 'property_stock_customer')])
+                val = property_obj.browse(cr, uid,prop_ids[0]).value
+                cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
+                res=cr.fetchone()
+                location_id=res and res[0] or None
+                stock_dest_id = int(val.split(',')[1])
+                                    
+                new_picking=picking_obj.copy(cr, uid, order_id.last_out_picking.id, {'name':'%s (return)' % order_id.name,
+                                                                                    'move_lines':[], 'state':'draft', 'type':'in',
+                                                                                    'type':'in',
+                                                                                    'date':date_cur})
+                new_order=order_obj.copy(cr,uid,order_id.id, {'name': 'Refund %s'%order_id.name,
+                                                              'lines':[],
+                                                              'statement_ids':[],
+                                                              'last_out_picking':[]})
+                for line in order_id.lines:
+                    if line.id  and (data['return%s' %line.id]!=0.0):
+                        new_move=stock_move_obj.create(cr, uid,{
+                            'product_qty': data['return%s' %line.id],
+                            'product_uos_qty': uom_obj._compute_qty(cr, uid,data['return%s' %line.id] ,line.product_id.uom_id.id),
+                            'picking_id':new_picking,
+                            'product_uom':line.product_id.uom_id.id,
+                            'location_id':location_id,
+                            'product_id':line.product_id.id,
+                            'location_dest_id':stock_dest_id,
+                            'name':'%s (return)' %order_id.name,
+                            'date':date_cur,
+                            'date_planned':date_cur,})
+                        line_obj.copy(cr,uid,line.id,{'qty':-data['return%s' %line.id],
+                                                    'order_id': new_order,
+                        })
+                order_obj.write(cr,uid, new_order, {'state':'done'})
+                wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
+                picking_obj.force_assign(cr, uid, [new_picking], context)
+            act = {
+                'domain': "[('id', 'in', ["+str(new_order)+"])]",
+                'name': 'Refunded Orders',
+                'view_type': 'form',
+                'view_mode': 'form,tree',
+                'res_model': 'pos.order',
+                'auto_refresh':0,
+                'res_id':new_order,
+                'view_id': False,
+                'type': 'ir.actions.act_window'
+            }
+        return act
+    
+pos_return()
+class add_product(osv.osv_memory):
+    _inherit = 'pos.add.product'  
+    def select_product(self, cr, uid, ids, context):
+        """ 
+             To get the product and quantity and add in order .            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             @return : Retrun the add product form again for adding more product
+        """               
+        
+        if not context.get('record_id', False):
+            super(add_product).select_product(cr,uid,ids)
+        else:    
+            record_id=context.get('record_id', False)
+            data =  self.read(cr, uid, ids)[0] 
+                   
+            order_obj = self.pool.get('pos.order')
+            lines_obj = self.pool.get('pos.order.line')
+            picking_obj = self.pool.get('stock.picking')
+            stock_move_obj = self.pool.get('stock.move')
+            move_obj = self.pool.get('stock.move')
+            property_obj= self.pool.get("ir.property")
+            invoice_obj= self.pool.get('account.invoice')
+            picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in',[record_id]), ('state', '=', 'done')])
+            clone_list = []
+            date_cur=time.strftime('%Y-%m-%d')
+            uom_obj = self.pool.get('product.uom')
+            prod_obj=self.pool.get('product.product')
+            wf_service = netsvc.LocalService("workflow")
+            return_boj=self.pool.get('pos.return')
+            order_obj.add_product(cr, uid, record_id,data['product_id'],data['quantity'], context=context)
+              
+            for order_id in order_obj.browse(cr, uid, [record_id], context=context):
+                prod=data['product_id']
+                qty=data['quantity']
+                prop_ids = property_obj.search(cr, uid,[('name', '=', 'property_stock_customer')])
+                val = property_obj.browse(cr, uid,prop_ids[0]).value
+                cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
+                res=cr.fetchone()
+                location_id=res and res[0] or None
+                stock_dest_id = int(val.split(',')[1])
+        
+                prod_id=prod_obj.browse(cr,uid,prod)
+                new_picking=picking_obj.create(cr,uid,{
+                                        'name':'%s (Added)' %order_id.name,
+                                        'move_lines':[],
+                                        'state':'draft',
+                                        'type':'out',
+                                        'date':date_cur,   })
+                new_move=stock_move_obj.create(cr, uid,{
+                                'product_qty': qty,
+                                'product_uos_qty': uom_obj._compute_qty(cr, uid,prod_id.uom_id.id, qty, prod_id.uom_id.id),
+                                'picking_id':new_picking,
+                                'product_uom':prod_id.uom_id.id,
+                                'location_id':location_id,
+                                'product_id':prod_id.id,
+                                'location_dest_id':stock_dest_id,
+                                'name':'%s (return)' %order_id.name,
+                                'date':date_cur,
+                                'date_planned':date_cur,})
+        
+                wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
+                picking_obj.force_assign(cr, uid, [new_picking], context)
+                order_obj.write(cr,uid,record_id,{'last_out_picking':new_picking})
+                
+             
+        return {            
+                'name': _('Add Product'),
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'pos.add.product',
+                'view_id': False,
+                'target':'new',
+                'context':context,
+                'views': False,
+                'type': 'ir.actions.act_window',
+                }
+
+    def close_action(self, cr, uid, ids, context):
+
+        record_id=context.get('record_id', False)            
+        order_obj = self.pool.get('pos.order')
+        lines_obj = self.pool.get('pos.order.line')
+        picking_obj = self.pool.get('stock.picking')
+        stock_move_obj = self.pool.get('stock.move')
+        move_obj = self.pool.get('stock.move')
+        property_obj= self.pool.get("ir.property")   
+        invoice_obj=self.pool.get('account.invoice')
+        picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', [record_id]), ('state', '=', 'done')])
+        clone_list = []
+        date_cur=time.strftime('%Y-%m-%d')
+        uom_obj = self.pool.get('product.uom')
+        return_boj=self.pool.get('pos.return')
+        return_id=return_boj.search(cr,uid,[])
+        data=return_boj.read(cr,uid,return_id,[])[0]
+                        
+        wf_service = netsvc.LocalService("workflow")
+        for order_id in order_obj.browse(cr, uid, [record_id], context=context):
+            prop_ids =property_obj.search(cr, uid,[('name', '=', 'property_stock_customer')])
+            val = property_obj.browse(cr, uid,prop_ids[0]).value
+            cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
+            res=cr.fetchone()
+            location_id=res and res[0] or None
+            stock_dest_id = int(val.split(',')[1])
+    
+            order_obj.write(cr,uid,[order_id.id],{'type_rec':'Exchange'})
+            if order_id.invoice_id:
+                invoice_obj.refund(cr, uid, [order_id.invoice_id.id],time.strftime('%Y-%m-%d'), False, order_id.name)
+            new_picking=picking_obj.create(cr,uid,{
+                                    'name':'%s (return)' %order_id.name,
+                                    'move_lines':[], 'state':'draft',
+                                    'type':'in',
+                                    'date':date_cur})
+            for line in order_id.lines:
+                key=('return%s') %line.id
+                if line.id  and  data.has_key(key):
+                    new_move=stock_move_obj.create(cr, uid,{
+                        'product_qty': data['return%s' %line.id ],
+                        'product_uos_qty': uom_obj._compute_qty(cr, uid,data['return%s' %line.id] ,line.product_id.uom_id.id),
+                        'picking_id':new_picking,
+                        'product_uom':line.product_id.uom_id.id,
+                        'location_id':location_id,
+                        'product_id':line.product_id.id,
+                        'location_dest_id':stock_dest_id,
+                        'name':'%s (return)' %order_id.name,
+                        'date':date_cur,
+                        'date_planned':date_cur,})
+                    lines_obj.write(cr,uid,[line.id],{'qty_rfd':(line.qty or 0.0) + data['return%s' %line.id],
+                                                    'qty':line.qty-(data['return%s' %line.id] or 0.0)
+                    })
+            wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
+            picking_obj.force_assign(cr, uid, [new_picking], context)
+        obj=order_obj.browse(cr,uid, record_id)                
+        if obj.amount_total != obj.amount_paid:
+            return {
+            'name': _('Make Payment'),
+            'context ':context and context.get('record_id', False),
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'pos.make.payment',
+            'view_id': False,
+            'target': 'new',
+            'views': False,
+            'type': 'ir.actions.act_window',
+            
+            }                    
+                 
+add_product()        
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_return_view.xml b/addons/point_of_sale/wizard/pos_return_view.xml
new file mode 100644
index 00000000000..0d01b3c6666
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_return_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>        
+		<record id="action_view_pos_return" model="ir.actions.act_window">
+			<field name="name">Return lines</field>
+			<field name="res_model">pos.return</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form</field>
+			<field name="target">new</field>
+		</record>	
+      
+	</data>
+</openerp>	        
diff --git a/addons/point_of_sale/wizard/wizard_return.py b/addons/point_of_sale/wizard/wizard_return.py
deleted file mode 100644
index bc21e33362d..00000000000
--- a/addons/point_of_sale/wizard/wizard_return.py
+++ /dev/null
@@ -1,550 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-from tools.misc import UpdateableStr
-
-import netsvc
-import time
-
-from tools.translate import _
-from decimal import Decimal
-
-
-arch=UpdateableStr()
-fields={}
-
-
-def _get_journal(self, cr, uid, context):
-    pool = pooler.get_pool(cr.dbname)
-    obj = pool.get('account.journal')
-    c=pool.get('res.users').browse(cr,uid,uid).company_id.id
-    ids = obj.search(cr, uid, [('type', '=', 'cash'), ('company_id','=',c)])
-    res = obj.read(cr, uid, ids, ['id', 'name'], context)
-    res = [(r['id'], r['name']) for r in res]
-    return res
-
-
-payment_form = """<?xml version="1.0"?>
-<form string="Add payment :">
-    <field name="amount" />
-    <field name="journal"/>
-    <field name="payment_date" />
-    <field name="payment_name" />
-    <field name="invoice_wanted" />
-    <field name="num_sale" />
-</form>
-"""
-
-payment_fields = {
-    'amount': {'string': 'Amount', 'type': 'float', 'required': True},
-    'invoice_wanted': {'string': 'Invoice', 'type': 'boolean'},
-    'journal': {'string': 'Journal',
-            'type': 'selection',
-            'selection': _get_journal,
-            'required': True,
-        },
-    'payment_date': {'string': 'Payment date', 'type': 'date', 'required': True},
-    'payment_name': {'string': 'Payment name', 'type': 'char', 'size': '32', 'required':True, 'default':'Payment'},
-    'num_sale': {'string': 'Num.Cof', 'type': 'char', 'size': '32'},
-    }
-
-
-def _pre_init(self, cr, uid, data, context):
-    def _get_journal(pool, order):
-        j_obj = pool.get('account.journal')
-
-        journal_to_fetch = 'DEFAULT'
-        if order.amount_total < 0:
-            journal_to_fetch = 'GIFT'
-        else:
-            if order.amount_paid > 0:
-                journal_to_fetch = 'REBATE'
-
-        pos_config_journal = pool.get('pos.config.journal')
-        ids = pos_config_journal.search(cr, uid, [('code', '=', journal_to_fetch)])
-        objs = pos_config_journal.browse(cr, uid, ids)
-        journal=''
-        if objs:
-            journal = objs[0].journal_id.id
-        else:
-            existing = [payment.journal_id.id for payment in order.payments]
-            ids = j_obj.search(cr, uid, [('type', '=', 'cash')])
-            for i in ids:
-                if i not in existing:
-                    journal = i
-                    break
-            if not journal:
-                journal = ids and ids[0]
-        return journal
-    pool = pooler.get_pool(cr.dbname)
-    order = pool.get('pos.order').browse(cr, uid, data['id'], context)
-    # get amount to pay:
-#    amount = Decimal(str(order.amount_total)) - Decimal(str(order.amount_paid))
-    amount = order.amount_total - order.amount_paid
-    if amount <= 0:
-        pool.get('pos.order').action_paid(cr, uid, data['ids'], context)
-
-    # get journal:
-    journal = _get_journal(pool, order)
-
-    # check if an invoice is wanted:
-    #invoice_wanted_checked = not not order.partner_id # not not -> boolean
-    invoice_wanted_checked = False
-
-    # select the current date
-    current_date = time.strftime('%Y-%m-%d')
-
-    return {'journal': journal, 'amount': amount, 'invoice_wanted': invoice_wanted_checked, 'payment_date': current_date}
-
-
-def _add_pay(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    jrnl_obj = pool.get('account.journal')
-    result = data['form']
-    invoice_wanted = data['form']['invoice_wanted']
-    jrnl_used=False
-    if data['form'] and data['form'].get('journal',False):
-        jrnl_used=jrnl_obj.browse(cr,uid,data['form']['journal'])
-
-    # add 'invoice_wanted' in 'pos.order'
-    order_obj.write(cr, uid, [data['id']], {'invoice_wanted': invoice_wanted})
-
-    order_obj.add_payment(cr, uid, data['id'], result, context=context)
-    return {}
-
-
-def _check(self, cr, uid, data, context):
-    """Check the order:
-    if the order is not paid: continue payment,
-    if the order is paid print invoice (if wanted) or ticket.
-    """
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    order = order_obj.browse(cr, uid, data['id'], context)
-    order_obj.test_order_lines(cr, uid, order, context=context)
-
-    action = 'ask_pay'
-    if order.state == 'paid':
-        if order.partner_id:
-            if order.invoice_wanted:
-                action = 'invoice'
-            else:
-                action = 'paid'
-        elif order.date_validation:
-            action = 'receipt'
-        else:
-            action='paid'
-
-    if order.amount_total == order.amount_paid:
-        order_obj.write(cr,uid,data['ids'],{'state':'done'})
-        action = 'receipt'
-
-    return action
-
-
-def create_invoice(self, cr, uid, data, context):
-    wf_service = netsvc.LocalService("workflow")
-    for i in data['ids']:
-        wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
-    return {}
-
-
-
-_form = """<?xml version="1.0"?>
-<form string="Add product :">
-<field name="product"/>
-<field name="quantity"/>
-</form>
-"""
-_fields = {
-    'product': {
-        'string': 'Product',
-        'type': 'many2one',
-        'relation': 'product.product',
-        'required': True,
-        'default': False
-    },
-
-    'quantity': {
-        'string': 'Quantity',
-        'type': 'integer',
-        'required': True,
-        'default': 1},
-    }
-
-def make_default(val):
-    def fct(obj, cr, uid):
-        return val
-    return fct
-
-def _get_returns(self, cr, uid, data, context):
-
-    pool = pooler.get_pool(cr.dbname)
-    order_obj=pool.get('pos.order')
-    order=order_obj.browse(cr, uid, [data['id']])[0]
-    res={}
-    fields.clear()
-    arch_lst=['<?xml version="1.0"?>', '<form string="%s">' % _('Return lines'), '<label string="%s" colspan="4"/>' % _('Quantities you enter, match to products that will return to the stock.')]
-    for m in [line for line in order.lines]:
-        quantity=m.qty
-        arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
-        fields['return%s' % m.id]={'string':m.product_id.name, 'type':'float', 'required':True, 'default':quantity}
-        res.setdefault('returns', []).append(m.id)
-    arch_lst.append('</form>')
-    arch.string='\n'.join(arch_lst)
-    return res
-
-def _create_returns(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    lines_obj = pool.get('pos.order.line')
-    picking_obj = pool.get('stock.picking')
-    stock_move_obj = pool.get('stock.move')
-    move_obj = pool.get('stock.move')
-    picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', data['ids']), ('state', '=', 'done')])
-    clone_list = []
-    date_cur=time.strftime('%Y-%m-%d')
-    uom_obj = pool.get('product.uom')
-    wf_service = netsvc.LocalService("workflow")
-    for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
-        prop_ids = pool.get("ir.property").search(cr, uid,[('name', '=', 'property_stock_customer')])
-        val = pool.get("ir.property").browse(cr, uid,prop_ids[0]).value
-        cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
-        res=cr.fetchone()
-        location_id=res and res[0] or None
-        stock_dest_id = int(val.split(',')[1])
-
-        order_obj.write(cr,uid,[order_id.id],{'type_rec':'Exchange'})
-        if order_id.invoice_id:
-            pool.get('account.invoice').refund(cr, uid, [order_id.invoice_id.id],time.strftime('%Y-%m-%d'), False, order_id.name)
-        new_picking=picking_obj.create(cr,uid,{
-                                'name':'%s (return)' %order_id.name,
-                                'move_lines':[], 'state':'draft',
-                                'type':'in',
-                                'date':date_cur,   })
-        for line in order_id.lines:
-            for r in data['form'].get('returns',[]):
-                if line.id==r and (data['form']['return%s' %r]!=0.0):
-                    new_move=stock_move_obj.create(cr, uid,{
-                        'product_qty': data['form']['return%s' %r],
-                        'product_uos_qty': uom_obj._compute_qty(cr, uid,data['form']['return%s' %r] ,line.product_id.uom_id.id),
-                        'picking_id':new_picking,
-                        'product_uom':line.product_id.uom_id.id,
-                        'location_id':location_id,
-                        'product_id':line.product_id.id,
-                        'location_dest_id':stock_dest_id,
-                        'name':'%s (return)' %order_id.name,
-                        'date':date_cur,
-                        'date_planned':date_cur,})
-                    lines_obj.write(cr,uid,[line.id],{'qty_rfd':(line.qty or 0.0) + data['form']['return%s' %r],
-                                                    'qty':line.qty-(data['form']['return%s' %r] or 0.0)
-                    })
-        wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
-        picking_obj.force_assign(cr, uid, [new_picking], context)
-    return res
-
-def _create_returns2(self, cr, uid, data, context):
-    act={}
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    line_obj = pool.get('pos.order.line')
-    picking_obj = pool.get('stock.picking')
-    stock_move_obj = pool.get('stock.move')
-    picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', data['ids']), ('state', '=', 'done')])
-    clone_list = []
-    date_cur=time.strftime('%Y-%m-%d')
-    uom_obj = pool.get('product.uom')
-    wf_service = netsvc.LocalService("workflow")
-    for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
-        prop_ids = pool.get("ir.property").search(cr, uid,[('name', '=', 'property_stock_customer')])
-        val = pool.get("ir.property").browse(cr, uid,prop_ids[0]).value
-        cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
-        res=cr.fetchone()
-        location_id=res and res[0] or None
-        stock_dest_id = int(val.split(',')[1])
-        if order_id.last_out_picking.id:
-            new_picking=picking_obj.copy(cr, uid, order_id.last_out_picking.id, {'name':'%s (return)' % order_id.name,
-                                                                                'move_lines':[], 'state':'draft', 'type':'in',
-                                                                                'type':'in',
-                                                                                'date':date_cur,   })
-            new_order=order_obj.copy(cr,uid,order_id.id, {'name': 'Refund %s'%order_id.name,
-                                                          'lines':[],
-                                                          'statement_ids':[],
-                                                          'last_out_picking':[]})
-            for line in order_id.lines:
-                for r in data['form'].get('returns',[]):
-                    if line.id==r and (data['form']['return%s' %r]!=0.0):
-                        new_move=stock_move_obj.create(cr, uid,{
-                            'product_qty': data['form']['return%s' %r],
-                            'product_uos_qty': uom_obj._compute_qty(cr, uid,data['form']['return%s' %r] ,line.product_id.uom_id.id),
-                            'picking_id':new_picking,
-                            'product_uom':line.product_id.uom_id.id,
-                            'location_id':location_id,
-                            'product_id':line.product_id.id,
-                            'location_dest_id':stock_dest_id,
-                            'name':'%s (return)' %order_id.name,
-                            'date':date_cur,
-                            'date_planned':date_cur,})
-                        line_obj.copy(cr,uid,line.id,{'qty':-data['form']['return%s' %r],
-                                                    'order_id': new_order,
-                        })
-            order_obj.write(cr,uid, new_order, {'state':'done'})
-            wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
-            picking_obj.force_assign(cr, uid, [new_picking], context)
-            act = {
-            'domain': "[('id', 'in', ["+str(new_order)+"])]",
-            'name': 'Refunded Orders',
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'pos.order',
-            'auto_refresh':0,
-            'res_id':new_order,
-            'view_id': False,
-            'type': 'ir.actions.act_window'
-                        }
-        else:         
-           raise wizard.except_wizard(_('Error'), _('Last out picking No find!'))
-
-    return act
-def test(self,cr,uid,data,context={}):
-  #  import pdb; pdb.set_trace()
-    data['id']=data['res_id']
-    return {'id':data['res_id']}
-
-#def _raise(self,cr,uid,data,context={}):
-#    return datas
-#    raise wizard.except_wizard(_('Message'),_('You can not exchange products more than total paid amount.'))
-
-
-#def _test_exist1(self,cr,uid,data,context={}):
-#    return 'choice'
-
-def _test_exist(self,cr,uid,data,context={}):
-#    order_obj= pooler.get_pool(cr.dbname).get('pos.order')
-#    order_line_obj= pooler.get_pool(cr.dbname).get('pos.order.line')
-#    obj=order_obj.browse(cr,uid, data['ids'])[0]
-#    am_tot=obj._amount_total(cr, uid, data['ids'])
-#    order_obj.write(cr,uid,data['ids'],{'state':'done'})
-#    if obj.amount_total == obj.amount_paid:
-#        return 'receipt'
-#    elif obj.amount_total > obj.amount_paid:
-#        sql = """select max(id) from pos_order_line where order_id = %d """%(obj.id)
-#        cr.execute(sql)
-#        res = cr.fetchone()
-#        cr.execute("delete from pos_order_line where id = %d"%(res[0]))
-#        cr.commit()
-#        return 'choice_raise'
-#    else:
-    return 'add_p'
-
-def _close(self,cr,uid,data,context={}):
-    order_obj= pooler.get_pool(cr.dbname).get('pos.order')
-    order_line_obj= pooler.get_pool(cr.dbname).get('pos.order.line')
-    obj=order_obj.browse(cr,uid, data['ids'])[0]
-    order_obj.write(cr,uid,data['ids'],{'state':'done'})
-    if obj.amount_total != obj.amount_paid:
-        return 'ask_pay'
-    else :
-        return 'receipt'
-
-
-
-
-def _add_pdct(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    line_obj = pool.get('pos.order.line')
-    picking_obj = pool.get('stock.picking')
-    wf_service = netsvc.LocalService("workflow")
-    prod_obj = pool.get('product.product')
-    stock_move_obj = pool.get('stock.move')
-    uom_obj = pool.get('product.uom')
-    date_cur=time.strftime('%Y-%m-%d')
-    order_obj.add_product(cr, uid, data['id'], data['form']['product'],
-                            data['form']['quantity'], context=context)
-    cr.commit()
-    for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
-        prod=data['form']['product']
-        qty=data['form']['quantity']
-        prop_ids = pool.get("ir.property").search(cr, uid,[('name', '=', 'property_stock_customer')])
-        val = pool.get("ir.property").browse(cr, uid,prop_ids[0]).value
-        cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
-        res=cr.fetchone()
-        location_id=res and res[0] or None
-        stock_dest_id = int(val.split(',')[1])
-
-        prod_id=prod_obj.browse(cr,uid,prod)
-        new_picking=picking_obj.create(cr,uid,{
-                                'name':'%s (Added)' %order_id.name,
-                                'move_lines':[],
-                                'state':'draft',
-                                'type':'out',
-                                'date':date_cur,   })
-        new_move=stock_move_obj.create(cr, uid,{
-                        'product_qty': qty,
-                        'product_uos_qty': uom_obj._compute_qty(cr, uid,prod_id.uom_id.id, qty, prod_id.uom_id.id),
-                        'picking_id':new_picking,
-                        'product_uom':prod_id.uom_id.id,
-                        'location_id':location_id,
-                        'product_id':prod_id.id,
-                        'location_dest_id':stock_dest_id,
-                        'name':'%s (return)' %order_id.name,
-                        'date':date_cur,
-                        'date_planned':date_cur,})
-
-        wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
-        picking_obj.force_assign(cr, uid, [new_picking], context)
-       # order_obj.write(cr,uid,data['id'],{'state':'done','last_out_picking':new_picking})
-        order_obj.write(cr,uid,data['id'],{'last_out_picking':new_picking})
-    return {}
-
-
-
-
-class wizard_return_picking(wizard.interface):
-    states={
-        'init':{
-            'actions':[_get_returns],
-            'result':{'type':'form',
-                    'arch':arch,
-                    'fields':fields,
-                    'state':[('end','Cancel', 'gtk-cancel'),('return','Return goods and Exchange', 'gtk-ok'),('return_w','Return without Refund','gtk-ok')]
-                    }
-        },
-        'return':{
-            'actions':[],
-            'result':{ 'type': 'action',
-                       'action' : _create_returns,
-                       'state':'prod'}
-        },
-        'prod':{
-            'actions':[],
-            'result': {
-                'type': 'form',
-                'arch': _form,
-                'fields':_fields,
-                'state': [('close','Close'),('choice','Continue')]
-            }
-        },
-#        'choice1' : {
-#            'actions' : [_add_pdct],
-#            'result' : {'type' : 'choice', 'next_state': _test_exist1 }
-#        },
-        'choice' : {
-            'actions' : [],
-            'result' : {'type' : 'choice', 'next_state': _test_exist }
-        },
-#        'choice_raise':{
-#                        'actions':[],
-#            'result':{ 'type': 'action',
-#                       'action' : _raise,
-#                       'state':'end'}
-#        },
-        'add_p' :{
-            'actions':[],
-            'result':{
-            'type':'action',
-            'action': _add_pdct,
-            'state': 'prod'}
-        },
-#        'add_pp' :{
-#            'actions':[],
-#            'result':{
-#            'type':'action',
-#            'action': _add_pdct,
-#            'state': 'end'}
-#        },
-        'receipt':{
-            'result': {
-                'type': 'print',
-                'report': 'pos.receipt',
-                'state': 'end'
-            }
-        },
-        'return_w':{
-            'actions':[],
-            'result':{'type':'action', 'action':_create_returns2, 'state':'end'}
-        },
-
-        'close':{
-            'actions' : [],
-            'result' : {'type' : 'choice', 'next_state': _close }
-        },
-
-       'check': {
-            'actions': [],
-            'result': {
-                'type': 'choice',
-                'next_state': _check,
-            }
-        },
-
-        'ask_pay': {
-            'actions': [_pre_init],
-            'result': {
-                'type': 'form',
-                'arch': payment_form,
-                'fields': payment_fields,
-                'state': (('end', 'Cancel'), ('add_pay', 'Ma_ke payment', 'gtk-ok', True)
-                         )
-            }
-        },
-        'add_pay': {
-            'actions': [_add_pay],
-            'result': {
-                'type': 'state',
-                'state': "check",
-            }
-        },
-
-
-        'invoice': {
-            'actions': [create_invoice],
-            'result': {
-                'type': 'print',
-                'report': 'pos.invoice',
-                'state': 'end'
-            }
-        },
-        'receipt': {
-            'actions': [],
-            'result': {
-                'type': 'print',
-                'report': 'pos.receipt',
-                'state': 'end'
-            }
-        },
-        'paid': {
-            'actions': [],
-            'result': {
-                'type': 'state',
-                'state': 'end'
-            }
-        },
-
-    }
-wizard_return_picking('pos.return.picking')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 1e186b3c128784c9a19f77bc73b57715a3cf12ac Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Tue, 27 Apr 2010 18:39:11 +0530
Subject: [PATCH 21/84] [IMP]:added info picture to choose your wizard

bzr revid: nch@tinyerp.com-20100427130911-chmveh4zkn961bpu
---
 bin/addons/base/base_update.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 42e4aae4e8e..542434d4be6 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -285,12 +285,13 @@
 
                 <group string="res_config_contents" position="replace">
                 	<group colspan="4">
-		            	<group colspan="2">
+		            	<group colspan="1">
+		            	    <image name="gtk-dialog-info"/>
 			              	<label colspan="4" align="0.0" string="Choose between the simplified interface and the extended one."/>
 		              		<label colspan="4" align="0.0" string="If you are testing OpenERP or using it for the first time, we suggest you use the simplified interface. It has less options and fields but is easier to understand."/>
 		              		<label colspan="4" align="0.0" string="You will be able to switch to the extended interface later."/>
 		              	</group>
-		              	<group colspan="2">
+		              	<group colspan="3">
 		              		<separator string="Choose Your Interface" colspan="4"/>
 		              		<field colspan="4" name="view" nolabel="1"/>
 						</group>

From 76201eb88a69fa27c9f1d300f03984971bbf830c Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 28 Apr 2010 12:24:06 +0530
Subject: [PATCH 22/84] [IMP]:ir.actions.todo added groups to the actions

bzr revid: nch@tinyerp.com-20100428065406-97056qrpvp4tun0e
---
 bin/addons/base/ir/ir.xml         |  5 +++++
 bin/addons/base/ir/ir_actions.py  | 13 +++++++------
 bin/addons/base/res/res_config.py | 12 +++++++++++-
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 667a77e8a13..77ae7643645 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1383,6 +1383,11 @@
                     <field name="action_id" select="1"/>
                     <field name="restart"/>
                     <field name="state"/>
+                    <notebook colspan="4">
+                        <page string="Groups">
+                    		<field name="groups_id" nolabel="1" colspan="4"/>
+                    	</page>
+                    </notebook>
                 </form>
             </field>
         </record>
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 33be3fe99ee..a9eab3ea3da 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -387,13 +387,13 @@ class actions_server(osv.osv):
                 line = rs[0], "%s - (%s)" % (rs[1], rs[0])
                 res.append(line)
         return res
-    
+
     def _select_objects(self, cr, uid, context={}):
         model_pool = self.pool.get('ir.model')
         ids = model_pool.search(cr, uid, [('name','not ilike','.')])
         res = model_pool.read(cr, uid, ids, ['model', 'name'])
         return [(r['model'], r['name']) for r in res] +  [('','')]
-    
+
     def change_object(self, cr, uid, ids, copy_object, state, context={}):
         if state == 'object_copy':
             model_pool = self.pool.get('ir.model')
@@ -581,10 +581,10 @@ class actions_server(osv.osv):
                     continue
                 if not user:
                     raise osv.except_osv(_('Error'), _("Please specify server option --smtp-from !"))
-                
+
                 subject = self.merge_message(cr, uid, action.subject, action, context)
                 body = self.merge_message(cr, uid, action.message, action, context)
-                
+
                 if tools.email_send(user, [address], subject, body, debug=False, subtype='html') == True:
                     logger.notifyChannel('email', netsvc.LOG_INFO, 'Email successfully send to : %s' % (address))
                 else:
@@ -686,7 +686,7 @@ class actions_server(osv.osv):
                 cr.commit()
                 if action.record_id:
                     self.pool.get(action.model_id.model).write(cr, uid, [context.get('active_id')], {action.record_id.name:res_id})
-            
+
             if action.state == 'object_copy':
                 res = {}
                 for exp in action.fields_lines:
@@ -701,7 +701,7 @@ class actions_server(osv.osv):
 
                 obj_pool = None
                 res_id = False
-                
+
                 model = action.copy_object.split(',')[0]
                 cid = action.copy_object.split(',')[1]
                 obj_pool = self.pool.get(model)
@@ -736,6 +736,7 @@ class ir_actions_todo(osv.osv):
         'state': fields.selection(TODO_STATES, string='State', required=True),
         'name':fields.char('Name', size=64),
         'restart': fields.selection([('onskip','On Skip'),('always','Always'),('never','Never')],'Restart',required=True),
+        'groups_id':fields.many2many('res.groups', 'res_groups_action_rel', 'uid', 'gid', 'Groups'),
         'note':fields.text('Text', translate=True),
     }
     _defaults={
diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index 68a5a383cbb..9899830a4f3 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -58,8 +58,18 @@ class res_config_configurable(osv.osv_memory):
                                   'getting next %s' % todos)
         active_todos = todos.search(cr, uid, [('state','=','open')],
                                     limit=1)
+        dont_skip_todo = True
         if active_todos:
-            return todos.browse(cr, uid, active_todos[0], context=None)
+            todo_obj = todos.browse(cr, uid, active_todos[0], context=None)
+            todo_groups = map(lambda x:x.id, todo_obj.groups_id)
+            if todo_groups:
+                cr.execute("select 1 from res_groups_users_rel where uid=%s and gid=ANY(%s)",(uid, todo_groups,))
+                dont_skip_todo = bool(cr.fetchone())
+            if dont_skip_todo:
+                return todos.browse(cr, uid, active_todos[0], context=None)
+            else:
+                todos.write(cr, uid, active_todos[0], {'state':'skip'}, context=None)
+                return self._next_action(cr, uid)
         return None
 
     def _set_previous_todo(self, cr, uid, state):

From f10e9aeca26fb5a74c233bcd6b5c6d4ec889fe53 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 28 Apr 2010 12:58:52 +0530
Subject: [PATCH 23/84] [Fix]purchase_requisition: set the state name

bzr revid: sbh@tinyerp.com-20100428072852-elcecv2uxjbxlnxv
---
 addons/purchase_requisition/purchase_requisition.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 8e4b4bc194c..14ff085a4c4 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -122,7 +122,7 @@ class purchase_order(osv.osv):
                     if order.id<>po.id:
                         wf_service = netsvc.LocalService("workflow")
                         wf_service.trg_validate(uid, 'purchase.order', order.id, 'purchase_cancel', cr)
-                    self.pool.get('purchase.requisition').write(cr, uid, [po.requisition_id.id], {'state':'close','date_end':time.strftime('%Y-%m-%d %H:%M:%S')})
+                    self.pool.get('purchase.requisition').write(cr, uid, [po.requisition_id.id], {'state':'done','date_end':time.strftime('%Y-%m-%d %H:%M:%S')})
 
         return res
 

From 6ee58526f89ba902329c9fff580abbecec4461a0 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Wed, 28 Apr 2010 14:41:14 +0530
Subject: [PATCH 24/84] [IMP] mrp, stock: Task ID-575: MRP Improvement.(1) Add
 a checkbox on stock.location 'Scrap'. (2) In the scrap Moves wizard in
 mrp.production: add a domain to filter on scrap location for destination
 locations, replace the scraped field on a stock.move by a related field to
 the scraped checkbox on the destination location, set a default location wich
 is the location having a scrap checkbox on

bzr revid: uco@tinyerp.co.in-20100428091114-w2gfucg8yh6vrlis
---
 addons/mrp/stock.py                     | 5 +++++
 addons/stock/stock.py                   | 2 ++
 addons/stock/stock_view.xml             | 1 +
 addons/stock/wizard/stock_move.py       | 7 ++++++-
 addons/stock/wizard/stock_move_view.xml | 2 +-
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 21cfac88242..13419d73959 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -101,6 +101,7 @@ class StockMove(osv.osv):
     _columns = {
         'production_id': fields.many2one('mrp.production', 'Production', select=True),
         'procurements': fields.one2many('mrp.procurement', 'move_id', 'Procurements'),
+        'scraped': fields.related('location_dest_id','scraped',type='boolean',relation='stock.location',string='Scraped'),
     }
     
     def copy(self, cr, uid, id, default=None, context=None):
@@ -204,6 +205,10 @@ class StockMove(osv.osv):
         """  
         res = []
         production_obj = self.pool.get('mrp.production')
+        location_obj = self.pool.get('stock.location')
+        location = location_obj.browse(cr, uid, location_id)
+        if not location.scraped:
+            raise osv.except_osv(_('Warning !'),_('Please select scraped location.')) 
         wf_service = netsvc.LocalService("workflow")
         for move in self.browse(cr, uid, ids):
             new_moves = super(StockMove, self).action_scrap(cr, uid, [move.id], product_qty, location_id, context=context)
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index d28effc83c0..4b331dd2562 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -182,6 +182,7 @@ class stock_location(osv.osv):
         'stock_real_value': fields.function(_product_value, method=True, type='float', string='Real Stock Value', multi="stock"),
         'stock_virtual_value': fields.function(_product_value, method=True, type='float', string='Virtual Stock Value', multi="stock"),
         'company_id': fields.many2one('res.company', 'Company', required=True,select=1),
+        'scraped': fields.boolean('Scraped'),
     }
     _defaults = {
         'active': lambda *a: 1,
@@ -194,6 +195,7 @@ class stock_location(osv.osv):
         'posy': lambda *a: 0,
         'posz': lambda *a: 0,
         'icon': lambda *a: False,
+        'scraped': lambda *a: False,
     }
 
     def chained_location_get(self, cr, uid, location, partner=None, product=None, context={}):
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ee0dfa9cd13..45b95779660 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -404,6 +404,7 @@
                     <field name="location_id"/>
                     <field name="address_id" context="{'contact_display':'partner'}"/>
                     <field name="icon"/>
+                    <field name="scraped"/>
                     <newline/>
                     <group col="2" colspan="2" groups="base.group_extended">
                         <separator string="Chained Locations" colspan="2"/>
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 500b0bdc372..95f1ab72f9f 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -81,6 +81,8 @@ class stock_move_consume(osv.osv_memory):
         """
         res = super(stock_move_consume, self).default_get(cr, uid, fields, context=context)        
         move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
+        location_obj = self.pool.get('stock.location')
+        scrpaed_location_ids = location_obj.search(cr, uid, [('scraped','=',True)])
         if 'product_id' in fields:
             res.update({'product_id': move.product_id.id})     
         if 'product_uom' in fields:
@@ -88,7 +90,10 @@ class stock_move_consume(osv.osv_memory):
         if 'product_qty' in fields:
             res.update({'product_qty': move.product_qty})    
         if 'location_id' in fields:
-            res.update({'location_id': move.location_id.id})
+            if scrpaed_location_ids:
+                res.update({'location_id': scrpaed_location_ids[0]})
+            else:
+                res.update({'location_id': False})
         return res   
             
     def do_move_consume(self, cr, uid, ids, context={}):
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 55fc8a6d8a7..310702392f3 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -73,7 +73,7 @@
                 <form string="Scrap Move">
                 	<separator string="Scrap Products" colspan="4"/>
 				    <field name="product_id" colspan="4" readonly="1"/>
-				    <field name="location_id" colspan="4" string="Dest. Location" domain="[('usage','&lt;&gt;','view')]"/>
+				    <field name="location_id" colspan="4" string="Dest. Location" domain="[('usage','&lt;&gt;','view'),('scraped','=',True)]"/>
 				    <field name="product_qty" colspan="2"/>
 				    <field name="product_uom" nolabel="1" readonly="1"/>
                 	<newline/>

From e7fd6c656d596e1a9280ba0daef0b3fdcadd16eb Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 28 Apr 2010 15:17:46 +0530
Subject: [PATCH 25/84] Task 617:purchase_requisition Create a test case

bzr revid: sbh@tinyerp.com-20100428094746-t6hqk6cfid80v7zl
---
 addons/purchase_requisition/__openerp__.py    |   3 +-
 .../purchase_requisition_exclusive_test.yml   |  93 +++++++++++++++
 .../test/purchase_requisition_test.yml        | 110 ++++++++++++++++++
 3 files changed, 205 insertions(+), 1 deletion(-)
 create mode 100644 addons/purchase_requisition/test/purchase_requisition_exclusive_test.yml
 create mode 100644 addons/purchase_requisition/test/purchase_requisition_test.yml

diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index c5a9435379c..2e2a5ea8ed3 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -34,7 +34,8 @@
     "update_xml" : ["wizard/purchase_requisition_partner_view.xml",
                     "purchase_requisition_view.xml",
                     "security/ir.model.access.csv","purchase_requisition_sequence.xml"],
-
+     "test":['test/purchase_requisition_test.yml',
+                'test/purchase_requisition_exclusive_test.yml'],                    
     "active": False,
     "installable": True
 }
diff --git a/addons/purchase_requisition/test/purchase_requisition_exclusive_test.yml b/addons/purchase_requisition/test/purchase_requisition_exclusive_test.yml
new file mode 100644
index 00000000000..55b7cd44640
--- /dev/null
+++ b/addons/purchase_requisition/test/purchase_requisition_exclusive_test.yml
@@ -0,0 +1,93 @@
+-
+  In order to test the purchase requicisition module, I will do a sale order -> purchase_requisition ->
+  purchase flow and I will buy the required products at two different suppliers.
+-
+  I start by creating a new product 'Laptop ACER', which is purchased at Asustek, in MTO,
+  with the generation of purchase requisitions.
+- 
+  Creating an product.product record
+- 
+  !record {model: product.product, id: product_product_laptopacer0}:
+    categ_id: product.product_category_3
+    cost_method: standard
+    list_price: 1000.0
+    mes_type: fixed
+    name: Laptop ACER1
+    procure_method: make_to_order
+    purchase_requisition: 1
+    seller_ids:
+      - delay: 1
+        name: base.res_partner_asus
+        qty: 5.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit    
+- 
+  Creating an sale.order record
+- 
+  !record {model: sale.order, id: sale_order_testtender0}:
+    date_order: '2010-04-20'
+    invoice_quantity: order
+    name: TEST/TENDER/0002
+    order_line:
+      - name: Laptop ACER1
+        price_unit: 1000.0
+        product_uom: product.product_uom_unit
+        product_uom_qty: 5.0
+        state: draft
+        'delay': 7.0
+        'product_id': product_product_laptopacer0
+        'type': make_to_order
+    order_policy: manual
+    partner_id: base.res_partner_agrolait
+    partner_invoice_id: base.res_partner_address_8
+    partner_order_id: base.res_partner_address_8
+    partner_shipping_id: base.res_partner_address_8
+    picking_policy: direct
+    pricelist_id: product.list0
+    shop_id: sale.shop
+- 
+  Performing a workflow action order_confirm on module sale.order
+- 
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_testtender0}
+-
+  I launch he scheduler to compute all procurements, and planify all requisitions order  
+- 
+  !python {model: mrp.procurement.compute.all}: |
+    proc_obj = self.pool.get('mrp.procurement')
+    proc_obj._procure_confirm(cr,uid)
+
+-
+  Creating an purchase.requisition record
+-  
+  !record {model: purchase.requisition.partner, id: purchase_requisition_partner_1}:
+      partner_id: base.res_partner_4
+      partner_address_id: base.res_partner_address_7
+- 
+ !python {model: purchase.requisition}: |
+    requisition_obj = self.pool.get('purchase.requisition.partner')
+    req_obj = self.pool.get('purchase.requisition')
+    ids =req_obj.search(cr, uid, [('origin','=','TEST/TENDER/0002')])
+    requisition_obj.create_order(cr,uid, [ref('purchase_requisition_partner_1')],{'active_ids': ids})
+-    
+ !python {model: purchase.requisition}: |
+    purchase_obj = self.pool.get('purchase.order')
+    ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0002')])[0]
+    self.write(cr,uid,ids,{'exclusive': 'exclusive' })
+    ids =purchase_obj.search(cr, uid, [('requisition_id','in',[ids])])
+    assert (len(ids)<2),"Purchase Order  hasn't Created"
+-
+  I change the quantities so that the purchase order for DistriPC includes 3 pieces and the
+  purchase order for Asustek includes 2 pieces.    
+-
+ !python {model: purchase.order}: |
+    purchase_id= self.search(cr, uid, [('origin','=','TEST/TENDER/0002')])
+    order_line=self.browse(cr, uid, purchase_id, context)[0].order_line[0].id
+    self.pool.get('purchase.order.line').write(cr, uid, [order_line], {'product_qty':5})
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")  
+    if purchase_id:
+      wf_service.trg_validate(uid, 'purchase.order',purchase_id[0],'purchase_confirm', cr)
+      wf_service.trg_validate(uid, 'purchase.order',purchase_id[0],'purchase_approve', cr)     
+-
\ No newline at end of file
diff --git a/addons/purchase_requisition/test/purchase_requisition_test.yml b/addons/purchase_requisition/test/purchase_requisition_test.yml
new file mode 100644
index 00000000000..b494b9b0143
--- /dev/null
+++ b/addons/purchase_requisition/test/purchase_requisition_test.yml
@@ -0,0 +1,110 @@
+-
+  In order to test the purchase requicisition module, I will do a sale order -> purchase_requisition ->
+  purchase flow and I will buy the required products at two different suppliers.
+-
+  I start by creating a new product 'Laptop ACER', which is purchased at Asustek, in MTO,
+  with the generation of purchase requisitions.
+- 
+  Creating an product.product record
+- 
+  !record {model: product.product, id: product_product_laptopacer0}:
+    categ_id: product.product_category_3
+    cost_method: standard
+    list_price: 1000.0
+    mes_type: fixed
+    name: Laptop ACER
+    procure_method: make_to_order
+    purchase_requisition: 1
+    seller_ids:
+      - delay: 1
+        name: base.res_partner_asus
+        qty: 5.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit    
+- 
+  Creating an sale.order record
+- 
+  !record {model: sale.order, id: sale_order_so0}:
+    date_order: '2010-04-20'
+    invoice_quantity: order
+    name: TEST/TENDER/0001
+    order_line:
+      - name: Laptop ACER
+        price_unit: 1000.0
+        product_uom: product.product_uom_unit
+        product_uom_qty: 5.0
+        state: draft
+        'delay': 7.0
+        'product_id': product_product_laptopacer0
+        'type': make_to_order
+    order_policy: manual
+    partner_id: base.res_partner_agrolait
+    partner_invoice_id: base.res_partner_address_8
+    partner_order_id: base.res_partner_address_8
+    partner_shipping_id: base.res_partner_address_8
+    picking_policy: direct
+    pricelist_id: product.list0
+    shop_id: sale.shop
+- 
+  Performing a workflow action order_confirm on module sale.order
+- 
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so0}
+-
+  I launch he scheduler to compute all procurements, and planify all requisitions order  
+- 
+  !python {model: mrp.procurement.compute.all}: |
+    proc_obj = self.pool.get('mrp.procurement')
+    proc_obj._procure_confirm(cr,uid)
+
+-
+  Creating an purchase.requisition record
+-  
+  !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}:
+      partner_id: base.res_partner_4
+      partner_address_id: base.res_partner_address_7
+- 
+ !python {model: purchase.requisition}: |
+    requisition_obj = self.pool.get('purchase.requisition.partner')
+    req_obj = self.pool.get('purchase.requisition')
+    ids =req_obj.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
+    requisition_obj.create_order(cr,uid, [ref('purchase_requisition_partner_0')],{'active_ids': ids})
+-    
+ !python {model: purchase.requisition}: |
+    purchase_obj = self.pool.get('purchase.order')
+    requisition_ids= self.search(cr, uid, [],context)
+    ids =purchase_obj.search(cr, uid, [('requisition_id','in',requisition_ids)])
+    assert len(ids) < 2,"Purchase Order  hasn't Created"
+-
+  I change the quantities so that the purchase order for DistriPC includes 3 pieces and the
+  purchase order for Asustek includes 2 pieces.    
+- 
+  !python {model: purchase.order}: |
+    purchase_id1= self.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
+    purchase_id2= self.search(cr, uid, [('origin','=','TE00001')])
+    order_line1=self.browse(cr, uid, purchase_id1, context)[0].order_line[0].id
+    order_line2=self.browse(cr, uid, purchase_id2, context)[0].order_line[0].id    
+    self.pool.get('purchase.order.line').write(cr, uid, [order_line1], {'product_qty':2})
+    self.pool.get('purchase.order.line').write(cr, uid, [order_line2], {'product_qty':3})
+    todo=[]
+    todo.append(purchase_id1[0])
+    todo.append(purchase_id2[0])
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")
+    for ids in todo: 
+      wf_service.trg_validate(uid, 'purchase.order',ids,'purchase_confirm', cr)    
+      wf_service.trg_validate(uid, 'purchase.order',ids,'purchase_approve', cr)        
+-
+   !python {model: purchase.requisition}: | 
+     ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
+     self.tender_done(cr,uid,ids)  
+-     
+  I check that the delivery order of the customer is in state 'Waiting Goods'
+- 
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so0"))  
+    assert (so.picking_ids[0].state) =='confirmed',"Delivery Order not confirmed"
+    assert (so.picking_ids[0].move_lines[0].state=='waiting')
+-
+  I receive the order of the supplier Asustek from the Incoming Products menu

From a51e1755de97c7c2a5657038a242652465d80dc5 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Wed, 28 Apr 2010 16:02:02 +0530
Subject: [PATCH 26/84] [REF] stock: Task ID-575:Replaced scraped field on a
 stock.move by a related field in stock module.

bzr revid: uco@tinyerp.co.in-20100428103202-8ctirorhnytzctf6
---
 addons/mrp/stock.py               | 5 -----
 addons/stock/stock.py             | 3 +--
 addons/stock/wizard/stock_move.py | 7 +------
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 13419d73959..21cfac88242 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -101,7 +101,6 @@ class StockMove(osv.osv):
     _columns = {
         'production_id': fields.many2one('mrp.production', 'Production', select=True),
         'procurements': fields.one2many('mrp.procurement', 'move_id', 'Procurements'),
-        'scraped': fields.related('location_dest_id','scraped',type='boolean',relation='stock.location',string='Scraped'),
     }
     
     def copy(self, cr, uid, id, default=None, context=None):
@@ -205,10 +204,6 @@ class StockMove(osv.osv):
         """  
         res = []
         production_obj = self.pool.get('mrp.production')
-        location_obj = self.pool.get('stock.location')
-        location = location_obj.browse(cr, uid, location_id)
-        if not location.scraped:
-            raise osv.except_osv(_('Warning !'),_('Please select scraped location.')) 
         wf_service = netsvc.LocalService("workflow")
         for move in self.browse(cr, uid, ids):
             new_moves = super(StockMove, self).action_scrap(cr, uid, [move.id], product_qty, location_id, context=context)
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 4b331dd2562..9d1a1d46d29 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1214,7 +1214,7 @@ class stock_move(osv.osv):
         'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin"),
         'move_stock_return_history': fields.many2many('stock.move', 'stock_move_return_history', 'move_id', 'return_move_id', 'Move Return History',readonly=True),
         'delivered_id': fields.many2one('stock.delivery', 'Product delivered'),
-        'scraped': fields.boolean('Scraped'),
+        'scraped': fields.related('location_dest_id','scraped',type='boolean',relation='stock.location',string='Scraped'),
     }
     _constraints = [
         (_check_tracking,
@@ -1251,7 +1251,6 @@ class stock_move(osv.osv):
         'location_dest_id': _default_location_destination,
         'state': lambda *a: 'draft',
         'priority': lambda *a: '1',
-        'scraped' : lambda *a:False,
         'product_qty': lambda *a: 1.0,
         'date_planned': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 95f1ab72f9f..500b0bdc372 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -81,8 +81,6 @@ class stock_move_consume(osv.osv_memory):
         """
         res = super(stock_move_consume, self).default_get(cr, uid, fields, context=context)        
         move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
-        location_obj = self.pool.get('stock.location')
-        scrpaed_location_ids = location_obj.search(cr, uid, [('scraped','=',True)])
         if 'product_id' in fields:
             res.update({'product_id': move.product_id.id})     
         if 'product_uom' in fields:
@@ -90,10 +88,7 @@ class stock_move_consume(osv.osv_memory):
         if 'product_qty' in fields:
             res.update({'product_qty': move.product_qty})    
         if 'location_id' in fields:
-            if scrpaed_location_ids:
-                res.update({'location_id': scrpaed_location_ids[0]})
-            else:
-                res.update({'location_id': False})
+            res.update({'location_id': move.location_id.id})
         return res   
             
     def do_move_consume(self, cr, uid, ids, context={}):

From 3056fa907b531d794e6c6e3b7d9f60fa451dacf5 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Thu, 29 Apr 2010 14:09:44 +0530
Subject: [PATCH 27/84] [FIX]:added rowspan for vertical separator

bzr revid: nch@tinyerp.com-20100429083944-xdjjobq7f41o7r7h
---
 bin/addons/base/rng/view.rng | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/addons/base/rng/view.rng b/bin/addons/base/rng/view.rng
index d822ed3c4ac..5a489a55936 100644
--- a/bin/addons/base/rng/view.rng
+++ b/bin/addons/base/rng/view.rng
@@ -280,6 +280,7 @@
     <rng:define name="separator">
         <rng:element name="separator">
             <rng:optional><rng:attribute name="colspan"/></rng:optional>
+            <rng:optional><rng:attribute name="rowspan"/></rng:optional>
             <rng:optional><rng:attribute name="string"/></rng:optional>
             <rng:optional><rng:attribute name="col"/></rng:optional>
             <rng:optional><rng:attribute name="select"/></rng:optional>

From 7151076eeea180cc1dda9a8a8681cc5ff128dd9e Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Thu, 29 Apr 2010 14:13:00 +0530
Subject: [PATCH 28/84] [IMP]:change the template for config wizards and
 installer wizards

bzr revid: nch@tinyerp.com-20100429084300-q49ni93828ha8b48
---
 bin/addons/base/base_update.xml    | 28 ++++++++--------
 bin/addons/base/res/res_config.xml | 54 +++++++++++++++++++-----------
 2 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 542434d4be6..41797f756f5 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -282,21 +282,21 @@
                 <form position="attributes">
                   <attribute name="string">Choose Your Interface</attribute>
                 </form>
-
-                <group string="res_config_contents" position="replace">
-                	<group colspan="4">
-		            	<group colspan="1">
-		            	    <image name="gtk-dialog-info"/>
-			              	<label colspan="4" align="0.0" string="Choose between the simplified interface and the extended one."/>
-		              		<label colspan="4" align="0.0" string="If you are testing OpenERP or using it for the first time, we suggest you use the simplified interface. It has less options and fields but is easier to understand."/>
-		              		<label colspan="4" align="0.0" string="You will be able to switch to the extended interface later."/>
-		              	</group>
-		              	<group colspan="3">
-		              		<separator string="Choose Your Interface" colspan="4"/>
-		              		<field colspan="4" name="view" nolabel="1"/>
-						</group>
+				<xpath expr="//label[@string='description']"
+	                 position="attributes">
+	            <attribute name="string">Choose between the simplified interface and the extended one.If you are testing OpenERP or using it for the first time, we suggest you use the simplified interface. It has less options and fields but is easier to understand.You will be able to switch to the extended interface later.</attribute>
+	          </xpath>
+	          <xpath expr='//separator[@string="title"]' position='attributes'>
+	          	  <attribute name='string'>Choose Your Interface</attribute>
+	          </xpath>
+	          <xpath expr='//separator[@string="vsep"]' position='attributes'>
+	          	  <attribute name='string'></attribute>
+		      </xpath>
+               <group string="res_config_contents" position="replace">
+	              	<group colspan="5">
+	              		<field colspan="5" name="view" nolabel="1"/>
 					</group>
-                </group>
+            	</group>
                 <xpath expr='//button[@name="action_skip"]' position='replace'/>
                 <xpath expr='//button[@name="action_next"]' position='attributes'>
                   <attribute name='string'>Set</attribute>
diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index 11d753018c2..ca00a4944d2 100644
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -5,22 +5,30 @@
       <field name="model">res.config</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form>
-          <group string="res_config_contents">
-          </group>
-          <separator string="" colspan="4"/>
-          <group colspan="4" col="8">
-            <field name="progress" widget="progressbar"/>
-            <label string="" colspan="3"/>
-            <group colspan="1" col="2">
-              <button name="action_skip" icon="gtk-goto-last" special="cancel"
-                      type="object" string="Skip"/>
-            </group>
-            <group colspan="1" col="2">
-              <button name="action_next" icon="gtk-go-forward"
-                      type="object" string="Next"/>
-            </group>
-          </group>
+       <form>
+        	<group colspan="4" col="12">
+              	<group colspan="4">
+                	<image name="gtk-dialog-info"/>
+                	<newline/>
+                	<label align="0.0" string="description" width="200" colspan="4"/>
+              	</group>
+              	<group colspan="1">
+              		<separator string="vsep" position="vertical" colspan="1" rowspan="12"/>
+            	</group>
+            	<group>
+              		<separator string="title" colspan="4"/>
+              		<group string="res_config_contents"/>
+            	</group>
+           </group>
+           <group colspan="4" col="8">
+           		<separator string="" colspan="8"/>
+       			<field name="progress" widget="progressbar" colspan= "1" nolabel="1"/>
+	 	 		<label string="" colspan="2"/>
+	 	 		<button name="action_skip" icon="gtk-goto-last" special="cancel"
+                    	type="object" string="Skip" colspan="1"/>
+                <button name="action_next" icon="gtk-go-forward"
+                	 type="object" string="Next" colspan="1"/>
+	        </group>
         </form>
       </field>
     </record>
@@ -55,18 +63,24 @@
 
         <form>
           <group colspan="4">
-            <separator string="title" colspan="4"/>
-            <group colspan="4" col="10">
+
+            <group colspan="4" col="12">
               <group colspan="2">
                 <image name="gtk-dialog-info"/>
                 <newline/>
                 <label align="0.0" string="description" width="200"/>
               </group>
-              <group colspan="8"/>
+              <group colspan="2">
+          		<separator string="vsep" position="vertical" colspan="1" rowspan="12"/>
+	          </group>
+              <group>
+              	<separator string="title" colspan="4"/>
+              	 <group colspan="8" />
+              	</group>
             </group>
           </group>
-          <separator string="" colspan="4"/>
           <group colspan="4" col="8">
+          	<separator string="" colspan="8"/>
             <field name="progress" widget="progressbar"/>
             <label string="" colspan="3"/>
             <group colspan="1" col="2">

From 0479ed81bce80e1ac29ccf78fbf678f6ec59393b Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Thu, 29 Apr 2010 19:00:07 +0530
Subject: [PATCH 29/84] [ADD] mrp, mrp_procurement: Task ID-574: Remove
 mrp.procurement from the MRP module. Separated mrp.procurment object into new
 module mrp_procurement.

bzr revid: uco@tinyerp.co.in-20100429133007-ut53koctlffi8g2a
---
 .../board_manufacturing_view.xml              |   2 +-
 .../board_warehouse/board_warehouse_view.xml  |   2 +-
 addons/mrp/__init__.py                        |   3 +-
 addons/mrp/__openerp__.py                     |   7 +-
 addons/mrp/company.py                         |  12 -
 addons/mrp/company_view.xml                   |   5 -
 addons/mrp/mrp.py                             | 543 ------------------
 addons/mrp/mrp_data.xml                       |  13 -
 addons/mrp/mrp_procurement.py                 |  93 +++
 addons/mrp/mrp_view.xml                       | 348 +----------
 addons/mrp/mrp_workflow.xml                   | 227 +-------
 addons/mrp/process/procurement_process.xml    | 104 ++--
 .../mrp/process/service_product_process.xml   |   4 +-
 .../mrp/process/stockable_product_process.xml |   4 +-
 addons/mrp/security/ir.model.access.csv       |   9 -
 addons/mrp/security/mrp_security.xml          |  27 +-
 addons/mrp/stock.py                           |  68 ---
 addons/mrp/test/mrp_phantom_bom.yml           | 228 ++++++++
 addons/mrp/wizard/__init__.py                 |   4 -
 addons/mrp_procurement/__init__.py            |  25 +
 addons/mrp_procurement/__openerp__.py         |  52 ++
 addons/mrp_procurement/company.py             |  38 ++
 addons/mrp_procurement/company_view.xml       |  19 +
 addons/mrp_procurement/mrp_procurement.py     | 527 +++++++++++++++++
 .../mrp_procurement/mrp_procurement_data.xml  |  19 +
 .../mrp_procurement/mrp_procurement_view.xml  | 342 +++++++++++
 .../mrp_procurement_workflow.xml              | 196 +++++++
 .../process/procurement_process.xml           |  31 +
 addons/{mrp => mrp_procurement}/schedulers.py |   1 +
 .../security/ir.model.access.csv              |   9 +
 .../security/mrp_procurement_security.xml     |  32 ++
 addons/mrp_procurement/wizard/__init__.py     |  27 +
 .../wizard/make_procurement_product.py        |   4 +-
 .../wizard/make_procurement_view.xml          |   0
 .../wizard/mrp_procurement.py                 |   0
 .../wizard/mrp_procurement_view.xml           |   0
 .../wizard/orderpoint_procurement.py          |   0
 .../wizard/orderpoint_procurement_view.xml    |   0
 .../wizard/schedulers_all.py                  |   0
 .../wizard/schedulers_all_view.xml            |   4 +-
 addons/point_of_sale/posrule_data.xml         |   6 +-
 addons/product/partner_view.xml               |   2 +-
 addons/purchase/__init__.py                   |   1 +
 addons/purchase/__openerp__.py                |   3 +-
 addons/purchase/company.py                    |  36 ++
 addons/purchase/company_view.xml              |  18 +
 addons/purchase/partner_view.xml              |  14 +-
 addons/purchase/purchase.py                   |  82 +++
 addons/purchase/purchase_view.xml             |  17 +-
 addons/purchase/purchase_workflow.xml         |  21 +
 addons/sale/__init__.py                       |   3 +-
 addons/sale/__openerp__.py                    |   3 +-
 addons/sale/company.py                        |  37 ++
 addons/sale/company_view.xml                  |  18 +
 addons/sale/process/sale_process.xml          |  10 +-
 addons/sale/sale_demo.xml                     |  10 +
 addons/sale/sale_view.xml                     |  10 +-
 addons/sale/security/ir.model.access.csv      |   5 +-
 addons/stock/stock_demo.xml                   |   4 -
 59 files changed, 1992 insertions(+), 1337 deletions(-)
 create mode 100644 addons/mrp/mrp_procurement.py
 create mode 100644 addons/mrp/test/mrp_phantom_bom.yml
 create mode 100644 addons/mrp_procurement/__init__.py
 create mode 100644 addons/mrp_procurement/__openerp__.py
 create mode 100644 addons/mrp_procurement/company.py
 create mode 100644 addons/mrp_procurement/company_view.xml
 create mode 100644 addons/mrp_procurement/mrp_procurement.py
 create mode 100644 addons/mrp_procurement/mrp_procurement_data.xml
 create mode 100644 addons/mrp_procurement/mrp_procurement_view.xml
 create mode 100644 addons/mrp_procurement/mrp_procurement_workflow.xml
 create mode 100644 addons/mrp_procurement/process/procurement_process.xml
 rename addons/{mrp => mrp_procurement}/schedulers.py (99%)
 create mode 100644 addons/mrp_procurement/security/ir.model.access.csv
 create mode 100644 addons/mrp_procurement/security/mrp_procurement_security.xml
 create mode 100644 addons/mrp_procurement/wizard/__init__.py
 rename addons/{mrp => mrp_procurement}/wizard/make_procurement_product.py (96%)
 rename addons/{mrp => mrp_procurement}/wizard/make_procurement_view.xml (100%)
 rename addons/{mrp => mrp_procurement}/wizard/mrp_procurement.py (100%)
 rename addons/{mrp => mrp_procurement}/wizard/mrp_procurement_view.xml (100%)
 rename addons/{mrp => mrp_procurement}/wizard/orderpoint_procurement.py (100%)
 rename addons/{mrp => mrp_procurement}/wizard/orderpoint_procurement_view.xml (100%)
 rename addons/{mrp => mrp_procurement}/wizard/schedulers_all.py (100%)
 rename addons/{mrp => mrp_procurement}/wizard/schedulers_all_view.xml (92%)
 create mode 100644 addons/purchase/company.py
 create mode 100644 addons/purchase/company_view.xml
 create mode 100644 addons/sale/company.py
 create mode 100644 addons/sale/company_view.xml

diff --git a/addons/board_manufacturing/board_manufacturing_view.xml b/addons/board_manufacturing/board_manufacturing_view.xml
index 17b4bc486bc..191f1818612 100644
--- a/addons/board_manufacturing/board_manufacturing_view.xml
+++ b/addons/board_manufacturing/board_manufacturing_view.xml
@@ -15,7 +15,7 @@
                         <child1>
                             <action colspan="4" height="200" name="%(mrp.mrp_production_action2)d" string="Next production orders" width="510"/>
                             <action colspan="4" name="%(stock.action_picking_all)d" string="Deliveries (Out picking)" domain="[('state','=','assigned'),('type','=','out')]"/>
-                            <action colspan="4" name="%(mrp.mrp_procurement_action4)d" string="Procurements in Exception"/>
+                            <action colspan="4" name="%(mrp_procurement.mrp_procurement_action4)d" string="Procurements in Exception"/>
                         </child1>
 
 
diff --git a/addons/board_warehouse/board_warehouse_view.xml b/addons/board_warehouse/board_warehouse_view.xml
index cdc93d9a274..af797401935 100644
--- a/addons/board_warehouse/board_warehouse_view.xml
+++ b/addons/board_warehouse/board_warehouse_view.xml
@@ -23,7 +23,7 @@
                 <form string="Warehouse board">
                     <hpaned position="100">
                         <child1>
-					    	<action colspan="4" name="%(mrp.mrp_procurement_action5)d" string="Procurement Exceptions" width="510" />
+					    	<action colspan="4" name="%(mrp_procurement.mrp_procurement_action5)d" string="Procurement Exceptions" width="510" />
 					    	<action colspan="4" name="%(action_reception_picking_move_board)d" string="Products To Receive" />
                         </child1>
 
diff --git a/addons/mrp/__init__.py b/addons/mrp/__init__.py
index 39d97d0ba11..d23cee8d565 100644
--- a/addons/mrp/__init__.py
+++ b/addons/mrp/__init__.py
@@ -26,5 +26,6 @@ import installer
 import wizard
 import report
 import company
-import schedulers
+import mrp_procurement
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index a69e8ce4025..43e0eb3af8d 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -26,7 +26,7 @@
     "author" : "Tiny",
     "website" : "http://www.openerp.com",
     "category" : "Generic Modules/Production",
-    "depends" : ["stock", "resource", "purchase", "product","process"],
+    "depends" : ["mrp_procurement", "stock", "resource", "purchase", "product","process"],
     "description": """
     This is the base module to manage the manufacturing process in Open ERP.
 
@@ -61,15 +61,11 @@
         'mrp_workflow.xml',
         'mrp_data.xml',
         'wizard/mrp_product_produce_view.xml',
-        'wizard/make_procurement_view.xml',
-        'wizard/mrp_procurement_view.xml',
         'wizard/change_production_qty_view.xml',
-        'wizard/orderpoint_procurement_view.xml',
         'wizard/mrp_price_view.xml',
         'wizard/mrp_workcenter_load_view.xml',
 #        'wizard/mrp_track_prod_view.xml',
         'mrp_view.xml',
-        'wizard/schedulers_all_view.xml',
         'mrp_wizard.xml',
         'mrp_report.xml',
         'company_view.xml',
@@ -81,6 +77,7 @@
         'report/mrp_production_order_view.xml',
     ],
     'demo_xml': ['mrp_demo.xml', 'mrp_order_point.xml'],
+#    'test': ['test/mrp_phantom_bom.yml'],
     'installable': True,
     'active': False,
     'certificate': '0032052481373',
diff --git a/addons/mrp/company.py b/addons/mrp/company.py
index 1844fff47eb..22acf4fc5dd 100644
--- a/addons/mrp/company.py
+++ b/addons/mrp/company.py
@@ -24,22 +24,10 @@ from osv import osv,fields
 class company(osv.osv):
     _inherit = 'res.company'
     _columns = {
-        'schedule_range': fields.float('Scheduler Range', required=True,
-            help="This is the time frame analysed by the scheduler when "\
-            "computing procurements. All procurements that are not between "\
-            "today and today+range are skipped for futur computation."),
-        'po_lead': fields.float('Purchase Lead Time', required=True,
-            help="This is the leads/security time for each purchase order."),
-        'security_lead': fields.float('Security Days', required=True,
-            help="This is the days added to what you promise to customers "\
-            "for security purpose"),
         'manufacturing_lead': fields.float('Manufacturing Lead Time', required=True,
             help="Security days for each manufacturing operation."),
     }
     _defaults = {
-        'schedule_range': lambda *a: 80.0,
-        'po_lead': lambda *a: 1.0,
-        'security_lead': lambda *a: 5.0,
         'manufacturing_lead': lambda *a: 1.0,
     }
 company()
diff --git a/addons/mrp/company_view.xml b/addons/mrp/company_view.xml
index 1975bf5bb72..e94324f8195 100644
--- a/addons/mrp/company_view.xml
+++ b/addons/mrp/company_view.xml
@@ -9,12 +9,7 @@
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
                 <page string="Configuration" position="inside">
-                    <separator string="MRP &amp; Logistic Scheduler" colspan="4"/>
-                    <field name="schedule_range"/>
-                    <field name="po_lead"/>
-                    <field name="security_lead"/>
                     <field name="manufacturing_lead"/>
-                    <newline/>
                 </page>
             </field>
         </record>
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 675c4a73bb0..d5cea81933b 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -64,35 +64,6 @@ class mrp_workcenter(osv.osv):
 mrp_workcenter()
 
 
-class mrp_property_group(osv.osv):
-    """
-    Group of mrp properties.
-    """
-    _name = 'mrp.property.group'
-    _description = 'Property Group'
-    _columns = {
-        'name': fields.char('Property Group', size=64, required=True),
-        'description': fields.text('Description'),
-    }
-mrp_property_group()
-
-class mrp_property(osv.osv):
-    """
-    Properties of mrp.
-    """
-    _name = 'mrp.property'
-    _description = 'Property'
-    _columns = {
-        'name': fields.char('Name', size=64, required=True),
-        'composition': fields.selection([('min','min'),('max','max'),('plus','plus')], 'Properties composition', required=True, help="Not used in computations, for information purpose only."),
-        'group_id': fields.many2one('mrp.property.group', 'Property Group', required=True),
-        'description': fields.text('Description'),
-    }
-    _defaults = {
-        'composition': lambda *a: 'min',
-    }
-mrp_property()
-
 class mrp_routing(osv.osv):
     """
     For specifying the routings of workcenters.
@@ -996,520 +967,6 @@ class mrp_production_product_line(osv.osv):
     }
 mrp_production_product_line()
 
-# ------------------------------------------------------------------
-# Procurement
-# ------------------------------------------------------------------
-#
-# Produce, Buy or Find products and place a move
-#     then wizard for picking lists & move
-#
-class mrp_procurement(osv.osv):
-    """
-    Procument Orders
-    """
-    _name = "mrp.procurement"
-    _description = "Procurement"
-    _order = 'priority,date_planned'
-    
-    _columns = {
-        'name': fields.char('Reason', size=64, required=True, help='Procurement name.'),
-        'origin': fields.char('Source Document', size=64,
-            help="Reference of the document that created this Procurement.\n"
-            "This is automatically completed by Open ERP."),
-        'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', required=True),
-        'date_planned': fields.datetime('Scheduled date', required=True),
-        'date_close': fields.datetime('Date Closed'),
-        'product_id': fields.many2one('product.product', 'Product', required=True, states={'draft':[('readonly',False)]}, readonly=True),
-        'product_qty': fields.float('Quantity', required=True, states={'draft':[('readonly',False)]}, readonly=True),
-        'product_uom': fields.many2one('product.uom', 'Product UoM', required=True, states={'draft':[('readonly',False)]}, readonly=True),
-        'product_uos_qty': fields.float('UoS Quantity', states={'draft':[('readonly',False)]}, readonly=True),
-        'product_uos': fields.many2one('product.uom', 'Product UoS', states={'draft':[('readonly',False)]}, readonly=True),
-        'move_id': fields.many2one('stock.move', 'Reservation', ondelete='set null'),
 
-        'bom_id': fields.many2one('mrp.bom', 'BoM', ondelete='cascade', select=True),
-
-        'close_move': fields.boolean('Close Move at end', required=True),
-        'location_id': fields.many2one('stock.location', 'Location', required=True, states={'draft':[('readonly',False)]}, readonly=True),
-        'procure_method': fields.selection([('make_to_stock','from stock'),('make_to_order','on order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]},
-            readonly=True, required=True, help="If you encode manually a Procurement, you probably want to use" \
-            " a make to order method."),
-
-        'purchase_id': fields.many2one('purchase.order', 'Purchase Order'),
-        'note': fields.text('Note'),
-
-        'property_ids': fields.many2many('mrp.property', 'mrp_procurement_property_rel', 'procurement_id','property_id', 'Properties'),
-
-        'message': fields.char('Latest error', size=64, help="Exception occurred while computing procurement orders."),
-        'state': fields.selection([
-            ('draft','Draft'),
-            ('confirmed','Confirmed'),
-            ('exception','Exception'),
-            ('running','Running'),
-            ('cancel','Cancel'),
-            ('ready','Ready'),
-            ('done','Done'),
-            ('waiting','Waiting')], 'State', required=True,
-            help='When a procurement is created the state is set to \'Draft\'.\n If the procurement is confirmed, the state is set to \'Confirmed\'.\
-            \nAfter confirming the state is set to \'Running\'.\n If any exception arises in the order then the state is set to \'Exception\'.\n Once the exception is removed the state becomes \'Ready\'.\n It is in \'Waiting\'. state when the procurement is waiting for another one to finish.'),
-        'note': fields.text('Note'),
-        'company_id': fields.many2one('res.company','Company',required=True),
-    }
-    _defaults = {
-        'state': lambda *a: 'draft',
-        'priority': lambda *a: '1',
-        'date_planned': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
-        'close_move': lambda *a: 0,
-        'procure_method': lambda *a: 'make_to_order',
-        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.procurement', context=c)
-    }
-
-    def unlink(self, cr, uid, ids, context=None):
-        procurements = self.read(cr, uid, ids, ['state'])
-        unlink_ids = []
-        for s in procurements:
-            if s['state'] in ['draft','cancel']:
-                unlink_ids.append(s['id'])
-            else:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Procurement Order(s) which are in %s State!' % s['state']))
-        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
-
-    def onchange_product_id(self, cr, uid, ids, product_id, context={}):
-        """ Finds UoM and UoS of changed product.
-        @param product_id: Changed id of product.
-        @return: Dictionary of values.
-        """
-        if product_id:
-            w = self.pool.get('product.product').browse(cr, uid, product_id, context)
-            v = {
-                'product_uom': w.uom_id.id,
-                'product_uos': w.uos_id and w.uos_id.id or w.uom_id.id
-            }
-            return {'value': v}
-        return {}
-
-    def check_product(self, cr, uid, ids):
-        """ Checks product type.
-        @return: True or False 
-        """
-        for procurement in self.browse(cr, uid, ids):
-            if procurement.product_id.type in ('product', 'consu'):
-                return True
-        return False
-
-    def check_move_cancel(self, cr, uid, ids, context={}):
-        """ Checks if move is cancelled or not.
-        @return: True or False. 
-        """
-        res = True
-        ok = False
-        for procurement in self.browse(cr, uid, ids, context):
-            if procurement.move_id:
-                ok = True
-                if not procurement.move_id.state == 'cancel':
-                    res = False
-        return res and ok
-
-    def check_move_done(self, cr, uid, ids, context={}):
-        """ Checks if move is done or not.
-        @return: True or False. 
-        """
-        res = True
-        for proc in self.browse(cr, uid, ids, context):
-            if proc.move_id:
-                if not proc.move_id.state == 'done':
-                    res = False
-        return res
-
-    #
-    # This method may be overrided by objects that override mrp.procurment
-    # for computing their own purpose
-    #
-    def _quantity_compute_get(self, cr, uid, proc, context={}):
-        """ Finds sold quantity of product.
-        @param proc: Current procurement.
-        @return: Quantity or False.
-        """
-        if proc.product_id.type == 'product':
-            if proc.move_id.product_uos:
-                return proc.move_id.product_uos_qty
-        return False
-
-    def _uom_compute_get(self, cr, uid, proc, context={}):
-        """ Finds UoS if product is Stockable Product. 
-        @param proc: Current procurement.
-        @return: UoS or False.
-        """
-        if proc.product_id.type == 'product':
-            if proc.move_id.product_uos:
-                return proc.move_id.product_uos.id
-        return False
-
-    #
-    # Return the quantity of product shipped/produced/served, wich may be
-    # different from the planned quantity
-    #
-    def quantity_get(self, cr, uid, id, context={}):
-        """ Finds quantity of product used in procurement.
-        @return: Quantity of product. 
-        """
-        proc = self.browse(cr, uid, id, context)
-        result = self._quantity_compute_get(cr, uid, proc, context)
-        if not result:
-            result = proc.product_qty
-        return result
-
-    def uom_get(self, cr, uid, id, context=None):
-        """ Finds UoM of product used in procurement.
-        @return: UoM of product. 
-        """
-        proc = self.browse(cr, uid, id, context)
-        result = self._uom_compute_get(cr, uid, proc, context)
-        if not result:
-            result = proc.product_uom.id
-        return result
-
-    def check_waiting(self, cr, uid, ids, context=[]):
-        """ Checks state of move.
-        @return: True or False 
-        """
-        for procurement in self.browse(cr, uid, ids, context=context):
-            if procurement.move_id and procurement.move_id.state == 'auto':
-                return True
-        return False
-
-    def check_produce_service(self, cr, uid, procurement, context=[]):
-        return True
-
-    def check_produce_product(self, cr, uid, procurement, context=[]):
-        """ Finds BoM of a product if not found writes exception message.
-        @param procurement: Current procurement.
-        @return: True or False.
-        """
-        properties = [x.id for x in procurement.property_ids]
-        bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, procurement.product_id.id, procurement.product_uom.id, properties)
-        if not bom_id:
-            cr.execute('update mrp_procurement set message=%s where id=%s', (_('No BoM defined for this product !'), procurement.id))
-            return False
-        return True
-
-    def check_make_to_stock(self, cr, uid, ids, context={}):
-        """ Checks product type.
-        @return: True or False 
-        """
-        ok = True
-        for procurement in self.browse(cr, uid, ids, context=context):
-            if procurement.product_id.type == 'service':
-                ok = ok and self._check_make_to_stock_service(cr, uid, procurement, context)
-            else:
-                ok = ok and self._check_make_to_stock_product(cr, uid, procurement, context)
-        return ok
-
-    def check_produce(self, cr, uid, ids, context={}):
-        """ Checks product type.
-        @return: True or Product Id.
-        """
-        res = True
-        user = self.pool.get('res.users').browse(cr, uid, uid)
-        for procurement in self.browse(cr, uid, ids):
-            if procurement.product_id.product_tmpl_id.supply_method <> 'produce':
-                if procurement.product_id.seller_ids:
-                    partner = procurement.product_id.seller_ids[0].name
-                    if user.company_id and user.company_id.partner_id:
-                        if partner.id == user.company_id.partner_id.id:
-                            return True
-                return False
-            if procurement.product_id.product_tmpl_id.type=='service':
-                res = res and self.check_produce_service(cr, uid, procurement, context)
-            else:
-                res = res and self.check_produce_product(cr, uid, procurement, context)
-            if not res:
-                return False
-        return res
-
-    def check_buy(self, cr, uid, ids):
-        """ Checks product type.
-        @return: True or Product Id.
-        """
-        user = self.pool.get('res.users').browse(cr, uid, uid)
-        partner_obj = self.pool.get('res.partner')
-        for procurement in self.browse(cr, uid, ids):
-            if procurement.product_id.product_tmpl_id.supply_method <> 'buy':
-                return False
-            if not procurement.product_id.seller_ids:
-                cr.execute('update mrp_procurement set message=%s where id=%s', (_('No supplier defined for this product !'), procurement.id))
-                return False
-            partner = procurement.product_id.seller_ids[0].name
-            if user.company_id and user.company_id.partner_id:
-                if partner.id == user.company_id.partner_id.id:
-                    return False
-            address_id = partner_obj.address_get(cr, uid, [partner.id], ['delivery'])['delivery']
-            if not address_id:
-                cr.execute('update mrp_procurement set message=%s where id=%s', (_('No address defined for the supplier'), procurement.id))
-                return False
-        return True
-
-    def test_cancel(self, cr, uid, ids):
-        """ Tests whether state of move is cancelled or not. 
-        @return: True or False
-        """
-        for record in self.browse(cr, uid, ids):
-            if record.move_id and record.move_id.state == 'cancel':
-                return True
-        return False
-
-    def action_confirm(self, cr, uid, ids, context={}):
-        """ Confirms procurement and writes exception message if any.
-        @return: True
-        """
-        move_obj = self.pool.get('stock.move')
-        for procurement in self.browse(cr, uid, ids):
-            if procurement.product_qty <= 0.00:
-                raise osv.except_osv(_('Data Insufficient !'), _('Please check the Quantity of Procurement Order(s), it should not be less than 1!'))
-            if procurement.product_id.type in ('product', 'consu'):
-                if not procurement.move_id:
-                    source = procurement.location_id.id
-                    if procurement.procure_method == 'make_to_order':
-                        source = procurement.product_id.product_tmpl_id.property_stock_procurement.id
-                    id = move_obj.create(cr, uid, {
-                        'name': 'PROC:' + procurement.name,
-                        'location_id': source,
-                        'location_dest_id': procurement.location_id.id,
-                        'product_id': procurement.product_id.id,
-                        'product_qty': procurement.product_qty,
-                        'product_uom': procurement.product_uom.id,
-                        'date_planned': procurement.date_planned,
-                        'state': 'confirmed',
-                        'company_id': procurement.company_id.id,
-                    })
-                    self.write(cr, uid, [procurement.id], {'move_id': id, 'close_move': 1})
-                else:
-                    # TODO: check this
-                    if procurement.procure_method == 'make_to_stock' and procurement.move_id.state in ('waiting',):
-                        id = move_obj.write(cr, uid, [procurement.move_id.id], {'state':'confirmed'})
-        self.write(cr, uid, ids, {'state': 'confirmed', 'message': ''})
-        return True
-
-    def action_move_assigned(self, cr, uid, ids, context={}):
-        """ Changes procurement state to Running and writes message.
-        @return: True 
-        """
-        self.write(cr, uid, ids, {'state': 'running', 'message': _('from stock: products assigned.')})
-        return True
-
-    def _check_make_to_stock_service(self, cr, uid, procurement, context={}):
-        return True
-
-    def _check_make_to_stock_product(self, cr, uid, procurement, context={}):
-        """ Checks procurement move state.
-        @param procurement: Current procurement.
-        @return: True or move id.
-        """
-        ok = True
-        if procurement.move_id:
-            id = procurement.move_id.id
-            if not (procurement.move_id.state in ('done','assigned','cancel')):
-                ok = ok and self.pool.get('stock.move').action_assign(cr, uid, [id])
-                cr.execute('select count(id) from stock_warehouse_orderpoint where product_id=%s', (procurement.product_id.id,))
-                if not cr.fetchone()[0]:
-                    cr.execute('update mrp_procurement set message=%s where id=%s', (_('from stock and no minimum orderpoint rule defined'), procurement.id))
-        return ok
-
-    def action_produce_assign_service(self, cr, uid, ids, context={}):
-        """ Changes procurement state to Running.
-        @return: True 
-        """
-        for procurement in self.browse(cr, uid, ids):
-            self.write(cr, uid, [procurement.id], {'state': 'running'})
-        return True
-
-    def action_produce_assign_product(self, cr, uid, ids, context={}):
-        """ This is action which call from workflow to assign production order to procurements
-        @return: True
-        """
-        res = self.make_mo(cr, uid, ids, context=context)
-        res = res.values()
-        return len(res) and res[0] or 0 #TO CHECK: why workflow is generated error if return not integer value
-
-    def make_mo(self, cr, uid, ids, context={}):
-        """ Make Manufecturing(production) order from procurement
-        @return: New created Production Orders procurement wise 
-        """
-        res = {}
-        company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
-        production_obj = self.pool.get('mrp.production')
-        move_obj = self.pool.get('stock.move')
-        wf_service = netsvc.LocalService("workflow")
-        for procurement in self.browse(cr, uid, ids):
-            res_id = procurement.move_id.id
-            loc_id = procurement.location_id.id
-            newdate = DateTime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S') - DateTime.RelativeDateTime(days=procurement.product_id.product_tmpl_id.produce_delay or 0.0)
-            newdate = newdate - DateTime.RelativeDateTime(days=company.manufacturing_lead)
-            produce_id = production_obj.create(cr, uid, {
-                'origin': procurement.origin,
-                'product_id': procurement.product_id.id,
-                'product_qty': procurement.product_qty,
-                'product_uom': procurement.product_uom.id,
-                'product_uos_qty': procurement.product_uos and procurement.product_uos_qty or False,
-                'product_uos': procurement.product_uos and procurement.product_uos.id or False,
-                'location_src_id': procurement.location_id.id,
-                'location_dest_id': procurement.location_id.id,
-                'bom_id': procurement.bom_id and procurement.bom_id.id or False,
-                'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
-                'move_prod_id': res_id,
-                'company_id': procurement.company_id.id,
-            })
-            res[procurement.id] = produce_id
-            self.write(cr, uid, [procurement.id], {'state': 'running'})
-            bom_result = production_obj.action_compute(cr, uid,
-                    [produce_id], properties=[x.id for x in procurement.property_ids])
-            wf_service.trg_validate(uid, 'mrp.production', produce_id, 'button_confirm', cr)
-            move_obj.write(cr, uid, [res_id],
-                    {'location_id': procurement.location_id.id})
-        return res
-    
-    def action_po_assign(self, cr, uid, ids, context={}):
-        """ This is action which call from workflow to assign purchase order to procuments
-        @return: True
-        """
-        res = self.make_po(cr, uid, ids, context=context)
-        res = res.values()
-        return len(res) and res[0] or 0 #TO CHECK: why workflow is generated error if return not integer value
-
-    def make_po(self, cr, uid, ids, context={}):
-        """ Make purchase order from procurement
-        @return: New created Purchase Orders procurement wise
-        """
-        res = {}
-        company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
-        partner_obj = self.pool.get('res.partner')
-        uom_obj = self.pool.get('product.uom')
-        pricelist_obj = self.pool.get('product.pricelist')
-        prod_obj = self.pool.get('product.product')
-        acc_pos_obj = self.pool.get('account.fiscal.position')
-        po_obj = self.pool.get('purchase.order')
-        for procurement in self.browse(cr, uid, ids):
-            res_id = procurement.move_id.id
-            partner = procurement.product_id.seller_ids[0].name
-            partner_id = partner.id
-            address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
-            pricelist_id = partner.property_product_pricelist_purchase.id
-
-            uom_id = procurement.product_id.uom_po_id.id
-
-            qty = uom_obj._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, uom_id)
-            if procurement.product_id.seller_ids[0].qty:
-                qty = max(qty,procurement.product_id.seller_ids[0].qty)
-
-            price = pricelist_obj.price_get(cr, uid, [pricelist_id], procurement.product_id.id, qty, False, {'uom': uom_id})[pricelist_id]
-
-            newdate = DateTime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S')
-            newdate = newdate - DateTime.RelativeDateTime(days=company.po_lead)
-            newdate = newdate - procurement.product_id.seller_ids[0].delay
-
-            #Passing partner_id to context for purchase order line integrity of Line name
-            context.update({'lang': partner.lang, 'partner_id': partner_id})
-
-            product = prod_obj.browse(cr, uid, procurement.product_id.id, context=context)
-
-            line = {
-                'name': product.partner_ref,
-                'product_qty': qty,
-                'product_id': procurement.product_id.id,
-                'product_uom': uom_id,
-                'price_unit': price,
-                'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
-                'move_dest_id': res_id,
-                'notes': product.description_purchase,
-            }
-
-            taxes_ids = procurement.product_id.product_tmpl_id.supplier_taxes_id
-            taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids)
-            line.update({
-                'taxes_id': [(6,0,taxes)]
-            })
-            purchase_id = po_obj.create(cr, uid, {
-                'origin': procurement.origin,
-                'partner_id': partner_id,
-                'partner_address_id': address_id,
-                'location_id': procurement.location_id.id,
-                'pricelist_id': pricelist_id,
-                'order_line': [(0,0,line)],
-                'company_id': procurement.company_id.id,
-                'fiscal_position': partner.property_account_position and partner.property_account_position.id or False
-            })
-            res[procurement.id] = purchase_id
-            self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': purchase_id})
-        return res
-
-    def action_cancel(self, cr, uid, ids):
-        """ Cancels procurement and writes move state to Assigned.
-        @return: True 
-        """
-        todo = []
-        todo2 = []
-        move_obj = self.pool.get('stock.move')
-        for proc in self.browse(cr, uid, ids):
-            if proc.close_move:
-                if proc.move_id.state not in ('done', 'cancel'):
-                    todo2.append(proc.move_id.id)
-            else:
-                if proc.move_id and proc.move_id.state == 'waiting':
-                    todo.append(proc.move_id.id)
-        if len(todo2):
-            move_obj.action_cancel(cr, uid, todo2)
-        if len(todo):
-            move_obj.write(cr, uid, todo, {'state': 'assigned'})
-        self.write(cr, uid, ids, {'state': 'cancel'})
-        wf_service = netsvc.LocalService("workflow")
-        for id in ids:
-            wf_service.trg_trigger(uid, 'mrp.procurement', id, cr)
-        return True
-
-    def action_check_finnished(self, cr, uid, ids):
-        return self.check_move_done(cr, uid, ids)
-
-    def action_check(self, cr, uid, ids):
-        """ Checks procurement move state whether assigned or done. 
-        @return: True 
-        """
-        ok = False
-        for procurement in self.browse(cr, uid, ids):
-            if procurement.move_id.state == 'assigned' or procurement.move_id.state == 'done':
-                self.action_done(cr, uid, [procurement.id])
-                ok = True
-        return ok
-
-    def action_ready(self, cr, uid, ids):
-        """ Changes procurement state to Ready.
-        @return: True 
-        """
-        res = self.write(cr, uid, ids, {'state': 'ready'})
-        return res
-
-    def action_done(self, cr, uid, ids):
-        """ Changes procurement state to Done and writes Closed date.
-        @return: True 
-        """
-        move_obj = self.pool.get('stock.move')
-        for procurement in self.browse(cr, uid, ids):
-            if procurement.move_id:
-                if procurement.close_move and (procurement.move_id.state <> 'done'):
-                    move_obj.action_done(cr, uid, [procurement.move_id.id])
-        res = self.write(cr, uid, ids, {'state': 'done', 'date_close': time.strftime('%Y-%m-%d')})
-        wf_service = netsvc.LocalService("workflow")
-        for id in ids:
-            wf_service.trg_trigger(uid, 'mrp.procurement', id, cr)
-        return res
-
-    def run_scheduler(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
-        ''' Runs through scheduler.
-        @param use_new_cursor: False or the dbname
-        '''
-        if not context:
-            context={}
-        self._procure_confirm(cr, uid, use_new_cursor=use_new_cursor, context=context)
-        self._procure_orderpoint_confirm(cr, uid, automatic=automatic,\
-                use_new_cursor=use_new_cursor, context=context)
-mrp_procurement()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp/mrp_data.xml b/addons/mrp/mrp_data.xml
index 2793f84b924..a7db7109e55 100644
--- a/addons/mrp/mrp_data.xml
+++ b/addons/mrp/mrp_data.xml
@@ -31,18 +31,5 @@
             <field name="number_increment">1</field>
         </record>
         
-        <record forcecreate="True" id="ir_cron_scheduler_action" model="ir.cron">
-            <field name="name">Run mrp scheduler</field>
-            <field eval="False" name="active"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="interval_number">1</field>
-            <field name="interval_type">days</field>
-            <field name="numbercall">-1</field>
-            <field eval="False" name="doall"/>
-            <field eval="'mrp.procurement'" name="model"/>
-            <field eval="'run_scheduler'" name="function"/>
-            <field eval="'(False,)'" name="args"/>
-        </record>
-        
     </data>
 </openerp>
diff --git a/addons/mrp/mrp_procurement.py b/addons/mrp/mrp_procurement.py
new file mode 100644
index 00000000000..84392b329ea
--- /dev/null
+++ b/addons/mrp/mrp_procurement.py
@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from mx import DateTime
+from osv import fields
+from osv import osv
+from tools.translate import _
+import ir
+import netsvc
+import time
+
+class mrp_procurement(osv.osv):
+    _inherit = 'mrp.procurement'
+    _columns = {
+        'bom_id': fields.many2one('mrp.bom', 'BoM', ondelete='cascade', select=True),
+    }
+    
+    def check_produce_product(self, cr, uid, procurement, context=[]):
+        properties = [x.id for x in procurement.property_ids]
+        bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, procurement.product_id.id, procurement.product_uom.id, properties)
+        if not bom_id:
+            cr.execute('update mrp_procurement set message=%s where id=%s', (_('No BoM defined for this product !'), procurement.id))
+            return False
+        return True
+    
+    def action_produce_assign_product(self, cr, uid, ids, context={}):
+        """ This is action which call from workflow to assign production order to procurements
+        @return: True
+        """
+        procurement_obj = self.pool.get('mrp.procurement')
+        res = procurement_obj.make_mo(cr, uid, ids, context=context)
+        res = res.values()
+        return len(res) and res[0] or 0 #TO CHECK: why workflow is generated error if return not integer value
+    
+    def make_mo(self, cr, uid, ids, context={}):
+        """ Make Manufacturing(production) order from procurement
+        @return: New created Production Orders procurement wise 
+        """
+        res = {}
+        company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
+        production_obj = self.pool.get('mrp.production')
+        move_obj = self.pool.get('stock.move')
+        wf_service = netsvc.LocalService("workflow")
+        procurement_obj = self.pool.get('mrp.procurement')
+        for procurement in procurement_obj.browse(cr, uid, ids):
+            res_id = procurement.move_id.id
+            loc_id = procurement.location_id.id
+            newdate = DateTime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S') - DateTime.RelativeDateTime(days=procurement.product_id.product_tmpl_id.produce_delay or 0.0)
+            newdate = newdate - DateTime.RelativeDateTime(days=company.manufacturing_lead)
+            produce_id = production_obj.create(cr, uid, {
+                'origin': procurement.origin,
+                'product_id': procurement.product_id.id,
+                'product_qty': procurement.product_qty,
+                'product_uom': procurement.product_uom.id,
+                'product_uos_qty': procurement.product_uos and procurement.product_uos_qty or False,
+                'product_uos': procurement.product_uos and procurement.product_uos.id or False,
+                'location_src_id': procurement.location_id.id,
+                'location_dest_id': procurement.location_id.id,
+                'bom_id': procurement.bom_id and procurement.bom_id.id or False,
+                'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
+                'move_prod_id': res_id,
+                'company_id': procurement.company_id.id,
+            })
+            res[procurement.id] = produce_id
+            self.write(cr, uid, [procurement.id], {'state': 'running'})
+            bom_result = production_obj.action_compute(cr, uid,
+                    [produce_id], properties=[x.id for x in procurement.property_ids])
+            wf_service.trg_validate(uid, 'mrp.production', produce_id, 'button_confirm', cr)
+            move_obj.write(cr, uid, [res_id],
+                    {'location_id': procurement.location_id.id})
+        return res
+    
+mrp_procurement()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 5b8b7c41084..5db08653383 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -4,92 +4,11 @@
 
         <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing"
             groups="group_mrp_user,group_mrp_manager" sequence="3"/>
-        <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
-        <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
-
-        <menuitem name="Control" id="menu_mrp_control" parent="base.menu_mrp_root"  sequence="3" />
+		<menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
         <menuitem name="Master Data"
                   id="menu_mrp_bom"
                   parent="base.menu_mrp_root"
                   sequence="5" />
-        <!--
-        Property / Property Group
-        -->
-
-        <record id="mrp_property_group_form_view" model="ir.ui.view">
-            <field name="name">mrp.property.group.form</field>
-            <field name="model">mrp.property.group</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Properties categories">
-                    <separator colspan="4" string="General Information"/>
-                    <field colspan="4" name="name" select="1"/>
-                    <field colspan="4" name="description"/>
-                </form>
-            </field>
-        </record>
-        <record id="mrp_property_group_action" model="ir.actions.act_window">
-            <field name="name">Property Categories</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.property.group</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-        <menuitem
-            id="menu_mrp_configuration"
-            name="Configuration"
-            parent="base.menu_mrp_root"
-            groups="base.group_extended"
-            sequence="50" />
-
-        <record id="mrp_property_tree_view" model="ir.ui.view">
-            <field name="name">mrp.property.tree</field>
-            <field name="model">mrp.property</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Properties">
-                    <field name="name"/>
-                    <field name="composition"/>
-                    <field name="group_id"/>
-                </tree>
-            </field>
-        </record>
-        <record id="mrp_property_form_view" model="ir.ui.view">
-            <field name="name">mrp.property.form</field>
-            <field name="model">mrp.property</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Properties">
-                    <separator colspan="4" string="General Information"/>
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="group_id" select="1"/>
-                    <field name="composition" select="1"/>
-                    <separator colspan="4" string="Description"/>
-                    <field colspan="4" name="description"/>
-                </form>
-            </field>
-        </record>
-        <record id="mrp_property_action" model="ir.actions.act_window">
-            <field name="name">Properties</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.property</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-        <menuitem name="Properties"
-            id="menu_mrp_property"
-            parent="menu_mrp_configuration"
-            groups="base.group_extended"
-            sequence="20" />
-        <menuitem
-            action="mrp_property_action"
-            id="menu_mrp_property_action"
-            parent="menu_mrp_property"
-            groups="base.group_extended" />
-        <menuitem
-            action="mrp_property_group_action"
-            id="menu_mrp_property_group_action"
-            parent="menu_mrp_property"/>
 
         <!--
         Work Centers
@@ -765,259 +684,22 @@
                 </tree>
             </field>
         </record>
-
-        <!--
-        Procurement
+        
+        <!-- 
+        	Procurements
         -->
-
-        <record id="mrp_procurement_tree_view" model="ir.ui.view">
-            <field name="name">mrp.procurement.tree</field>
-            <field name="model">mrp.procurement</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Procurement Lines" colors="red:state=='draft';black:state=='running';green:state=='confirmed';gray:state in ['done','cancel']">
-                    <field name="date_planned" widget="date"/>
-                    <field name="origin"/>
-                    <field name="product_id"/>
-                    <field name="product_qty"/>
-                    <field name="product_uom" string="UOM"/>
-                    <field name="procure_method"/>
-                    <field name="state"/>
-                </tree>
-            </field>
+         
+        <record id="view_procurement_form_inherit" model="ir.ui.view">
+        	<field name="name">mrp.procurement.form.inherit</field>
+        	<field name="model">mrp.procurement</field>
+        	<field name="inherit_id" ref="mrp_procurement.mrp_procurement_form_view"/>
+        	<field name="type">form</field>
+        	<field name="arch" type="xml">
+        		<xpath expr="/form/notebook/page/field[@name='move_id']" position="before">
+        			<field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
+        		</xpath>
+        	</field>
         </record>
-        <record id="mrp_procurement_form_view" model="ir.ui.view">
-            <field name="name">mrp.procurement.form</field>
-            <field name="model">mrp.procurement</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Procurement">
-                    <group col="2" colspan="2">
-                        <separator colspan="2" string="References"/>
-                        <field name="name" select="1" string="Procurement Reason"/>
-                        <field name="origin"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator colspan="2" string="Planification"/>
-                        <field name="date_planned" select="1"/>
-                        <field name="procure_method"/>
-                        <field name="priority" groups="base.group_extended"/>
-                    </group>
-                    <notebook colspan="4">
-                    <page string="Procurement Details">
-                        <separator colspan="4" string="Product &amp; Location"/>
-                        <field name="product_id" select="1" on_change="onchange_product_id(product_id)"/>
-                        <field name="location_id" domain="[('usage','=','internal')]"/>
-                        <field name="product_qty"/>
-                        <field name="product_uom"/>
-
-                        <field name="product_uos_qty" groups="product.group_uos"/>
-                        <field name="product_uos" groups="product.group_uos"/>
-
-                        <separator colspan="4" string="Status"/>
-                        <field colspan="4" name="message" readonly="1"/>
-                        <field name="state" readonly="1"/>
-                        <group col="7" colspan="2">
-                            <button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
-                            <button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
-                            <button name="button_cancel" states="draft,exception,waiting" string="Cancel" icon="gtk-cancel"/>
-                            <button name="button_check" states="confirmed" string="Run     Procurement" icon="gtk-media-play"/>
-                        </group>
-                    </page>
-                    <page string="Extra Information">
-                        <separator colspan="4" string="Details"/>
-                        <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
-                        <field name="move_id" groups="base.group_extended"/>
-                        <field name="date_close"/>
-                        <field name="close_move" groups="base.group_extended"/>
-                        <field name="purchase_id"/>
-                        <group colspan="4"  groups="base.group_extended">
-                            <separator colspan="4" string="Properties" />
-                            <field colspan="4" name="property_ids" nolabel="1"/>
-                        </group>
-                    </page>
-                    <page string="Notes">
-                        <separator colspan="4" string="Note" />
-                        <field name="note" colspan="4" nolabel="1"/>
-                    </page>
-                    </notebook>
-                </form>
-            </field>
-        </record>
-        <record id="view_mrp_procurement_filter" model="ir.ui.view">
-            <field name="name">mrp.procurement.select</field>
-            <field name="model">mrp.procurement</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search Procurement">
-                    <group col='10' colspan='4'>
-                       <filter icon="terp-mrp" string="Current" domain="[('state','in',('draft','confirmed'))]" default="1" help="Procurement Orders in draft or open state."/>
-                       <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement Orders with exceptions"/>
-                       <filter icon="terp-mrp" string="Late"
-                           domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
-                           help="Procurement started late" />
-                       <separator orientation="vertical"/>
-                       <field name="name"/>
-                       <field name="origin"/>
-                       <field name="product_id" />
-                       <field name="date_planned" widget="date"/>
-                       <field name="state" />
-                    </group>
-                    <newline/>
-                    <group expand="1" string="Group By" colspan="4" col="8">
-                        <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Reason" icon="terp-mrp" domain="[]" context="{'group_by':'name'}"/>
-                        <filter string="Scheduled Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-        <record id="mrp_procurement_action" model="ir.actions.act_window">
-            <field name="name">Procurement Orders</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.procurement</field>
-            <field name="view_type">form</field>
-            <field name="view_id" eval="False"/>
-            <field name="search_view_id" ref="view_mrp_procurement_filter"/>
-        </record>
-        <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_manufacturing"
-                  sequence="2" />
-
-        <record id="mrp_procurement_action3" model="ir.actions.act_window">
-            <field name="name">Procurements</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.procurement</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_mrp_procurement_filter"/>
-            <field name="domain">[]</field>
-            <field name="context">{}</field>
-        </record>
-
-        <record id="mrp_procurement_action5" model="ir.actions.act_window">
-            <field name="name">Procurement Exceptions</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.procurement</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','exception')]</field>
-        </record>
-
-        <menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_exception_action" parent="mrp.menu_mrp_control"
-                  sequence="1" />
-        <record id="mrp_procurement_action4" model="ir.actions.act_window">
-            <field name="name">Procurement Exceptions to Fix</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.procurement</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','exception'), ('message', '&lt;&gt;', '')]</field>
-            <field name="filter" eval="True"/>
-        </record>
-
-        <record id="mrp_procurement_action11" model="ir.actions.act_window">
-            <field name="name">Temporary Procurement Exceptions</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.procurement</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','exception'), ('message', '=', '')]</field>
-        </record>
-
-        <!-- Order Point -->
-        <record id="view_warehouse_orderpoint_tree" model="ir.ui.view">
-            <field name="name">stock.warehouse.orderpoint.tree</field>
-            <field name="model">stock.warehouse.orderpoint</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Minimum Stock Rules">
-                    <field name="name"/>
-                    <field name="warehouse_id"/>
-                    <field name="location_id"/>
-                    <field name="product_id"/>
-                    <field name="product_uom"/>
-                    <field name="product_min_qty"/>
-                    <field name="product_max_qty"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="warehouse_orderpoint_search">
-            <field name="name">stock.warehouse.orderpoint.search</field>
-            <field name="model">stock.warehouse.orderpoint</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Minimum Stock Rules Search">
-                    <group col="10" colspan="4">
-                        <field name="name" select="1" />
-                        <field name="warehouse_id" select="1" widget="selection"/>
-                        <field name="location_id" select="1" />
-                        <field name="company_id" select="1" widget="selection"/>
-                        <field name="product_id" select="1"/>
-                    </group>
-                    <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="10">
-                        <filter string="Warehouse" icon="terp-stock" domain="[]"  context="{'group_by':'warehouse_id'}"/>
-                        <filter string="Location" icon="terp-stock" domain="[]" context="{'group_by':'location_id'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <record id="view_warehouse_orderpoint_form" model="ir.ui.view">
-            <field name="name">stock.warehouse.orderpoint.form</field>
-            <field name="model">stock.warehouse.orderpoint</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Minimum Stock Rules">
-                    <group col="2" colspan="2">
-                        <separator string="General Information" colspan="2" />
-                        <field name="name" />
-                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                        <field name="product_uom"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Locations" colspan="2" />
-                        <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
-                        <field name="location_id"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Quantity Rules" colspan="2" />
-                        <field name="product_min_qty"/>
-                        <field name="product_max_qty"/>
-                        <field name="qty_multiple"/>
-                    </group>
-                    <group col="2" colspan="2" groups="base.group_extended">
-                        <separator string="Misc" colspan="2" />
-                        <field name="procurement_id" readonly="1"/>
-                        <field name="active" />
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_orderpoint_form" model="ir.actions.act_window">
-            <field name="name">Minimum Stock Rules</field>
-            <field name="res_model">stock.warehouse.orderpoint</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_warehouse_orderpoint_tree"/>
-            <field name="search_view_id" ref="warehouse_orderpoint_search" />
-        </record>
-        <menuitem action="action_orderpoint_form" id="menu_action_orderpoint_form" parent="menu_mrp_reordering"/>
-
-        <act_window domain="[('warehouse_id', '=', active_id)]" id="act_stock_warehouse_2_stock_warehouse_orderpoint" name="Minimum Stock Rules" res_model="stock.warehouse.orderpoint" src_model="stock.warehouse"/>
-
-        <!-- add product_uom to context to be the default value when adding new orderpoints -->
-        <act_window
-            context="{'product_uom': locals().has_key('uom_id') and uom_id}"
-            domain="[('product_id', '=', active_id)]"
-            id="act_product_product_2_stock_warehouse_orderpoint"
-            name="Minimum Stock Rules"
-            res_model="stock.warehouse.orderpoint"
-            src_model="product.product"/>
 
         <act_window
             id="action_product_bom_structure"
diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml
index 8be8f97b5d9..6f7ef00b3d2 100644
--- a/addons/mrp/mrp_workflow.xml
+++ b/addons/mrp/mrp_workflow.xml
@@ -113,241 +113,34 @@
             <field name="act_to" ref="prod_act_cancel"/>
             <field name="signal">button_cancel</field>
         </record>
-
+        
         <!-- Procurement -->
-
-        <record id="wkf" model="workflow">
-            <field name="name">mrp.procurement.basic</field>
-            <field name="osv">mrp.procurement</field>
-            <field name="on_create">True</field>
-        </record>
-
-        <record id="act_draft" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="flow_start">True</field>
-            <field name="name">draft</field>
-        </record>
-        <record id="act_cancel" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">cancel</field>
-            <field name="kind">function</field>
-            <field name="action">action_cancel()</field>
-            <field name="flow_stop">True</field>
-        </record>
-        <record id="act_confirm" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">confirm</field>
-            <field name="kind">function</field>
-            <field name="action">action_confirm()</field>
-        </record>
-        <record id="act_confirm_wait" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">confirm_wait</field>
-            <field name="kind">function</field>
-            <field name="action">write({'state':'exception'})</field>
-        </record>
-        <record id="act_confirm_mts" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">confirm_mts</field>
-        </record>
-        <record id="act_confirm_mto" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">confirm_mto</field>
-        </record>
-        <record id="act_make_to_stock" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">make_to_stock</field>
-            <field name="kind">function</field>
-            <field name="action">action_move_assigned()</field>
-        </record>
         <record id="act_produce" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
+            <field name="wkf_id" ref="mrp_procurement.wkf_procurement"/>
             <field name="name">produce</field>
             <field name="kind">subflow</field>
             <field name="subflow_id" search="[('osv','=','mrp.production')]"/>
             <field name="action">action_produce_assign_product()</field>
         </record>
-        <record id="act_produce_check" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">produce_check</field>
-        </record>
-        <record id="act_produce_service" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">produce_service</field>
-            <field name="kind">function</field>
-            <field name="action">action_produce_assign_service()</field>
-        </record>
-        <record id="act_buy" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">buy</field>
-            <field name="kind">subflow</field>
-            <field name="subflow_id" search="[('osv','=','purchase.order')]"/>
-            <field name="action">action_po_assign()</field>
-        </record>
-        <record id="act_make_done" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">ready</field>
-            <field name="kind">function</field>
-            <field name="action">action_ready()</field>
-        </record>
-        <record id="act_wait_done" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">wait_done</field>
-            <field name="kind">function</field>
-            <field name="action">write({'state':'waiting'})</field>
-        </record>
-
-        <record id="act_done" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="flow_stop">True</field>
-            <field name="name">done</field>
-            <field name="kind">function</field>
-            <field name="action">action_done()</field>
-        </record>
-
-        <record id="trans_draft_confirm" model="workflow.transition">
-            <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_confirm"/>
-            <field name="signal">button_confirm</field>
-        </record>
-        <record id="trans_confirm_cancel2" model="workflow.transition">
-            <field name="act_from" ref="act_confirm"/>
-            <field name="act_to" ref="act_wait_done"/>
-            <field name="signal">button_wait_done</field>
-            <field name="condition">True</field>
-        </record>
-        <record id="trans_confirm_wait_done" model="workflow.transition">
-            <field name="act_from" ref="act_wait_done"/>
-            <field name="act_to" ref="act_done"/>
-            <field name="condition">check_move_done()</field>
-            <field name="trigger_model">stock.move</field>
-            <field name="trigger_expr_id">[move_id.id]</field>
-        </record>
-
-        <record id="trans_confirm_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_confirm"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">button_check</field>
-            <field name="condition">test_cancel()</field>
-        </record>
-        <record id="trans_confirm_confirm_wait" model="workflow.transition">
-            <field name="act_from" ref="act_confirm"/>
-            <field name="act_to" ref="act_confirm_wait"/>
-            <field name="signal">button_check</field>
-            <field name="condition">not test_cancel()</field>
-        </record>
-        <record id="trans_confirm_wait_confirm_mto" model="workflow.transition">
-            <field name="act_from" ref="act_confirm_wait"/>
-            <field name="act_to" ref="act_confirm_mto"/>
-            <field name="condition">procure_method=='make_to_order'</field>
-        </record>
-        <record id="trans_confirm_wait_confirm_mts" model="workflow.transition">
-            <field name="act_from" ref="act_confirm_wait"/>
-            <field name="act_to" ref="act_confirm_mts"/>
-            <field name="condition">procure_method=='make_to_stock'</field>
-        </record>
-        <record id="trans_confirm_mts_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_confirm_mts"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">button_cancel</field>
-        </record>
-        <record id="trans_confirm_waiting_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_wait_done"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">button_cancel</field>
-        </record>
-        <record id="trans_confirm_mts_confirm" model="workflow.transition">
-            <field name="act_from" ref="act_confirm_mts"/>
-            <field name="act_to" ref="act_confirm"/>
-            <field name="signal">button_restart</field>
-        </record>
-        <record id="trans_confirm_mto_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_confirm_mto"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">button_cancel</field>
-        </record>
-        <record id="trans_confirm_mto_confirm" model="workflow.transition">
-            <field name="act_from" ref="act_confirm_mto"/>
-            <field name="act_to" ref="act_confirm"/>
-            <field name="signal">button_restart</field>
-        </record>
-        <record id="trans_draft_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">button_cancel</field>
-        </record>
-        <record id="trans_confirm_mts_make_to_stock" model="workflow.transition">
-            <field name="act_from" ref="act_confirm_mts"/>
-            <field name="act_to" ref="act_make_to_stock"/>
-            <field name="condition">check_make_to_stock()</field>
-        </record>
-        <record id="trans_confirm_mto_produce_check" model="workflow.transition">
-            <field name="act_from" ref="act_confirm_mto"/>
-            <field name="act_to" ref="act_produce_check"/>
-            <field name="condition">check_produce()</field>
-        </record>
+        
         <record id="trans_product_check_produce" model="workflow.transition">
-            <field name="act_from" ref="act_produce_check"/>
+            <field name="act_from" ref="mrp_procurement.act_produce_check"/>
             <field name="act_to" ref="act_produce"/>
             <field name="condition">check_product()</field>
         </record>
-        <record id="trans_product_check_produce_service" model="workflow.transition">
-            <field name="act_from" ref="act_produce_check"/>
-            <field name="act_to" ref="act_produce_service"/>
-            <field name="condition">not check_product()</field>
-        </record>
-        <record id="trans_confirm_mto_buy" model="workflow.transition">
-            <field name="act_from" ref="act_confirm_mto"/>
-            <field name="act_to" ref="act_buy"/>
-            <field name="condition">check_buy()</field>
-        </record>
-        <record id="trans_make_to_stock_make_done" model="workflow.transition">
-            <field name="act_from" ref="act_make_to_stock"/>
-            <field name="act_to" ref="act_make_done"/>
-            <field name="condition">True</field>
-            <field name="trigger_model" eval="False"/>
-            <field name="trigger_expr_id" eval="False"/>
-        </record>
+        
         <record id="trans_produce_cancel" model="workflow.transition">
             <field name="act_from" ref="act_produce"/>
-            <field name="act_to" ref="act_cancel"/>
+            <field name="act_to" ref="mrp_procurement.act_cancel"/>
             <field name="signal">subflow.cancel</field>
         </record>
-        <record id="trans_produce_service_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_produce_service"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">subflow.cancel</field>
-        </record>
-        <record id="trans_buy_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_buy"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">subflow.cancel</field>
-        </record>
-
+        
         <record id="trans_produce_make_done" model="workflow.transition">
             <field name="act_from" ref="act_produce"/>
-            <field name="act_to" ref="act_make_done"/>
+            <field name="act_to" ref="mrp_procurement.act_make_done"/>
             <field name="signal">subflow.done</field>
         </record>
-
-        <record id="trans_produce_service_make_done" model="workflow.transition">
-            <field name="act_from" ref="act_produce_service"/>
-            <field name="act_to" ref="act_make_done"/>
-        </record>
-        <record id="trans_buy_make_done" model="workflow.transition">
-            <field name="act_from" ref="act_buy"/>
-            <field name="act_to" ref="act_make_done"/>
-            <field name="signal">subflow.delivery_done</field>
-        </record>
-        <record id="trans_make_done_done" model="workflow.transition">
-            <field name="act_from" ref="act_make_done"/>
-            <field name="act_to" ref="act_done"/>
-            <field name="condition">action_check_finnished()</field>
-        </record>
-        <record id="trans_make_done_confirm" model="workflow.transition">
-            <field name="act_from" ref="act_make_done"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="condition">check_move_cancel()</field>
-        </record>
+        
+        
     </data>
 </openerp>
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index 17d72a520f2..b96bf11229f 100755
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -2,114 +2,100 @@
 <openerp>
     <data>
 
-        <!--
-            Process
-        -->
-
-        <record id="process_process_procurementprocess0" model="process.process">
-            <field eval="&quot;&quot;&quot;Procurement&quot;&quot;&quot;" name="name"/>
-            <field name="model_id" ref="mrp.model_mrp_procurement"/>
-            <field eval="1" name="active"/>
-        </record>
-
-        <!--
-            Process Node
-        -->
-
-        <record id="process_node_stockproduct1" model="process.node">
-            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
-            <field name="model_id" ref="mrp.model_mrp_procurement"/>
-            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;For stockable products and consumables&quot;&quot;&quot;" name="note"/>
-            <field eval="&quot;&quot;&quot;Stockable Product&quot;&quot;&quot;" name="name"/>
-            <field name="process_id" ref="mrp.process_process_stockableproductprocess0"/>
-            <field name="subflow_id" ref="process_process_procurementprocess0"/>
-            <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
-            <field eval="1" name="flow_start"/>
-        </record>
-
-        <record id="process_node_serviceproduct1" model="process.node">
-            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
-            <field name="model_id" ref="mrp.model_mrp_procurement"/>
-            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;For Services.&quot;&quot;&quot;" name="note"/>
-            <field eval="&quot;&quot;&quot;Service&quot;&quot;&quot;" name="name"/>
-            <field name="process_id" ref="mrp.process_process_serviceproductprocess0"/>
-            <field name="subflow_id" ref="process_process_procurementprocess0"/>
-            <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
-            <field eval="1" name="flow_start"/>
-        </record>
-
         <record id="process_node_productionorder0" model="process.node">
             <field name="menu_id" ref="mrp.menu_mrp_production_action"/>
             <field name="model_id" ref="mrp.model_mrp_production"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Drives the procurement orders for raw material.&quot;&quot;&quot;" name="note"/>
             <field eval="&quot;&quot;&quot;Production Order&quot;&quot;&quot;" name="name"/>
-            <field name="process_id" ref="process_process_procurementprocess0"/>
+            <field name="process_id" ref="mrp_procurement.process_process_procurementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'picking_except', 'confirmed', 'ready', 'in_production', 'cancel', 'done')&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
 
-        <record id="process_node_minimumstockrule0" model="process.node">
-            <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
-            <field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/>
-            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Linked to the 'Minimum stock rule' supplying method.&quot;&quot;&quot;" name="note"/>
-            <field eval="&quot;&quot;&quot;Minimum Stock&quot;&quot;&quot;" name="name"/>
-            <field name="process_id" ref="process_process_procurementprocess0"/>
-            <field eval="1" name="flow_start"/>
-        </record>
-
         <record id="process_node_procureproducts0" model="process.node">
-            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;The way to procurement depends on the product type.&quot;&quot;&quot;" name="note"/>
             <field eval="&quot;&quot;&quot;Procure Products&quot;&quot;&quot;" name="name"/>
-            <field name="process_id" ref="process_process_procurementprocess0"/>
+            <field name="process_id" ref="mrp_procurement.process_process_procurementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
+        
+        <record id="process_node_minimumstockrule0" model="process.node">
+            <field name="menu_id" ref="mrp_procurement.menu_action_orderpoint_form"/>
+            <field name="model_id" ref="mrp_procurement.model_stock_warehouse_orderpoint"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Linked to the 'Minimum stock rule' supplying method.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Minimum Stock&quot;&quot;&quot;" name="name"/>
+            <field name="process_id" ref="mrp_procurement.process_process_procurementprocess0"/>
+            <field eval="1" name="flow_start"/>
+        </record>
 
         <record id="process_node_stockproduct0" model="process.node">
-            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Product type is Stockable or Consumable.&quot;&quot;&quot;" name="note"/>
             <field eval="&quot;&quot;&quot;Stockable Product&quot;&quot;&quot;" name="name"/>
             <field name="subflow_id" ref="process_process_stockableproductprocess0"/>
-            <field name="process_id" ref="process_process_procurementprocess0"/>
+            <field name="process_id" ref="mrp_procurement.process_process_procurementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
+        
+        <record id="process_node_stockproduct1" model="process.node">
+            <field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+            <field name="model_id" ref="mrp.model_mrp_procurement"/>
+            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;For stockable products and consumables&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Stockable Product&quot;&quot;&quot;" name="name"/>
+            <field name="process_id" ref="mrp.process_process_stockableproductprocess0"/>
+            <field name="subflow_id" ref="mrp_procurement.process_process_procurementprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
+            <field eval="1" name="flow_start"/>
+        </record>
 
         <record id="process_node_serviceproduct0" model="process.node">
-            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Product type is service&quot;&quot;&quot;" name="note"/>
             <field eval="&quot;&quot;&quot;Service&quot;&quot;&quot;" name="name"/>
             <field name="subflow_id" ref="process_process_serviceproductprocess0"/>
-            <field name="process_id" ref="process_process_procurementprocess0"/>
+            <field name="process_id" ref="mrp_procurement.process_process_procurementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
+        
+        <record id="process_node_serviceproduct1" model="process.node">
+            <field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+            <field name="model_id" ref="mrp.model_mrp_procurement"/>
+            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;For Services.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Service&quot;&quot;&quot;" name="name"/>
+            <field name="process_id" ref="mrp.process_process_serviceproductprocess0"/>
+            <field name="subflow_id" ref="mrp_procurement.process_process_procurementprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
+            <field eval="1" name="flow_start"/>
+        </record>
 
         <record id="process_node_purchaseprocure0" model="process.node">
-            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Procurement Orders&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;For purchased material&quot;&quot;&quot;" name="note"/>
-            <field name="subflow_id" ref="process_process_procurementprocess0"/>
+            <field name="subflow_id" ref="mrp_procurement.process_process_procurementprocess0"/>
             <field name="process_id" ref="purchase.process_process_purchaseprocess0"/>
             <field eval="1" name="flow_start"/>
         </record>
 
         <record id="process_node_productminimumstockrule0" model="process.node">
-            <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
-            <field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/>
+            <field name="menu_id" ref="mrp_procurement.menu_action_orderpoint_form"/>
+            <field name="model_id" ref="mrp_procurement.model_stock_warehouse_orderpoint"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Minimum Stock&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Automatic procurement rule&quot;&quot;&quot;" name="note"/>
diff --git a/addons/mrp/process/service_product_process.xml b/addons/mrp/process/service_product_process.xml
index 60bf3b562b9..42650a5ad24 100644
--- a/addons/mrp/process/service_product_process.xml
+++ b/addons/mrp/process/service_product_process.xml
@@ -17,7 +17,7 @@
 		-->
 
 		<record id="process_node_serviceonorder0" model="process.node">
-			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from Production or Purchase Order.&quot;&quot;&quot;" name="note"/>
@@ -28,7 +28,7 @@
 		</record>
 
 		<record id="process_node_servicemts0" model="process.node">
-			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from stock.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml
index c053103f476..57c19ae7d90 100644
--- a/addons/mrp/process/stockable_product_process.xml
+++ b/addons/mrp/process/stockable_product_process.xml
@@ -17,7 +17,7 @@
 		-->
 
 		<record id="process_node_mts0" model="process.node">
-			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from stock.&quot;&quot;&quot;" name="note"/>
@@ -28,7 +28,7 @@
 		</record>
 
 		<record id="process_node_stock0" model="process.node">
-			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from Production or Purchase Order.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 48f27679435..d5e00b9cbda 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -1,7 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_mrp_workcenter","mrp.workcenter","model_mrp_workcenter","mrp.group_mrp_user",1,0,0,0
-"access_mrp_property_group","mrp.property.group","model_mrp_property_group","mrp.group_mrp_user",1,0,0,0
-"access_mrp_property","mrp.property","model_mrp_property","mrp.group_mrp_user",1,0,0,0
 "access_mrp_routing","mrp.routing","model_mrp_routing","mrp.group_mrp_user",1,0,0,0
 "access_mrp_routing_workcenter","mrp.routing.workcenter","model_mrp_routing_workcenter","mrp.group_mrp_user",1,0,0,0
 "access_mrp_bom","mrp.bom","model_mrp_bom","mrp.group_mrp_user",1,0,0,0
@@ -10,11 +8,7 @@
 "access_mrp_production_workcenter_line","mrp.production.workcenter.line","model_mrp_production_workcenter_line","mrp.group_mrp_user",1,1,1,1
 "access_mrp_production_product_line","mrp.production.product.line","model_mrp_production_product_line","mrp.group_mrp_user",1,1,1,1
 "access_mrp_procurement","mrp.procurement","model_mrp_procurement","mrp.group_mrp_user",1,1,1,1
-"access_stock_warehouse_orderpoint","stock.warehouse.orderpoint","model_stock_warehouse_orderpoint","mrp.group_mrp_user",1,0,0,0
-"access_stock_warehouse_orderpoint_manager","stock.warehouse.orderpoint.manager","model_stock_warehouse_orderpoint","mrp.group_mrp_manager",1,1,1,1
 "access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_user",1,1,1,1
-"access_mrp_property_group_manager","mrp.property.group.manager","model_mrp_property_group","mrp.group_mrp_user",1,1,1,1
-"access_mrp_property_manager","mrp.property.manager","model_mrp_property","mrp.group_mrp_user",1,1,1,1
 "access_mrp_routing_manager","mrp.routing.manager","model_mrp_routing","mrp.group_mrp_manager",1,1,1,1
 "access_mrp_routing_workcenter_manager","mrp.routing.workcenter.manager","model_mrp_routing_workcenter","mrp.group_mrp_manager",1,1,1,1
 "access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_manager",1,1,1,1
@@ -32,10 +26,7 @@
 "access_mrp_production_stock_worker","mrp.production stock_worker","model_mrp_production","stock.group_stock_user",1,0,0,0
 "access_mrp_installer","mrp.installer","model_mrp_installer","mrp.group_mrp_user",1,0,0,0
 "access_mrp_product_produce","mrp.product.produce","model_mrp_product_produce","mrp.group_mrp_user",1,0,0,0
-"access_mrp_make_procurement","make.procurement","model_make_procurement","mrp.group_mrp_user",1,0,0,0
 "access_mrp_change_production_qty","change.production.qty","model_change_production_qty","mrp.group_mrp_user",1,0,0,0
-"access_mrp_procurement_compute_all","mrp.procurement.compute.all","model_mrp_procurement_compute_all","mrp.group_mrp_user",1,0,0,0
-"access_mrp_procurement_orderpoint_compute","mrp.procurement.orderpoint.compute","model_mrp_procurement_orderpoint_compute","mrp.group_mrp_user",1,0,0,0
 "access_mrp_production_order","mrp.production.order","model_mrp_production_order","mrp.group_mrp_user",1,0,0,0
 "access_report_workcenter_load","report.workcenter.load","model_report_workcenter_load","mrp.group_mrp_manager",1,0,0,0
 "access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,0,0,0
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index cfb31f7d05d..088f817a00d 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -11,36 +11,11 @@
 
 
 	<!-- restrict access to menu -->
-	<record model='ir.ui.menu' id="mrp_Sched_all">
+	<record model='ir.ui.menu' id="mrp_procurement.mrp_Sched_all">
 		<field eval="[(6,0,[ref('group_mrp_manager')])]" name="groups_id"/>
   	</record>
 
 <!-- Multi -->
-    <record model="ir.rule.group" id="mrp_procurement_rule_group">
-        <field name="name">mrp_procurement multi-company</field>
-        <field name="model_id" search="[('model','=','mrp.procurement')]" model="ir.model"/>
-        <field name="global" eval="True"/>
-    </record>
-    <record model="ir.rule" id="mrp_procurement_rule">
-		<field model="ir.model.fields" name="field_id" search="[('model','=','mrp.procurement'),('name','=','company_id')]"/>
-		<field name="operator">child_of</field>
-		<field name="operand">user.company_id.id</field>
-        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
-        <field name="rule_group" ref="mrp_procurement_rule_group"/>
-    </record>
-
-    <record model="ir.rule.group" id="stock_warehouse_orderpoint_rule_group">
-        <field name="name">stock_warehouse.orderpoint multi-company</field>
-        <field name="model_id" search="[('model','=','stock.warehouse.orderpoint')]" model="ir.model"/>
-        <field name="global" eval="True"/>
-    </record>
-    <record model="ir.rule" id="stock_warehouse_orderpoint_rule">
-		<field model="ir.model.fields" name="field_id" search="[('model','=','stock.warehouse.orderpoint'),('name','=','company_id')]"/>
-		<field name="operator">child_of</field>
-		<field name="operand">user.company_id.id</field>
-        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
-        <field name="rule_group" ref="stock_warehouse_orderpoint_rule_group"/>
-    </record>
 
     <record model="ir.rule.group" id="mrp_production_rule_group">
         <field name="name">mrp_production multi-company</field>
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 21cfac88242..dcb7d4573c1 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -27,74 +27,6 @@ import ir
 import netsvc
 import time
 
-
-class stock_warehouse_orderpoint(osv.osv):
-    """
-    Defines Minimum stock rules.
-    """
-    _name = "stock.warehouse.orderpoint"
-    _description = "Orderpoint minimum rule"
-    
-    _columns = {
-        'name': fields.char('Name', size=32, required=True),
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the orderpoint without removing it."),
-        'logic': fields.selection([('max','Order to Max'),('price','Best price (not yet active!)')], 'Reordering Mode', required=True),
-        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True),
-        'location_id': fields.many2one('stock.location', 'Location', required=True),
-        'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type','=','product')]),
-        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True ),
-        'product_min_qty': fields.float('Min Quantity', required=True,
-            help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
-            "a procurement to bring the virtual stock to the Max Quantity."),
-        'product_max_qty': fields.float('Max Quantity', required=True,
-            help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
-            "a procurement to bring the virtual stock to the Max Quantity."),
-        'qty_multiple': fields.integer('Qty Multiple', required=True,
-            help="The procurement quantity will by rounded up to this multiple."),
-        'procurement_id': fields.many2one('mrp.procurement', 'Latest procurement'),
-        'company_id': fields.many2one('res.company','Company',required=True),
-    }
-    _defaults = {
-        'active': lambda *a: 1,
-        'logic': lambda *a: 'max',
-        'qty_multiple': lambda *a: 1,
-        'name': lambda x,y,z,c: x.pool.get('ir.sequence').get(y,z,'mrp.warehouse.orderpoint') or '',
-        'product_uom': lambda sel, cr, uid, context: context.get('product_uom', False),
-        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.warehouse.orderpoint', context=c)
-    }
-    
-    def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context={}):
-        """ Finds location id for changed warehouse.
-        @param warehouse_id: Changed id of warehouse.
-        @return: Dictionary of values.
-        """
-        if warehouse_id:
-            w = self.pool.get('stock.warehouse').browse(cr, uid, warehouse_id, context)
-            v = {'location_id': w.lot_stock_id.id}
-            return {'value': v}
-        return {}
-    
-    def onchange_product_id(self, cr, uid, ids, product_id, context={}):
-        """ Finds UoM for changed product.
-        @param product_id: Changed id of product.
-        @return: Dictionary of values.
-        """
-        if product_id:
-            prod = self.pool.get('product.product').browse(cr,uid,product_id)
-            v = {'product_uom': prod.uom_id.id}
-            return {'value': v}
-        return {}
-    
-    def copy(self, cr, uid, id, default=None,context={}):
-        if not default:
-            default = {}
-        default.update({
-            'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.warehouse.orderpoint') or '',
-        })
-        return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context)
-    
-stock_warehouse_orderpoint()
-
 class StockMove(osv.osv):
     _inherit = 'stock.move'
     
diff --git a/addons/mrp/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml
new file mode 100644
index 00000000000..f841739e366
--- /dev/null
+++ b/addons/mrp/test/mrp_phantom_bom.yml
@@ -0,0 +1,228 @@
+-
+  In order to test the mrp phantom bom type in OpenERP, I will create products 
+  and then I will create Phantom bom structure for those products.
+-
+  I create the products required to produce some orange juices: Oranges, Sugar and Water.
+-
+  !record {model: product.uom, id: product_uom_litre0}:
+    category_id: product.product_uom_categ_kgm
+    factor: 1.0
+    name: Litre
+    rounding: 0.01 
+- 
+  !record {model: product.product, id: product_product_orangejuice0}:
+    categ_id: product.cat1
+    name: Orange Juice
+    procure_method: make_to_order
+    supply_method: produce
+    type: product
+    uom_id: product_uom_litre0
+    uom_po_id: product_uom_litre0
+- 
+  !record {model: product.product, id: product_product_orange0}:
+    categ_id: product.cat1
+    name: Orange
+    procure_method: make_to_stock
+    seller_ids:
+      - delay: 1
+        name: base.res_partner_asus
+        qty: 1.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_kgm
+    uom_po_id: product.product_uom_kgm
+- 
+  !record {model: product.product, id: product_product_sugar0}:
+    categ_id: product.cat1
+    name: Sugar
+    procure_method: make_to_stock
+    seller_ids:
+      - delay: 1
+        name: base.res_partner_desertic_hispafuentes
+        qty: 2.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_kgm
+    uom_po_id: product.product_uom_kgm
+- 
+  !record {model: product.product, id: product_product_water0}:
+    categ_id: product.cat1
+    name: Water
+    procure_method: make_to_stock
+    supply_method: buy
+    type: consu
+    uom_id: product_uom_litre0
+    uom_po_id: product_uom_litre0
+-
+  I define the BoM to produce an orange juice
+- 
+  !record {model: mrp.bom, id: mrp_bom_orangejuice0}:
+    company_id: base.main_company
+    name: Orange Juice
+    product_efficiency: 1.0
+    product_id: product_product_orangejuice0
+    product_qty: 1.0
+    product_uom: product_uom_litre0
+    type: phantom
+- 
+  !record {model: mrp.bom, id: mrp_bom_orangejuice0}:
+    bom_lines:
+      - bom_id: mrp_bom_orangejuice0
+        company_id: base.main_company
+        name: Orange
+        product_efficiency: 1.0
+        product_id: product_product_orange0
+        product_qty: 0.5
+        product_uom: product.product_uom_kgm
+        type: normal
+      - bom_id: mrp_bom_orangejuice0
+        company_id: base.main_company
+        name: Sugar
+        product_efficiency: 1.0
+        product_id: product_product_sugar0
+        product_qty: 0.02
+        product_uom: product.product_uom_kgm
+        type: normal
+      - bom_id: mrp_bom_orangejuice0
+        company_id: base.main_company
+        name: Water
+        product_efficiency: 1.0
+        product_id: product_product_water0
+        product_qty: 0.80000000000000004
+        product_uom: product_uom_litre0
+        type: normal
+-
+  I define Minimum stock rules for my stockable products orange and sugar
+- 
+  !record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op0}:
+    company_id: base.main_company
+    location_id: stock.stock_location_stock
+    logic: max
+    name: OP/00002
+    product_id: product_product_orange0
+    product_max_qty: 10.0
+    product_min_qty: 5.0
+    product_uom: product.product_uom_kgm
+    qty_multiple: 1
+    warehouse_id: stock.warehouse0
+- 
+  !record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op1}:
+    company_id: base.main_company
+    location_id: stock.stock_location_stock
+    logic: max
+    name: OP/00003
+    product_id: product_product_sugar0
+    product_max_qty: 4.0
+    product_min_qty: 2.0
+    product_uom: product.product_uom_kgm
+    qty_multiple: 1
+    warehouse_id: stock.warehouse0
+-
+  I want to produce 100 litres of Orange juice. I am creating a manufacturing order for this. 
+  I want to see how much quantities of sub products I need, to produce the Orange juice. 
+-
+  I compute the data. I get the bill of material of Orange juice and list of 
+  scheduled products according to my bom.
+- 
+  !record {model: mrp.production, id: mrp_production_mo0}:
+    company_id: base.main_company
+    date_planned: '2010-04-16 15:53:36'
+    location_dest_id: stock.stock_location_output
+    location_src_id: stock.stock_location_stock
+    name: MO/00002
+    product_id: product_product_orangejuice0
+    product_qty: 100.0
+    product_uom: product_uom_litre0
+- 
+  Creating an mrp.production record. Computing Bills of materials.
+- 
+  !record {model: mrp.production, id: mrp_production_mo0}:
+    bom_id: mrp.mrp_bom_orangejuice0
+    company_id: base.main_company
+    date_planned: '2010-04-16 15:53:36'
+    location_dest_id: stock.stock_location_output
+    location_src_id: stock.stock_location_stock
+    name: MO/00002
+    product_id: mrp.product_product_orangejuice0
+    product_lines:
+      - name: Orange
+        product_id: mrp.product_product_orange0
+        product_qty: 50.0
+        product_uom: product.product_uom_kgm
+        production_id: mrp_production_mo0
+      - name: Sugar
+        product_id: mrp.product_product_sugar0
+        product_qty: 2.0
+        product_uom: product.product_uom_kgm
+        production_id: mrp_production_mo0
+      - name: Water
+        product_id: mrp.product_product_water0
+        product_qty: 80.0
+        product_uom: mrp.product_uom_litre0
+        production_id: mrp_production_mo0
+    product_qty: 100.0
+    product_uom: mrp.product_uom_litre0
+-
+  I confirm the order.
+- 
+  !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_mo0}
+-
+  I am checking Procurement orders. There are 3 orders generated for Oranges, Sugar and Water.
+-
+  !python {model: mrp.procurement}: |
+    from tools.translate import _
+    proc_ids = self.search(cr, uid, [('origin','=',':MO/00002')])
+    assert proc_ids, _('No Procurements!')
+-
+  The scheduler runs.
+-
+  !function {model: mrp.procurement, name: run_scheduler}:
+    - model: mrp.procurement
+      search: "[('origin','=',':MO/00002')]"
+-
+  I am checking Internal picking. I see one picking for Orange juice and its 
+  stock moves for Oranges, Sugar and Water made correctly.
+-
+  !python {model: stock.picking}: |
+    from tools.translate import _
+    pick_ids = self.search(cr, uid, [('origin','=',':MO/00002'),('type','=','internal')])
+    assert pick_ids, _('No Internal Pickings!')
+-
+  According to minimum stock rules. I have 2 purchase orders for 
+  Sugar with 6 Kg from Axelor and Orange 60 Kg from ASUStek.
+-
+  I confirm the purchase order of Sugar and Orange.
+-
+  !python {model: purchase.order}: |
+    from tools.translate import _
+    import netsvc
+    purch_ids = self.search(cr, uid, [('origin','in',['SCHEDULER','OP/00002','OP/00003'])])
+    assert purch_ids, _('No Purchase Orders were made!')
+    wf_service = netsvc.LocalService("workflow")
+    for p_id in purch_ids:
+    	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
+-
+  I get the approval from both the suppliers. So I approve my purchase orders.
+-
+  !python {model: purchase.order}: |
+    from tools.translate import _
+    import netsvc
+    purch_ids = self.search(cr, uid, [('origin','in',['SCHEDULER','OP/00002','OP/00003']),('state','=','confirmed')])
+    assert purch_ids, _('No Confirmed Purchase Orders found!')
+    wf_service = netsvc.LocalService("workflow")
+    for p_id in purch_ids:
+    	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_approve', cr)
+-
+  I see two incoming pickings for Orange and Sugar.
+-
+  !python {model: stock.picking}: |
+    from tools.translate import _
+    pick_ids = self.search(cr, uid, [('origin','in',['PO00001:SCHEDULER','PO00002:SCHEDULER','PO00003:OP/00002','PO00004:OP/00003']),('type','=','in')])
+    assert pick_ids, _('No Incoming Shipments found!')
+-
+  I receive both the products. My incoming pickings are done.
+-
+  !function {model: stock.move.split, name: split_lot}:
+    - model: stock.picking
+      search: "[('origin','in',['PO00001:SCHEDULER','PO00002:SCHEDULER','PO00003:OP/00002','PO00004:OP/00003']),('type','=','in')]"
+   
\ No newline at end of file
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py
index 045d7f1bd71..aa4408e543e 100644
--- a/addons/mrp/wizard/__init__.py
+++ b/addons/mrp/wizard/__init__.py
@@ -20,14 +20,10 @@
 ##############################################################################
 
 import mrp_product_produce
-import orderpoint_procurement
-import mrp_procurement
-import schedulers_all
 import mrp_price
 import mrp_workcenter_load
 #import mrp_track_prod
 import change_production_qty
-import make_procurement_product
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp_procurement/__init__.py b/addons/mrp_procurement/__init__.py
new file mode 100644
index 00000000000..6cb8ad4027b
--- /dev/null
+++ b/addons/mrp_procurement/__init__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import mrp_procurement
+import wizard
+import schedulers
+import company
\ No newline at end of file
diff --git a/addons/mrp_procurement/__openerp__.py b/addons/mrp_procurement/__openerp__.py
new file mode 100644
index 00000000000..82c611c6c78
--- /dev/null
+++ b/addons/mrp_procurement/__openerp__.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    "name" : "Procurements",
+    "version" : "1.0",
+    "author" : "Tiny",
+    "website" : "http://www.openerp.com",
+    "category" : "Generic Modules/Production",
+    "depends" : ["base","process", "product", "stock"],
+    "description": """
+    This is the module for computing Procurements.
+    """,
+    'init_xml': [],
+    'update_xml': [
+        'security/ir.model.access.csv',
+        'security/mrp_procurement_security.xml',
+        'mrp_procurement_data.xml',
+        'wizard/make_procurement_view.xml',
+        'wizard/mrp_procurement_view.xml',
+        'wizard/orderpoint_procurement_view.xml',
+        'mrp_procurement_view.xml',
+        'wizard/schedulers_all_view.xml',
+        'mrp_procurement_workflow.xml',
+        'process/procurement_process.xml',
+        "company_view.xml",
+    ],
+#    'demo_xml': [],
+    'installable': True,
+    'active': False,
+    'certificate': '',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_procurement/company.py b/addons/mrp_procurement/company.py
new file mode 100644
index 00000000000..ce39ca9a684
--- /dev/null
+++ b/addons/mrp_procurement/company.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv,fields
+
+class company(osv.osv):
+    _inherit = 'res.company'
+    _columns = {
+        'schedule_range': fields.float('Scheduler Range', required=True,
+            help="This is the time frame analysed by the scheduler when "\
+            "computing procurements. All procurements that are not between "\
+            "today and today+range are skipped for futur computation."),
+    }
+    _defaults = {
+        'schedule_range': lambda *a: 80.0,
+    }
+company()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_procurement/company_view.xml b/addons/mrp_procurement/company_view.xml
new file mode 100644
index 00000000000..543e36fe02f
--- /dev/null
+++ b/addons/mrp_procurement/company_view.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+
+        <record id="mrp_company" model="ir.ui.view">
+            <field name="name">res.company.mrp.config</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+                <page string="Configuration" position="inside">
+                    <separator string="MRP &amp; Logistic Scheduler" colspan="4"/>
+                    <field name="schedule_range"/>
+                </page>
+            </field>
+       </record>
+    
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/mrp_procurement/mrp_procurement.py b/addons/mrp_procurement/mrp_procurement.py
new file mode 100644
index 00000000000..176dceb5cb4
--- /dev/null
+++ b/addons/mrp_procurement/mrp_procurement.py
@@ -0,0 +1,527 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from mx import DateTime
+from osv import osv, fields
+from tools.translate import _
+import netsvc
+import time
+
+
+class mrp_property_group(osv.osv):
+    """
+    Group of mrp properties.
+    """
+    _name = 'mrp.property.group'
+    _description = 'Property Group'
+    _columns = {
+        'name': fields.char('Property Group', size=64, required=True),
+        'description': fields.text('Description'),
+    }
+mrp_property_group()
+
+class mrp_property(osv.osv):
+    """
+    Properties of mrp.
+    """
+    _name = 'mrp.property'
+    _description = 'Property'
+    _columns = {
+        'name': fields.char('Name', size=64, required=True),
+        'composition': fields.selection([('min','min'),('max','max'),('plus','plus')], 'Properties composition', required=True, help="Not used in computations, for information purpose only."),
+        'group_id': fields.many2one('mrp.property.group', 'Property Group', required=True),
+        'description': fields.text('Description'),
+    }
+    _defaults = {
+        'composition': lambda *a: 'min',
+    }
+mrp_property()
+
+# ------------------------------------------------------------------
+# Procurement
+# ------------------------------------------------------------------
+#
+# Produce, Buy or Find products and place a move
+#     then wizard for picking lists & move
+#
+class mrp_procurement(osv.osv):
+    """
+    Procurement Orders
+    """
+    _name = "mrp.procurement"
+    _description = "Procurement"
+    _order = 'priority,date_planned'
+    
+    _columns = {
+        'name': fields.char('Reason', size=64, required=True, help='Procurement name.'),
+        'origin': fields.char('Source Document', size=64,
+            help="Reference of the document that created this Procurement.\n"
+            "This is automatically completed by Open ERP."),
+        'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', required=True),
+        'date_planned': fields.datetime('Scheduled date', required=True),
+        'date_close': fields.datetime('Date Closed'),
+        'product_id': fields.many2one('product.product', 'Product', required=True, states={'draft':[('readonly',False)]}, readonly=True),
+        'product_qty': fields.float('Quantity', required=True, states={'draft':[('readonly',False)]}, readonly=True),
+        'product_uom': fields.many2one('product.uom', 'Product UoM', required=True, states={'draft':[('readonly',False)]}, readonly=True),
+        'product_uos_qty': fields.float('UoS Quantity', states={'draft':[('readonly',False)]}, readonly=True),
+        'product_uos': fields.many2one('product.uom', 'Product UoS', states={'draft':[('readonly',False)]}, readonly=True),
+        'move_id': fields.many2one('stock.move', 'Reservation', ondelete='set null'),
+        'close_move': fields.boolean('Close Move at end', required=True),
+        'location_id': fields.many2one('stock.location', 'Location', required=True, states={'draft':[('readonly',False)]}, readonly=True),
+        'procure_method': fields.selection([('make_to_stock','from stock'),('make_to_order','on order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]},
+            readonly=True, required=True, help="If you encode manually a Procurement, you probably want to use" \
+            " a make to order method."),
+
+        'note': fields.text('Note'),
+        
+        'property_ids': fields.many2many('mrp.property', 'mrp_procurement_property_rel', 'procurement_id','property_id', 'Properties'),
+
+        'message': fields.char('Latest error', size=64, help="Exception occurred while computing procurement orders."),
+        'state': fields.selection([
+            ('draft','Draft'),
+            ('confirmed','Confirmed'),
+            ('exception','Exception'),
+            ('running','Running'),
+            ('cancel','Cancel'),
+            ('ready','Ready'),
+            ('done','Done'),
+            ('waiting','Waiting')], 'State', required=True,
+            help='When a procurement is created the state is set to \'Draft\'.\n If the procurement is confirmed, the state is set to \'Confirmed\'.\
+            \nAfter confirming the state is set to \'Running\'.\n If any exception arises in the order then the state is set to \'Exception\'.\n Once the exception is removed the state becomes \'Ready\'.\n It is in \'Waiting\'. state when the procurement is waiting for another one to finish.'),
+        'note': fields.text('Note'),
+        'company_id': fields.many2one('res.company','Company',required=True),
+    }
+    _defaults = {
+        'state': lambda *a: 'draft',
+        'priority': lambda *a: '1',
+        'date_planned': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+        'close_move': lambda *a: 0,
+        'procure_method': lambda *a: 'make_to_order',
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.procurement', context=c)
+    }
+
+    def unlink(self, cr, uid, ids, context=None):
+        procurements = self.read(cr, uid, ids, ['state'])
+        unlink_ids = []
+        for s in procurements:
+            if s['state'] in ['draft','cancel']:
+                unlink_ids.append(s['id'])
+            else:
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Procurement Order(s) which are in %s State!' % s['state']))
+        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
+
+    def onchange_product_id(self, cr, uid, ids, product_id, context={}):
+        """ Finds UoM and UoS of changed product.
+        @param product_id: Changed id of product.
+        @return: Dictionary of values.
+        """
+        if product_id:
+            w = self.pool.get('product.product').browse(cr, uid, product_id, context)
+            v = {
+                'product_uom': w.uom_id.id,
+                'product_uos': w.uos_id and w.uos_id.id or w.uom_id.id
+            }
+            return {'value': v}
+        return {}
+
+    def check_product(self, cr, uid, ids):
+        """ Checks product type.
+        @return: True or False 
+        """
+        for procurement in self.browse(cr, uid, ids):
+            if procurement.product_id.type in ('product', 'consu'):
+                return True
+        return False
+
+    def check_move_cancel(self, cr, uid, ids, context={}):
+        """ Checks if move is cancelled or not.
+        @return: True or False. 
+        """
+        res = True
+        ok = False
+        for procurement in self.browse(cr, uid, ids, context):
+            if procurement.move_id:
+                ok = True
+                if not procurement.move_id.state == 'cancel':
+                    res = False
+        return res and ok
+
+    def check_move_done(self, cr, uid, ids, context={}):
+        """ Checks if move is done or not.
+        @return: True or False. 
+        """
+        res = True
+        for proc in self.browse(cr, uid, ids, context):
+            if proc.move_id:
+                if not proc.move_id.state == 'done':
+                    res = False
+        return res
+
+    #
+    # This method may be overrided by objects that override mrp.procurment
+    # for computing their own purpose
+    #
+    def _quantity_compute_get(self, cr, uid, proc, context={}):
+        """ Finds sold quantity of product.
+        @param proc: Current procurement.
+        @return: Quantity or False.
+        """
+        if proc.product_id.type == 'product':
+            if proc.move_id.product_uos:
+                return proc.move_id.product_uos_qty
+        return False
+
+    def _uom_compute_get(self, cr, uid, proc, context={}):
+        """ Finds UoS if product is Stockable Product. 
+        @param proc: Current procurement.
+        @return: UoS or False.
+        """
+        if proc.product_id.type == 'product':
+            if proc.move_id.product_uos:
+                return proc.move_id.product_uos.id
+        return False
+
+    #
+    # Return the quantity of product shipped/produced/served, wich may be
+    # different from the planned quantity
+    #
+    def quantity_get(self, cr, uid, id, context={}):
+        """ Finds quantity of product used in procurement.
+        @return: Quantity of product. 
+        """
+        proc = self.browse(cr, uid, id, context)
+        result = self._quantity_compute_get(cr, uid, proc, context)
+        if not result:
+            result = proc.product_qty
+        return result
+
+    def uom_get(self, cr, uid, id, context=None):
+        """ Finds UoM of product used in procurement.
+        @return: UoM of product. 
+        """
+        proc = self.browse(cr, uid, id, context)
+        result = self._uom_compute_get(cr, uid, proc, context)
+        if not result:
+            result = proc.product_uom.id
+        return result
+
+    def check_waiting(self, cr, uid, ids, context=[]):
+        """ Checks state of move.
+        @return: True or False 
+        """
+        for procurement in self.browse(cr, uid, ids, context=context):
+            if procurement.move_id and procurement.move_id.state == 'auto':
+                return True
+        return False
+
+    def check_produce_service(self, cr, uid, procurement, context=[]):
+        return True
+
+    def check_produce_product(self, cr, uid, procurement, context=[]):
+        """ Finds BoM of a product if not found writes exception message.
+        @param procurement: Current procurement.
+        @return: True or False.
+        """
+        return True
+
+    def check_make_to_stock(self, cr, uid, ids, context={}):
+        """ Checks product type.
+        @return: True or False 
+        """
+        ok = True
+        for procurement in self.browse(cr, uid, ids, context=context):
+            if procurement.product_id.type == 'service':
+                ok = ok and self._check_make_to_stock_service(cr, uid, procurement, context)
+            else:
+                ok = ok and self._check_make_to_stock_product(cr, uid, procurement, context)
+        return ok
+
+    def check_produce(self, cr, uid, ids, context={}):
+        """ Checks product type.
+        @return: True or Product Id.
+        """
+        res = True
+        user = self.pool.get('res.users').browse(cr, uid, uid)
+        for procurement in self.browse(cr, uid, ids):
+            if procurement.product_id.product_tmpl_id.supply_method <> 'produce':
+                if procurement.product_id.seller_ids:
+                    partner = procurement.product_id.seller_ids[0].name
+                    if user.company_id and user.company_id.partner_id:
+                        if partner.id == user.company_id.partner_id.id:
+                            return True
+                return False
+            if procurement.product_id.product_tmpl_id.type=='service':
+                res = res and self.check_produce_service(cr, uid, procurement, context)
+            else:
+                res = res and self.check_produce_product(cr, uid, procurement, context)
+            if not res:
+                return False
+        return res
+
+    def check_buy(self, cr, uid, ids):
+        """ Checks product type.
+        @return: True or Product Id.
+        """
+        user = self.pool.get('res.users').browse(cr, uid, uid)
+        partner_obj = self.pool.get('res.partner')
+        for procurement in self.browse(cr, uid, ids):
+            if procurement.product_id.product_tmpl_id.supply_method <> 'buy':
+                return False
+            if not procurement.product_id.seller_ids:
+                cr.execute('update mrp_procurement set message=%s where id=%s', (_('No supplier defined for this product !'), procurement.id))
+                return False
+            partner = procurement.product_id.seller_ids[0].name
+            if user.company_id and user.company_id.partner_id:
+                if partner.id == user.company_id.partner_id.id:
+                    return False
+            address_id = partner_obj.address_get(cr, uid, [partner.id], ['delivery'])['delivery']
+            if not address_id:
+                cr.execute('update mrp_procurement set message=%s where id=%s', (_('No address defined for the supplier'), procurement.id))
+                return False
+        return True
+
+    def test_cancel(self, cr, uid, ids):
+        """ Tests whether state of move is cancelled or not. 
+        @return: True or False
+        """
+        for record in self.browse(cr, uid, ids):
+            if record.move_id and record.move_id.state == 'cancel':
+                return True
+        return False
+
+    def action_confirm(self, cr, uid, ids, context={}):
+        """ Confirms procurement and writes exception message if any.
+        @return: True
+        """
+        move_obj = self.pool.get('stock.move')
+        for procurement in self.browse(cr, uid, ids):
+            if procurement.product_qty <= 0.00:
+                raise osv.except_osv(_('Data Insufficient !'), _('Please check the Quantity of Procurement Order(s), it should not be less than 1!'))
+            if procurement.product_id.type in ('product', 'consu'):
+                if not procurement.move_id:
+                    source = procurement.location_id.id
+                    if procurement.procure_method == 'make_to_order':
+                        source = procurement.product_id.product_tmpl_id.property_stock_procurement.id
+                    id = move_obj.create(cr, uid, {
+                        'name': 'PROC:' + procurement.name,
+                        'location_id': source,
+                        'location_dest_id': procurement.location_id.id,
+                        'product_id': procurement.product_id.id,
+                        'product_qty': procurement.product_qty,
+                        'product_uom': procurement.product_uom.id,
+                        'date_planned': procurement.date_planned,
+                        'state': 'confirmed',
+                        'company_id': procurement.company_id.id,
+                    })
+                    self.write(cr, uid, [procurement.id], {'move_id': id, 'close_move': 1})
+                else:
+                    # TODO: check this
+                    if procurement.procure_method == 'make_to_stock' and procurement.move_id.state in ('waiting',):
+                        id = move_obj.write(cr, uid, [procurement.move_id.id], {'state':'confirmed'})
+        self.write(cr, uid, ids, {'state': 'confirmed', 'message': ''})
+        return True
+
+    def action_move_assigned(self, cr, uid, ids, context={}):
+        """ Changes procurement state to Running and writes message.
+        @return: True 
+        """
+        self.write(cr, uid, ids, {'state': 'running', 'message': _('from stock: products assigned.')})
+        return True
+
+    def _check_make_to_stock_service(self, cr, uid, procurement, context={}):
+        return True
+
+    def _check_make_to_stock_product(self, cr, uid, procurement, context={}):
+        """ Checks procurement move state.
+        @param procurement: Current procurement.
+        @return: True or move id.
+        """
+        ok = True
+        if procurement.move_id:
+            id = procurement.move_id.id
+            if not (procurement.move_id.state in ('done','assigned','cancel')):
+                ok = ok and self.pool.get('stock.move').action_assign(cr, uid, [id])
+                cr.execute('select count(id) from stock_warehouse_orderpoint where product_id=%s', (procurement.product_id.id,))
+                if not cr.fetchone()[0]:
+                    cr.execute('update mrp_procurement set message=%s where id=%s', (_('from stock and no minimum orderpoint rule defined'), procurement.id))
+        return ok
+
+    def action_produce_assign_service(self, cr, uid, ids, context={}):
+        """ Changes procurement state to Running.
+        @return: True 
+        """
+        for procurement in self.browse(cr, uid, ids):
+            self.write(cr, uid, [procurement.id], {'state': 'running'})
+        return True
+
+    def action_produce_assign_product(self, cr, uid, ids, context={}):
+        """ This is action which call from workflow to assign production order to procurements
+        @return: True
+        """
+        return 0
+
+    
+    def action_po_assign(self, cr, uid, ids, context={}):
+        """ This is action which call from workflow to assign purchase order to procurements
+        @return: True
+        """
+        return 0
+
+    def action_cancel(self, cr, uid, ids):
+        """ Cancels procurement and writes move state to Assigned.
+        @return: True 
+        """
+        todo = []
+        todo2 = []
+        move_obj = self.pool.get('stock.move')
+        for proc in self.browse(cr, uid, ids):
+            if proc.close_move:
+                if proc.move_id.state not in ('done', 'cancel'):
+                    todo2.append(proc.move_id.id)
+            else:
+                if proc.move_id and proc.move_id.state == 'waiting':
+                    todo.append(proc.move_id.id)
+        if len(todo2):
+            move_obj.action_cancel(cr, uid, todo2)
+        if len(todo):
+            move_obj.write(cr, uid, todo, {'state': 'assigned'})
+        self.write(cr, uid, ids, {'state': 'cancel'})
+        wf_service = netsvc.LocalService("workflow")
+        for id in ids:
+            wf_service.trg_trigger(uid, 'mrp.procurement', id, cr)
+        return True
+
+    def action_check_finnished(self, cr, uid, ids):
+        return self.check_move_done(cr, uid, ids)
+
+    def action_check(self, cr, uid, ids):
+        """ Checks procurement move state whether assigned or done. 
+        @return: True 
+        """
+        ok = False
+        for procurement in self.browse(cr, uid, ids):
+            if procurement.move_id.state == 'assigned' or procurement.move_id.state == 'done':
+                self.action_done(cr, uid, [procurement.id])
+                ok = True
+        return ok
+
+    def action_ready(self, cr, uid, ids):
+        """ Changes procurement state to Ready.
+        @return: True 
+        """
+        res = self.write(cr, uid, ids, {'state': 'ready'})
+        return res
+
+    def action_done(self, cr, uid, ids):
+        """ Changes procurement state to Done and writes Closed date.
+        @return: True 
+        """
+        move_obj = self.pool.get('stock.move')
+        for procurement in self.browse(cr, uid, ids):
+            if procurement.move_id:
+                if procurement.close_move and (procurement.move_id.state <> 'done'):
+                    move_obj.action_done(cr, uid, [procurement.move_id.id])
+        res = self.write(cr, uid, ids, {'state': 'done', 'date_close': time.strftime('%Y-%m-%d')})
+        wf_service = netsvc.LocalService("workflow")
+        for id in ids:
+            wf_service.trg_trigger(uid, 'mrp.procurement', id, cr)
+        return res
+
+    def run_scheduler(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
+        ''' Runs through scheduler.
+        @param use_new_cursor: False or the dbname
+        '''
+        if not context:
+            context={}
+        self._procure_confirm(cr, uid, use_new_cursor=use_new_cursor, context=context)
+        self._procure_orderpoint_confirm(cr, uid, automatic=automatic,\
+                use_new_cursor=use_new_cursor, context=context)
+        
+mrp_procurement()
+
+
+class stock_warehouse_orderpoint(osv.osv):
+    """
+    Defines Minimum stock rules.
+    """
+    _name = "stock.warehouse.orderpoint"
+    _description = "Orderpoint minimum rule"
+    
+    _columns = {
+        'name': fields.char('Name', size=32, required=True),
+        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the orderpoint without removing it."),
+        'logic': fields.selection([('max','Order to Max'),('price','Best price (not yet active!)')], 'Reordering Mode', required=True),
+        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True),
+        'location_id': fields.many2one('stock.location', 'Location', required=True),
+        'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type','=','product')]),
+        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True ),
+        'product_min_qty': fields.float('Min Quantity', required=True,
+            help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
+            "a procurement to bring the virtual stock to the Max Quantity."),
+        'product_max_qty': fields.float('Max Quantity', required=True,
+            help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
+            "a procurement to bring the virtual stock to the Max Quantity."),
+        'qty_multiple': fields.integer('Qty Multiple', required=True,
+            help="The procurement quantity will by rounded up to this multiple."),
+        'procurement_id': fields.many2one('mrp.procurement', 'Latest procurement'),
+        'company_id': fields.many2one('res.company','Company',required=True),
+    }
+    _defaults = {
+        'active': lambda *a: 1,
+        'logic': lambda *a: 'max',
+        'qty_multiple': lambda *a: 1,
+        'name': lambda x,y,z,c: x.pool.get('ir.sequence').get(y,z,'mrp.warehouse.orderpoint') or '',
+        'product_uom': lambda sel, cr, uid, context: context.get('product_uom', False),
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.warehouse.orderpoint', context=c)
+    }
+    
+    def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context={}):
+        """ Finds location id for changed warehouse.
+        @param warehouse_id: Changed id of warehouse.
+        @return: Dictionary of values.
+        """
+        if warehouse_id:
+            w = self.pool.get('stock.warehouse').browse(cr, uid, warehouse_id, context)
+            v = {'location_id': w.lot_stock_id.id}
+            return {'value': v}
+        return {}
+    
+    def onchange_product_id(self, cr, uid, ids, product_id, context={}):
+        """ Finds UoM for changed product.
+        @param product_id: Changed id of product.
+        @return: Dictionary of values.
+        """
+        if product_id:
+            prod = self.pool.get('product.product').browse(cr,uid,product_id)
+            v = {'product_uom': prod.uom_id.id}
+            return {'value': v}
+        return {}
+    
+    def copy(self, cr, uid, id, default=None,context={}):
+        if not default:
+            default = {}
+        default.update({
+            'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.warehouse.orderpoint') or '',
+        })
+        return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context)
+    
+stock_warehouse_orderpoint()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_procurement/mrp_procurement_data.xml b/addons/mrp_procurement/mrp_procurement_data.xml
new file mode 100644
index 00000000000..256472bd2fd
--- /dev/null
+++ b/addons/mrp_procurement/mrp_procurement_data.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        
+        <record forcecreate="True" id="ir_cron_scheduler_action" model="ir.cron">
+            <field name="name">Run mrp scheduler</field>
+            <field eval="False" name="active"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall"/>
+            <field eval="'mrp.procurement'" name="model"/>
+            <field eval="'run_scheduler'" name="function"/>
+            <field eval="'(False,)'" name="args"/>
+        </record>
+        
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/mrp_procurement/mrp_procurement_view.xml b/addons/mrp_procurement/mrp_procurement_view.xml
new file mode 100644
index 00000000000..8acbf2e8c29
--- /dev/null
+++ b/addons/mrp_procurement/mrp_procurement_view.xml
@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>		
+		<!--
+        Procurement
+        -->
+        
+        <menuitem id="menu_mrp_procurement" name="Procurements" 
+        	      parent="base.menu_base_partner" sequence="5"/>
+        	      
+        <menuitem name="Procurement Control" id="menu_mrp_control" 
+                  parent="mrp_procurement.menu_mrp_procurement"  sequence="3" />
+
+		<!--
+        Property / Property Group
+        -->
+
+        <record id="mrp_property_group_form_view" model="ir.ui.view">
+            <field name="name">mrp.property.group.form</field>
+            <field name="model">mrp.property.group</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Properties categories">
+                    <separator colspan="4" string="General Information"/>
+                    <field colspan="4" name="name" select="1"/>
+                    <field colspan="4" name="description"/>
+                </form>
+            </field>
+        </record>
+        <record id="mrp_property_group_action" model="ir.actions.act_window">
+            <field name="name">Property Categories</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.property.group</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem
+            id="menu_mrp_configuration"
+            name="Configuration"
+            parent="mrp_procurement.menu_mrp_procurement"
+            groups="base.group_extended"
+            sequence="50" />
+
+        <record id="mrp_property_tree_view" model="ir.ui.view">
+            <field name="name">mrp.property.tree</field>
+            <field name="model">mrp.property</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Properties">
+                    <field name="name"/>
+                    <field name="composition"/>
+                    <field name="group_id"/>
+                </tree>
+            </field>
+        </record>
+        <record id="mrp_property_form_view" model="ir.ui.view">
+            <field name="name">mrp.property.form</field>
+            <field name="model">mrp.property</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Properties">
+                    <separator colspan="4" string="General Information"/>
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="group_id" select="1"/>
+                    <field name="composition" select="1"/>
+                    <separator colspan="4" string="Description"/>
+                    <field colspan="4" name="description"/>
+                </form>
+            </field>
+        </record>
+        <record id="mrp_property_action" model="ir.actions.act_window">
+            <field name="name">Properties</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.property</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem name="Properties"
+            id="menu_mrp_property"
+            parent="menu_mrp_configuration"
+            groups="base.group_extended"
+            sequence="20" />
+        <menuitem
+            action="mrp_property_action"
+            id="menu_mrp_property_action"
+            parent="menu_mrp_property"
+            groups="base.group_extended" />
+        <menuitem
+            action="mrp_property_group_action"
+            id="menu_mrp_property_group_action"
+            parent="menu_mrp_property"/>
+
+        <record id="mrp_procurement_tree_view" model="ir.ui.view">
+            <field name="name">mrp.procurement.tree</field>
+            <field name="model">mrp.procurement</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Procurement Lines" colors="red:state=='draft';black:state=='running';green:state=='confirmed';gray:state in ['done','cancel']">
+                    <field name="date_planned" widget="date"/>
+                    <field name="origin"/>
+                    <field name="product_id"/>
+                    <field name="product_qty"/>
+                    <field name="product_uom" string="UOM"/>
+                    <field name="procure_method"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+        <record id="mrp_procurement_form_view" model="ir.ui.view">
+            <field name="name">mrp.procurement.form</field>
+            <field name="model">mrp.procurement</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Procurement">
+                    <group col="2" colspan="2">
+                        <separator colspan="2" string="References"/>
+                        <field name="name" select="1" string="Procurement Reason"/>
+                        <field name="origin"/>
+                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator colspan="2" string="Planification"/>
+                        <field name="date_planned" select="1"/>
+                        <field name="procure_method"/>
+                        <field name="priority" groups="base.group_extended"/>
+                    </group>
+                    <notebook colspan="4">
+                    <page string="Procurement Details">
+                        <separator colspan="4" string="Product &amp; Location"/>
+                        <field name="product_id" select="1" on_change="onchange_product_id(product_id)"/>
+                        <field name="location_id" domain="[('usage','=','internal')]"/>
+                        <field name="product_qty"/>
+                        <field name="product_uom"/>
+
+                        <field name="product_uos_qty" groups="product.group_uos"/>
+                        <field name="product_uos" groups="product.group_uos"/>
+
+                        <separator colspan="4" string="Status"/>
+                        <field colspan="4" name="message" readonly="1"/>
+                        <field name="state" readonly="1"/>
+                        <group col="7" colspan="2">
+                            <button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
+                            <button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
+                            <button name="button_cancel" states="draft,exception,waiting" string="Cancel" icon="gtk-cancel"/>
+                            <button name="button_check" states="confirmed" string="Run     Procurement" icon="gtk-media-play"/>
+                        </group>
+                    </page>
+                    <page string="Extra Information">
+                        <separator colspan="4" string="Details"/>
+                        <field name="move_id" groups="base.group_extended"/>
+                        <field name="date_close"/>
+                        <field name="close_move" groups="base.group_extended"/>
+						<group colspan="4"  groups="base.group_extended">
+	                    	<separator colspan="4" string="Properties" />
+	                        <field colspan="4" name="property_ids" nolabel="1"/>
+	                    </group>
+                    </page>
+                    <page string="Notes">
+                        <separator colspan="4" string="Note" />
+                        <field name="note" colspan="4" nolabel="1"/>
+                    </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+        <record id="view_mrp_procurement_filter" model="ir.ui.view">
+            <field name="name">mrp.procurement.select</field>
+            <field name="model">mrp.procurement</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Procurement">
+                    <group col='10' colspan='4'>
+                       <filter icon="terp-mrp" string="Current" domain="[('state','in',('draft','confirmed'))]" default="1" help="Procurement Orders in draft or open state."/>
+                       <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement Orders with exceptions"/>
+                       <filter icon="terp-mrp" string="Late"
+                           domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
+                           help="Procurement started late" />
+                       <separator orientation="vertical"/>
+                       <field name="name"/>
+                       <field name="origin"/>
+                       <field name="product_id" />
+                       <field name="date_planned" widget="date"/>
+                       <field name="state" />
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By" colspan="4" col="8">
+                        <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Reason" icon="terp-mrp" domain="[]" context="{'group_by':'name'}"/>
+                        <filter string="Scheduled Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+        <record id="mrp_procurement_action" model="ir.actions.act_window">
+            <field name="name">Procurement Orders</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.procurement</field>
+            <field name="view_type">form</field>
+            <field name="view_id" eval="False"/>
+            <field name="search_view_id" ref="view_mrp_procurement_filter"/>
+        </record>
+        <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" 
+        		  parent="mrp_procurement.menu_mrp_procurement" sequence="2" />
+
+        <record id="mrp_procurement_action3" model="ir.actions.act_window">
+            <field name="name">Procurements</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.procurement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_mrp_procurement_filter"/>
+            <field name="domain">[]</field>
+            <field name="context">{}</field>
+        </record>
+
+        <record id="mrp_procurement_action5" model="ir.actions.act_window">
+            <field name="name">Procurement Exceptions</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.procurement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','exception')]</field>
+        </record>
+
+        <menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_exception_action" 
+        		  parent="mrp_procurement.menu_mrp_control" sequence="1" />
+        <record id="mrp_procurement_action4" model="ir.actions.act_window">
+            <field name="name">Procurement Exceptions to Fix</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.procurement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','exception'), ('message', '&lt;&gt;', '')]</field>
+            <field name="filter" eval="True"/>
+        </record>
+
+        <record id="mrp_procurement_action11" model="ir.actions.act_window">
+            <field name="name">Temporary Procurement Exceptions</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.procurement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','exception'), ('message', '=', '')]</field>
+        </record>
+        
+        <!-- Order Point -->
+        <record id="view_warehouse_orderpoint_tree" model="ir.ui.view">
+            <field name="name">stock.warehouse.orderpoint.tree</field>
+            <field name="model">stock.warehouse.orderpoint</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Minimum Stock Rules">
+                    <field name="name"/>
+                    <field name="warehouse_id"/>
+                    <field name="location_id"/>
+                    <field name="product_id"/>
+                    <field name="product_uom"/>
+                    <field name="product_min_qty"/>
+                    <field name="product_max_qty"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="warehouse_orderpoint_search">
+            <field name="name">stock.warehouse.orderpoint.search</field>
+            <field name="model">stock.warehouse.orderpoint</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Minimum Stock Rules Search">
+                    <group col="10" colspan="4">
+                        <field name="name" select="1" />
+                        <field name="warehouse_id" select="1" widget="selection"/>
+                        <field name="location_id" select="1" />
+                        <field name="company_id" select="1" widget="selection"/>
+                        <field name="product_id" select="1"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="4" col="10">
+                        <filter string="Warehouse" icon="terp-stock" domain="[]"  context="{'group_by':'warehouse_id'}"/>
+                        <filter string="Location" icon="terp-stock" domain="[]" context="{'group_by':'location_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="view_warehouse_orderpoint_form" model="ir.ui.view">
+            <field name="name">stock.warehouse.orderpoint.form</field>
+            <field name="model">stock.warehouse.orderpoint</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Minimum Stock Rules">
+                    <group col="2" colspan="2">
+                        <separator string="General Information" colspan="2" />
+                        <field name="name" />
+                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                        <field name="product_uom"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator string="Locations" colspan="2" />
+                        <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
+                        <field name="location_id"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator string="Quantity Rules" colspan="2" />
+                        <field name="product_min_qty"/>
+                        <field name="product_max_qty"/>
+                        <field name="qty_multiple"/>
+                    </group>
+                    <group col="2" colspan="2" groups="base.group_extended">
+                        <separator string="Misc" colspan="2" />
+                        <field name="procurement_id" readonly="1"/>
+                        <field name="active" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_orderpoint_form" model="ir.actions.act_window">
+            <field name="name">Minimum Stock Rules</field>
+            <field name="res_model">stock.warehouse.orderpoint</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_warehouse_orderpoint_tree"/>
+            <field name="search_view_id" ref="warehouse_orderpoint_search" />
+        </record>
+        <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
+        <menuitem action="action_orderpoint_form" id="menu_action_orderpoint_form" parent="menu_mrp_reordering"/>
+
+        <act_window domain="[('warehouse_id', '=', active_id)]" id="act_stock_warehouse_2_stock_warehouse_orderpoint" name="Minimum Stock Rules" res_model="stock.warehouse.orderpoint" src_model="stock.warehouse"/>
+
+        <!-- add product_uom to context to be the default value when adding new orderpoints -->
+        <act_window
+            context="{'product_uom': locals().has_key('uom_id') and uom_id}"
+            domain="[('product_id', '=', active_id)]"
+            id="act_product_product_2_stock_warehouse_orderpoint"
+            name="Minimum Stock Rules"
+            res_model="stock.warehouse.orderpoint"
+            src_model="product.product"/>
+            
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/mrp_procurement/mrp_procurement_workflow.xml b/addons/mrp_procurement/mrp_procurement_workflow.xml
new file mode 100644
index 00000000000..5ab36dd4cb8
--- /dev/null
+++ b/addons/mrp_procurement/mrp_procurement_workflow.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+		<!-- Procurement -->
+
+        <record id="wkf_procurement" model="workflow">
+            <field name="name">mrp.procurement.basic</field>
+            <field name="osv">mrp.procurement</field>
+            <field name="on_create">True</field>
+        </record>
+
+        <record id="act_draft" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="flow_start">True</field>
+            <field name="name">draft</field>
+        </record>
+        <record id="act_cancel" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">cancel</field>
+            <field name="kind">function</field>
+            <field name="action">action_cancel()</field>
+            <field name="flow_stop">True</field>
+        </record>
+        <record id="act_confirm" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">confirm</field>
+            <field name="kind">function</field>
+            <field name="action">action_confirm()</field>
+        </record>
+        <record id="act_confirm_wait" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">confirm_wait</field>
+            <field name="kind">function</field>
+            <field name="action">write({'state':'exception'})</field>
+        </record>
+        <record id="act_confirm_mts" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">confirm_mts</field>
+        </record>
+        <record id="act_confirm_mto" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">confirm_mto</field>
+        </record>
+        <record id="act_make_to_stock" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">make_to_stock</field>
+            <field name="kind">function</field>
+            <field name="action">action_move_assigned()</field>
+        </record>
+        <record id="act_produce_check" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">produce_check</field>
+        </record>
+        <record id="act_produce_service" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">produce_service</field>
+            <field name="kind">function</field>
+            <field name="action">action_produce_assign_service()</field>
+        </record>
+        <record id="act_make_done" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">ready</field>
+            <field name="kind">function</field>
+            <field name="action">action_ready()</field>
+        </record>
+        <record id="act_wait_done" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">wait_done</field>
+            <field name="kind">function</field>
+            <field name="action">write({'state':'waiting'})</field>
+        </record>
+
+        <record id="act_done" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="flow_stop">True</field>
+            <field name="name">done</field>
+            <field name="kind">function</field>
+            <field name="action">action_done()</field>
+        </record>
+
+        <record id="trans_draft_confirm" model="workflow.transition">
+            <field name="act_from" ref="act_draft"/>
+            <field name="act_to" ref="act_confirm"/>
+            <field name="signal">button_confirm</field>
+        </record>
+        <record id="trans_confirm_cancel2" model="workflow.transition">
+            <field name="act_from" ref="act_confirm"/>
+            <field name="act_to" ref="act_wait_done"/>
+            <field name="signal">button_wait_done</field>
+            <field name="condition">True</field>
+        </record>
+        <record id="trans_confirm_wait_done" model="workflow.transition">
+            <field name="act_from" ref="act_wait_done"/>
+            <field name="act_to" ref="act_done"/>
+            <field name="condition">check_move_done()</field>
+            <field name="trigger_model">stock.move</field>
+            <field name="trigger_expr_id">[move_id.id]</field>
+        </record>
+
+        <record id="trans_confirm_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_confirm"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">button_check</field>
+            <field name="condition">test_cancel()</field>
+        </record>
+        <record id="trans_confirm_confirm_wait" model="workflow.transition">
+            <field name="act_from" ref="act_confirm"/>
+            <field name="act_to" ref="act_confirm_wait"/>
+            <field name="signal">button_check</field>
+            <field name="condition">not test_cancel()</field>
+        </record>
+        <record id="trans_confirm_wait_confirm_mto" model="workflow.transition">
+            <field name="act_from" ref="act_confirm_wait"/>
+            <field name="act_to" ref="act_confirm_mto"/>
+            <field name="condition">procure_method=='make_to_order'</field>
+        </record>
+        <record id="trans_confirm_wait_confirm_mts" model="workflow.transition">
+            <field name="act_from" ref="act_confirm_wait"/>
+            <field name="act_to" ref="act_confirm_mts"/>
+            <field name="condition">procure_method=='make_to_stock'</field>
+        </record>
+        <record id="trans_confirm_mts_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_confirm_mts"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">button_cancel</field>
+        </record>
+        <record id="trans_confirm_waiting_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_wait_done"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">button_cancel</field>
+        </record>
+        <record id="trans_confirm_mts_confirm" model="workflow.transition">
+            <field name="act_from" ref="act_confirm_mts"/>
+            <field name="act_to" ref="act_confirm"/>
+            <field name="signal">button_restart</field>
+        </record>
+        <record id="trans_confirm_mto_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_confirm_mto"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">button_cancel</field>
+        </record>
+        <record id="trans_confirm_mto_confirm" model="workflow.transition">
+            <field name="act_from" ref="act_confirm_mto"/>
+            <field name="act_to" ref="act_confirm"/>
+            <field name="signal">button_restart</field>
+        </record>
+        <record id="trans_draft_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_draft"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">button_cancel</field>
+        </record>
+        <record id="trans_confirm_mts_make_to_stock" model="workflow.transition">
+            <field name="act_from" ref="act_confirm_mts"/>
+            <field name="act_to" ref="act_make_to_stock"/>
+            <field name="condition">check_make_to_stock()</field>
+        </record>
+        <record id="trans_confirm_mto_produce_check" model="workflow.transition">
+            <field name="act_from" ref="act_confirm_mto"/>
+            <field name="act_to" ref="act_produce_check"/>
+            <field name="condition">check_produce()</field>
+        </record>
+        <record id="trans_product_check_produce_service" model="workflow.transition">
+            <field name="act_from" ref="act_produce_check"/>
+            <field name="act_to" ref="act_produce_service"/>
+            <field name="condition">not check_product()</field>
+        </record>
+        <record id="trans_make_to_stock_make_done" model="workflow.transition">
+            <field name="act_from" ref="act_make_to_stock"/>
+            <field name="act_to" ref="act_make_done"/>
+            <field name="condition">True</field>
+            <field name="trigger_model" eval="False"/>
+            <field name="trigger_expr_id" eval="False"/>
+        </record>
+        <record id="trans_produce_service_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_produce_service"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">subflow.cancel</field>
+        </record>
+        <record id="trans_produce_service_make_done" model="workflow.transition">
+            <field name="act_from" ref="act_produce_service"/>
+            <field name="act_to" ref="act_make_done"/>
+        </record>
+        <record id="trans_make_done_done" model="workflow.transition">
+            <field name="act_from" ref="act_make_done"/>
+            <field name="act_to" ref="act_done"/>
+            <field name="condition">action_check_finnished()</field>
+        </record>
+        <record id="trans_make_done_confirm" model="workflow.transition">
+            <field name="act_from" ref="act_make_done"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="condition">check_move_cancel()</field>
+        </record>
+    
+    </data>
+</openerp>
diff --git a/addons/mrp_procurement/process/procurement_process.xml b/addons/mrp_procurement/process/procurement_process.xml
new file mode 100644
index 00000000000..0b39dca3a0c
--- /dev/null
+++ b/addons/mrp_procurement/process/procurement_process.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+
+        <!--
+            Process
+        -->
+
+        <record id="process_process_procurementprocess0" model="process.process">
+            <field eval="&quot;&quot;&quot;Procurement&quot;&quot;&quot;" name="name"/>
+            <field name="model_id" ref="mrp_procurement.model_mrp_procurement"/>
+            <field eval="1" name="active"/>
+        </record>
+
+        <!--
+            Process Node
+        -->
+
+        <record id="process_node_procureproducts0" model="process.node">
+            <field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+            <field name="model_id" ref="mrp_procurement.model_mrp_procurement"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;The way to procurement depends on the product type.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Procure Products&quot;&quot;&quot;" name="name"/>
+            <field name="process_id" ref="process_process_procurementprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/mrp/schedulers.py b/addons/mrp_procurement/schedulers.py
similarity index 99%
rename from addons/mrp/schedulers.py
rename to addons/mrp_procurement/schedulers.py
index cc482d95c52..7a89723e5ca 100644
--- a/addons/mrp/schedulers.py
+++ b/addons/mrp_procurement/schedulers.py
@@ -238,4 +238,5 @@ class mrp_procurement(osv.osv):
             cr.close()
         return {}
 mrp_procurement()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_procurement/security/ir.model.access.csv b/addons/mrp_procurement/security/ir.model.access.csv
new file mode 100644
index 00000000000..ce022a730b0
--- /dev/null
+++ b/addons/mrp_procurement/security/ir.model.access.csv
@@ -0,0 +1,9 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_mrp_property_group","mrp.property.group","model_mrp_property_group",,1,0,0,0
+"access_mrp_property","mrp.property","model_mrp_property",,1,0,0,0
+"access_mrp_procurement","mrp.procurement","model_mrp_procurement",,1,0,0,0
+"access_stock_warehouse_orderpoint","stock.warehouse.orderpoint","model_stock_warehouse_orderpoint",,1,0,0,0
+"access_mrp_procurement_compute_all","mrp.procurement.compute.all","model_mrp_procurement_compute_all",,1,0,0,0
+"access_mrp_procurement_orderpoint_compute","mrp.procurement.orderpoint.compute","model_mrp_procurement_orderpoint_compute",,1,0,0,0
+"access_mrp_make_procurement","make.procurement","model_make_procurement",,1,0,0,0
+"access_mrp_make_procurement","mrp.procurement.compute","model_mrp_procurement_compute",,1,0,0,0
diff --git a/addons/mrp_procurement/security/mrp_procurement_security.xml b/addons/mrp_procurement/security/mrp_procurement_security.xml
new file mode 100644
index 00000000000..aa85ee0851a
--- /dev/null
+++ b/addons/mrp_procurement/security/mrp_procurement_security.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data noupdate="0">
+	
+		<record model="ir.rule.group" id="mrp_procurement_rule_group">
+	        <field name="name">mrp_procurement multi-company</field>
+	        <field name="model_id" search="[('model','=','mrp.procurement')]" model="ir.model"/>
+	        <field name="global" eval="True"/>
+	    </record>
+	    <record model="ir.rule" id="mrp_procurement_rule">
+			<field model="ir.model.fields" name="field_id" search="[('model','=','mrp.procurement'),('name','=','company_id')]"/>
+			<field name="operator">child_of</field>
+			<field name="operand">user.company_id.id</field>
+	        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+	        <field name="rule_group" ref="mrp_procurement_rule_group"/>
+	    </record>
+	
+		<record model="ir.rule.group" id="stock_warehouse_orderpoint_rule_group">
+	        <field name="name">stock_warehouse.orderpoint multi-company</field>
+	        <field name="model_id" search="[('model','=','stock.warehouse.orderpoint')]" model="ir.model"/>
+	        <field name="global" eval="True"/>
+	    </record>
+	    <record model="ir.rule" id="stock_warehouse_orderpoint_rule">
+			<field model="ir.model.fields" name="field_id" search="[('model','=','stock.warehouse.orderpoint'),('name','=','company_id')]"/>
+			<field name="operator">child_of</field>
+			<field name="operand">user.company_id.id</field>
+	        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+	        <field name="rule_group" ref="stock_warehouse_orderpoint_rule_group"/>
+	    </record>
+	    
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/mrp_procurement/wizard/__init__.py b/addons/mrp_procurement/wizard/__init__.py
new file mode 100644
index 00000000000..ae70ffbf941
--- /dev/null
+++ b/addons/mrp_procurement/wizard/__init__.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import orderpoint_procurement
+import mrp_procurement
+import schedulers_all
+import make_procurement_product
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/wizard/make_procurement_product.py b/addons/mrp_procurement/wizard/make_procurement_product.py
similarity index 96%
rename from addons/mrp/wizard/make_procurement_product.py
rename to addons/mrp_procurement/wizard/make_procurement_product.py
index a2dd62327bb..96f00b89eb4 100644
--- a/addons/mrp/wizard/make_procurement_product.py
+++ b/addons/mrp_procurement/wizard/make_procurement_product.py
@@ -83,8 +83,8 @@ class make_procurement(osv.osv_memory):
             wf_service.trg_validate(uid, 'mrp.procurement', procure_id, 'button_confirm', cr)
         
         
-        id2 = data_obj._get_id(cr, uid, 'mrp', 'mrp_procurement_tree_view')
-        id3 = data_obj._get_id(cr, uid, 'mrp', 'mrp_procurement_form_view')
+        id2 = data_obj._get_id(cr, uid, 'mrp_procurement', 'mrp_procurement_tree_view')
+        id3 = data_obj._get_id(cr, uid, 'mrp_procurement', 'mrp_procurement_form_view')
         
         if id2:
             id2 = data_obj.browse(cr, uid, id2, context=context).res_id
diff --git a/addons/mrp/wizard/make_procurement_view.xml b/addons/mrp_procurement/wizard/make_procurement_view.xml
similarity index 100%
rename from addons/mrp/wizard/make_procurement_view.xml
rename to addons/mrp_procurement/wizard/make_procurement_view.xml
diff --git a/addons/mrp/wizard/mrp_procurement.py b/addons/mrp_procurement/wizard/mrp_procurement.py
similarity index 100%
rename from addons/mrp/wizard/mrp_procurement.py
rename to addons/mrp_procurement/wizard/mrp_procurement.py
diff --git a/addons/mrp/wizard/mrp_procurement_view.xml b/addons/mrp_procurement/wizard/mrp_procurement_view.xml
similarity index 100%
rename from addons/mrp/wizard/mrp_procurement_view.xml
rename to addons/mrp_procurement/wizard/mrp_procurement_view.xml
diff --git a/addons/mrp/wizard/orderpoint_procurement.py b/addons/mrp_procurement/wizard/orderpoint_procurement.py
similarity index 100%
rename from addons/mrp/wizard/orderpoint_procurement.py
rename to addons/mrp_procurement/wizard/orderpoint_procurement.py
diff --git a/addons/mrp/wizard/orderpoint_procurement_view.xml b/addons/mrp_procurement/wizard/orderpoint_procurement_view.xml
similarity index 100%
rename from addons/mrp/wizard/orderpoint_procurement_view.xml
rename to addons/mrp_procurement/wizard/orderpoint_procurement_view.xml
diff --git a/addons/mrp/wizard/schedulers_all.py b/addons/mrp_procurement/wizard/schedulers_all.py
similarity index 100%
rename from addons/mrp/wizard/schedulers_all.py
rename to addons/mrp_procurement/wizard/schedulers_all.py
diff --git a/addons/mrp/wizard/schedulers_all_view.xml b/addons/mrp_procurement/wizard/schedulers_all_view.xml
similarity index 92%
rename from addons/mrp/wizard/schedulers_all_view.xml
rename to addons/mrp_procurement/wizard/schedulers_all_view.xml
index b8b465e03e9..2866eb97275 100644
--- a/addons/mrp/wizard/schedulers_all_view.xml
+++ b/addons/mrp_procurement/wizard/schedulers_all_view.xml
@@ -30,8 +30,8 @@
             key2="client_action_multi"    
 		    id="action_compute_schedulers"/>            
         
-        <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="4"/>
-        <menuitem action="action_compute_schedulers" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" sequence="90"/>
+        <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="menu_mrp_procurement" sequence="4"/>
+        <menuitem action="action_compute_schedulers" id="mrp_Sched_all" parent="mrp_procurement.menu_mrp_scheduler" sequence="90"/>
 		
 	</data>
 </openerp>	
diff --git a/addons/point_of_sale/posrule_data.xml b/addons/point_of_sale/posrule_data.xml
index 05313a72d51..b536e2a25b7 100644
--- a/addons/point_of_sale/posrule_data.xml
+++ b/addons/point_of_sale/posrule_data.xml
@@ -174,7 +174,7 @@
       ref('stock.menu_action_picking_tree7'),
 	 		ref('stock.menu_action_picking_tree8'),
       ref('stock.menu_action_picking_tree9'),
-	 		ref('mrp.menu_mrp_procurement_action3'),
+	 		ref('mrp_procurement.menu_mrp_procurement_action3'),
 	 		ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
 			<field eval="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
  				<field eval="[(6,0,[ref('point_of_sale.ir_rule_group_point0'),ref('point_of_sale.ir_rule_group_poslinecompany0'),ref('point_of_sale.ir_rule_group_posreporting0')])]" name="rule_groups"/>
@@ -211,7 +211,7 @@
 		</record>
 
 		<record id="ir_modelsmrp_pdt0" model="ir.model.access">
-			<field name="model_id" ref="mrp.model_mrp_procurement"/>
+			<field name="model_id" ref="mrp_procurement.model_mrp_procurement"/>
 			<field eval="1" name="perm_read"/>
 			<field eval="&quot;&quot;&quot;MRP - Procurement&quot;&quot;&quot;" name="name"/>
 			<field eval="0" name="perm_unlink"/>
@@ -553,7 +553,7 @@
 			<field name="group_id" ref="res_groups_posuser0"/>
 		</record>
         <record id="ir_model_access_procurement0" model="ir.model.access">
-            <field name="model_id" ref="mrp.model_mrp_procurement" />
+            <field name="model_id" ref="mrp_procurement.model_mrp_procurement" />
             <field eval="1" name="perm_read" />
             <field eval="1" name="perm_write" />
             <field eval="1" name="perm_create" />
diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml
index 66e4ba84c37..6b756eb8d7f 100644
--- a/addons/product/partner_view.xml
+++ b/addons/product/partner_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <page string="Sales &amp; Purchases" position="inside">
                     <newline/>
-                    <group col="2" colspan="2" name="sale_list">
+                    <group col="2" colspan="2">
                         <separator string="Sales Properties" colspan="2"/>
                         <field name="property_product_pricelist"/>
                     </group>
diff --git a/addons/purchase/__init__.py b/addons/purchase/__init__.py
index 41c673c0104..301e32ebca9 100644
--- a/addons/purchase/__init__.py
+++ b/addons/purchase/__init__.py
@@ -25,6 +25,7 @@ import stock
 import wizard
 import report
 import stock
+import company
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 6687b330b2c..909b785fe72 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -31,7 +31,7 @@
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'account', 'stock', 'process'],
+    'depends': ['base', 'account', 'stock', 'process', 'mrp_procurement'],
     'init_xml': [],
     'update_xml': [
                    
@@ -39,6 +39,7 @@
         'security/ir.model.access.csv',
         'purchase_workflow.xml',
         'purchase_sequence.xml',
+        'company_view.xml',
         'purchase_data.xml',
         'wizard/purchase_order_group_view.xml',
         'wizard/purchase_installer.xml',
diff --git a/addons/purchase/company.py b/addons/purchase/company.py
new file mode 100644
index 00000000000..2a01605782c
--- /dev/null
+++ b/addons/purchase/company.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv,fields
+
+class company(osv.osv):
+    _inherit = 'res.company'
+    _columns = {
+        'po_lead': fields.float('Purchase Lead Time', required=True,
+            help="This is the leads/security time for each purchase order."),
+    }
+    _defaults = {
+        'po_lead': lambda *a: 1.0,
+    }
+company()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/company_view.xml b/addons/purchase/company_view.xml
new file mode 100644
index 00000000000..d7707fe32c7
--- /dev/null
+++ b/addons/purchase/company_view.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+
+        <record id="mrp_company" model="ir.ui.view">
+            <field name="name">res.company.mrp.config</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+                <page string="Configuration" position="inside">
+                    <field name="po_lead"/>
+                </page>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index 1e88cf50e12..e747005178e 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -8,12 +8,14 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="priority">36</field>
             <field name="arch" type="xml">
-                <group name="sale_list" position="after" groups="base.group_extended">
-                    <group colspan="2" col="2" groups="base.group_extended">
-                        <separator string="Purchases Properties" colspan="2"/>
-                        <field name="property_product_pricelist_purchase"/>
-                    </group>
-                </group>
+	            <page string="Sales &amp; Purchases" position="inside">
+	                <group groups="base.group_extended">
+	                    <group colspan="2" col="2" groups="base.group_extended">
+	                        <separator string="Purchases Properties" colspan="2"/>
+	                        <field name="property_product_pricelist_purchase"/>
+	                    </group>
+	                </group>
+	             </page>
             </field>
         </record>
 
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 2bcc62c06ac..79030850e84 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+from mx import DateTime
 from osv import fields
 from osv import osv
 import time
@@ -692,5 +693,86 @@ class purchase_order_line(osv.osv):
         return True    
 purchase_order_line()
 
+class mrp_procurement(osv.osv):
+    _inherit = 'mrp.procurement'
+    _columns = {
+        'purchase_id': fields.many2one('purchase.order', 'Purchase Order'),
+    }
+    
+    def action_po_assign(self, cr, uid, ids, context={}):
+        """ This is action which call from workflow to assign purchase order to procurements
+        @return: True
+        """
+        res = self.make_po(cr, uid, ids, context=context)
+        res = res.values()
+        return len(res) and res[0] or 0 #TO CHECK: why workflow is generated error if return not integer value
+
+    def make_po(self, cr, uid, ids, context={}):
+        """ Make purchase order from procurement
+        @return: New created Purchase Orders procurement wise
+        """
+        res = {}
+        company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
+        partner_obj = self.pool.get('res.partner')
+        uom_obj = self.pool.get('product.uom')
+        pricelist_obj = self.pool.get('product.pricelist')
+        prod_obj = self.pool.get('product.product')
+        acc_pos_obj = self.pool.get('account.fiscal.position')
+        po_obj = self.pool.get('purchase.order')
+        for procurement in self.browse(cr, uid, ids):
+            res_id = procurement.move_id.id
+            partner = procurement.product_id.seller_ids[0].name
+            partner_id = partner.id
+            address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
+            pricelist_id = partner.property_product_pricelist_purchase.id
+
+            uom_id = procurement.product_id.uom_po_id.id
+
+            qty = uom_obj._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, uom_id)
+            if procurement.product_id.seller_ids[0].qty:
+                qty = max(qty,procurement.product_id.seller_ids[0].qty)
+
+            price = pricelist_obj.price_get(cr, uid, [pricelist_id], procurement.product_id.id, qty, False, {'uom': uom_id})[pricelist_id]
+
+            newdate = DateTime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S')
+            newdate = newdate - DateTime.RelativeDateTime(days=company.po_lead)
+            newdate = newdate - procurement.product_id.seller_ids[0].delay
+
+            #Passing partner_id to context for purchase order line integrity of Line name
+            context.update({'lang': partner.lang, 'partner_id': partner_id})
+
+            product = prod_obj.browse(cr, uid, procurement.product_id.id, context=context)
+
+            line = {
+                'name': product.partner_ref,
+                'product_qty': qty,
+                'product_id': procurement.product_id.id,
+                'product_uom': uom_id,
+                'price_unit': price,
+                'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
+                'move_dest_id': res_id,
+                'notes': product.description_purchase,
+            }
+
+            taxes_ids = procurement.product_id.product_tmpl_id.supplier_taxes_id
+            taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids)
+            line.update({
+                'taxes_id': [(6,0,taxes)]
+            })
+            purchase_id = po_obj.create(cr, uid, {
+                'origin': procurement.origin,
+                'partner_id': partner_id,
+                'partner_address_id': address_id,
+                'location_id': procurement.location_id.id,
+                'pricelist_id': pricelist_id,
+                'order_line': [(0,0,line)],
+                'company_id': procurement.company_id.id,
+                'fiscal_position': partner.property_account_position and partner.property_account_position.id or False
+            })
+            res[procurement.id] = purchase_id
+            self.write(cr, uid, [procurement.id], {'state': 'running'}) #, 'purchase_id': purchase_id
+        return res
+mrp_procurement()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index c301116db2a..fe6fa0a5e80 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -322,7 +322,22 @@
             <field name="act_window_id" ref="purchase_line_form_action2"/>
         </record>
          <menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" parent="menu_procurement_management_invoice"/>
-
+		
+		<!-- 
+        	Procurements
+        -->
+         
+        <record id="view_procurement_form_inherit" model="ir.ui.view">
+        	<field name="name">mrp.procurement.form.inherit</field>
+        	<field name="model">mrp.procurement</field>
+        	<field name="inherit_id" ref="mrp_procurement.mrp_procurement_form_view"/>
+        	<field name="type">form</field>
+        	<field name="arch" type="xml">
+        		<xpath expr="/form/notebook/page/field[@name='close_move']" position="before">
+        			<field name="purchase_id"/>
+        		</xpath>
+        	</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index 26f83d5a554..b8171cf5e53 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -177,6 +177,27 @@
             <field name="act_from" ref="act_invoice_end"/>
             <field name="act_to" ref="act_done"/>
         </record>
+	
+	<!-- Procurement -->
+		<record id="act_buy" model="workflow.activity">
+            <field name="wkf_id" ref="mrp_procurement.wkf_procurement"/>
+            <field name="name">buy</field>
+            <field name="kind">subflow</field>
+            <field name="subflow_id" search="[('osv','=','purchase.order')]"/>
+            <field name="action">action_po_assign()</field>
+        </record>
+        
+        <record id="trans_confirm_mto_buy" model="workflow.transition">
+            <field name="act_from" ref="mrp_procurement.act_confirm_mto"/>
+            <field name="act_to" ref="act_buy"/>
+            <field name="condition">check_buy()</field>
+        </record>
+        
+        <record id="trans_buy_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_buy"/>
+            <field name="act_to" ref="mrp_procurement.act_cancel"/>
+            <field name="signal">subflow.cancel</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py
index ebc12a1089e..71f33623c55 100644
--- a/addons/sale/__init__.py
+++ b/addons/sale/__init__.py
@@ -26,9 +26,10 @@
 import sale
 import stock
 import product
-import mrp
+#import mrp
 import wizard
 import report
+import company
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index a6ff79b38cd..987b333888f 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -42,13 +42,14 @@
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['product', 'stock', 'mrp', 'process'],
+    'depends': ['product', 'stock', 'mrp_procurement', 'process'],
     'init_xml': [],
     'update_xml': [
         'wizard/sale_make_invoice_advance.xml',
         'wizard/sale_line_invoice.xml',
         'security/sale_security.xml',
         'security/ir.model.access.csv',
+        'company_view.xml',
         'sale_workflow.xml',
         'sale_sequence.xml',
         'sale_data.xml',
diff --git a/addons/sale/company.py b/addons/sale/company.py
new file mode 100644
index 00000000000..401a1a9c1d8
--- /dev/null
+++ b/addons/sale/company.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv,fields
+
+class company(osv.osv):
+    _inherit = 'res.company'
+    _columns = {
+        'security_lead': fields.float('Security Days', required=True,
+            help="This is the days added to what you promise to customers "\
+            "for security purpose"),
+    }
+    _defaults = {
+        'security_lead': lambda *a: 5.0,
+    }
+company()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/company_view.xml b/addons/sale/company_view.xml
new file mode 100644
index 00000000000..ead9128d6f3
--- /dev/null
+++ b/addons/sale/company_view.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+
+        <record id="mrp_company" model="ir.ui.view">
+            <field name="name">res.company.mrp.config</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+                <page string="Configuration" position="inside">
+                    <field name="security_lead"/>
+                </page>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index 5da1a96f8d4..58e4be14d84 100755
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -35,7 +35,7 @@
             <field eval="&quot;&quot;&quot;Sale Order Requisition&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Drives procurement orders for every sale order line.&quot;&quot;&quot;" name="note"/>
             <field name="subflow_id" ref="process_process_salesprocess0"/>
-            <field name="process_id" ref="mrp.process_process_procurementprocess0"/>
+            <field name="process_id" ref="mrp_procurement.process_process_procurementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'waiting_date', 'manual', 'progress', 'shipping_except', 'invoice_except', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
@@ -63,12 +63,12 @@
         </record>
 
         <record id="process_node_saleprocurement0" model="process.node">
-            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
-            <field name="model_id" ref="mrp.model_mrp_procurement"/>
+            <field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+            <field name="model_id" ref="mrp_procurement.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Procurement Order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;One Procurement order for each sale order line and for each of the components.&quot;&quot;&quot;" name="note"/>
-            <field name="subflow_id" ref="mrp.process_process_procurementprocess0"/>
+            <field name="subflow_id" ref="mrp_procurement.process_process_procurementprocess0"/>
             <field name="process_id" ref="process_process_salesprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='confirmed'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
@@ -202,7 +202,7 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Procurement of sold material&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;For every sale order line, a procurement order is created to supply the sold product.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="mrp.process_node_procureproducts0"/>
+            <field model="process.node" name="target_node_id" ref="mrp_procurement.process_node_procureproducts0"/>
             <field model="process.node" name="source_node_id" ref="process_node_saleorderprocurement0"/>
         </record>
 
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 259b5d75e39..d6ab6a7bc0c 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+    
+		<!--    
+	Resource: res.company
+	-->
+		<record id="res_company_shop_sale0" model="res.company">
+            <field eval="5.0" name="security_lead"/>
+            <field name="partner_id" ref="stock.res_partner_tinyshop0"/>
+            <field name="parent_id" ref="stock.res_company_shop0"/>
+            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
+        </record>
 
         <!--
 	Resource: sale.order
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 7433520234e..7a12e9dbad0 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -163,8 +163,8 @@
                                             <field groups="product.group_uos" name="product_uos"/>
                                             <field name="th_weight"/>
                                             <field name="address_allotment_id"/>
-                                            <separator colspan="4" string="Properties"/>
-                                            <field colspan="4" name="property_ids" nolabel="1"/>
+<!--                                            <separator colspan="4" string="Properties"/>-->
+<!--                                            <field colspan="4" name="property_ids" nolabel="1"/>-->
                                         </page>
                                         <page string="Notes">
                                             <field colspan="4" name="notes" nolabel="1"/>
@@ -395,9 +395,9 @@
                                     icon="gtk-cancel" />
                             </group>
                         </page>
-                        <page string="Properties" groups="base.group_extended">
-                            <field name="property_ids" nolabel="1"/>
-                        </page>
+<!--                        <page string="Properties" groups="base.group_extended">-->
+<!--                            <field name="property_ids" nolabel="1"/>-->
+<!--                        </page>-->
                         <page string="Notes">
                             <field colspan="4" name="notes" nolabel="1"/>
                         </page>
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 44ce9f7d1fa..7af8c1e74a7 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -11,10 +11,7 @@
 "access_account_analytic_account_salesman","account_analytic_account salesman","analytic.model_account_analytic_account","group_sale_user",1,1,1,1
 "access_stock_picking_salesman","stock_picking salesman","stock.model_stock_picking","group_sale_user",1,1,1,1
 "access_stock_move_salesman","stock_move salesman","stock.model_stock_move","group_sale_user",1,1,1,0
-"access_mrp_property_salesman","mrp.property salesman","mrp.model_mrp_property","group_sale_user",1,0,0,0
-"access_mrp_procurement_salesman","mrp.procurement salesman","mrp.model_mrp_procurement","group_sale_user",1,1,1,1
-"access_sale_order_mrp_user","sale.order mrp worker","model_sale_order","mrp.group_mrp_user",1,0,0,0
-"access_sale_order_line_mrp_user","sale.order.line mrp worker","model_sale_order_line","mrp.group_mrp_user",1,0,0,0
+"access_mrp_procurement_salesman","mrp.procurement salesman","mrp_procurement.model_mrp_procurement","group_sale_user",1,1,1,1
 "access_sale_order_stock_worker","sale.order stock worker","model_sale_order","stock.group_stock_user",1,1,0,0
 "access_sale_order_line_stock_worker","sale.order.line stock worker","model_sale_order_line","stock.group_stock_user",1,1,0,0
 "access_sale_order_manager","sale.order.manager","model_sale_order","group_sale_manager",1,1,1,1
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index de4eccdde55..806722cd24f 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -198,13 +198,9 @@
             <field eval="1" name="active"/>
         </record>
         <record id="res_company_shop0" model="res.company">
-            <field eval="5.0" name="security_lead"/>
             <field name="currency_id" ref="base.EUR"/>
-            <field eval="1.0" name="po_lead"/>
             <field name="partner_id" ref="res_partner_tinyshop0"/>
-            <field eval="1.0" name="manufacturing_lead"/>
             <field name="parent_id" ref="base.main_company"/>
-            <field eval="80.0" name="schedule_range"/>
             <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
         </record>
         <record id="res_partner_tinyshop1" model="res.partner">

From 168c45c06b0657112679276cf8305df82a47c7d9 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 30 Apr 2010 10:33:00 +0530
Subject: [PATCH 30/84] [IMP] purchase_requistion : Improve the yml flow

bzr revid: sbh@tinyerp.com-20100430050300-lqynibvlczh4w0uo
---
 .../test/purchase_requisition_test.yml                     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/purchase_requisition/test/purchase_requisition_test.yml b/addons/purchase_requisition/test/purchase_requisition_test.yml
index b494b9b0143..de4af5c9b6b 100644
--- a/addons/purchase_requisition/test/purchase_requisition_test.yml
+++ b/addons/purchase_requisition/test/purchase_requisition_test.yml
@@ -64,12 +64,17 @@
   !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}:
       partner_id: base.res_partner_4
       partner_address_id: base.res_partner_address_7
+-
+  On the purchase tender, I create a new purchase order for the supplier 'DistriPC' by clicking on
+  the button 'New RfQ'. This opens a window to ask me the supplier and I set DistriPC      
 - 
  !python {model: purchase.requisition}: |
     requisition_obj = self.pool.get('purchase.requisition.partner')
     req_obj = self.pool.get('purchase.requisition')
     ids =req_obj.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
     requisition_obj.create_order(cr,uid, [ref('purchase_requisition_partner_0')],{'active_ids': ids})
+-
+   check that I have two purchase orders on the purchase tender    
 -    
  !python {model: purchase.requisition}: |
     purchase_obj = self.pool.get('purchase.order')
@@ -95,6 +100,8 @@
     for ids in todo: 
       wf_service.trg_validate(uid, 'purchase.order',ids,'purchase_confirm', cr)    
       wf_service.trg_validate(uid, 'purchase.order',ids,'purchase_approve', cr)        
+-
+  Create a record in purchase requisition
 -
    !python {model: purchase.requisition}: | 
      ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0001')])

From 4d9dd72fc695a85c36649d29c10953e8bc8d92a8 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Fri, 30 Apr 2010 12:06:12 +0530
Subject: [PATCH 31/84] [IMP,REF] Task ID-574: Changed references in views used
 for mrp in point_of_sale module. Moved scripts to mrp_procurement.

bzr revid: uco@tinyerp.co.in-20100430063612-oxk45gjwn3ww6r8b
---
 addons/{mrp => mrp_procurement}/scripts/scheduler.py | 0
 addons/point_of_sale/posrule_data.xml                | 4 ++--
 addons/point_of_sale/posrule_data2.xml               | 6 +++---
 addons/point_of_sale/statement_data.xml              | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename addons/{mrp => mrp_procurement}/scripts/scheduler.py (100%)

diff --git a/addons/mrp/scripts/scheduler.py b/addons/mrp_procurement/scripts/scheduler.py
similarity index 100%
rename from addons/mrp/scripts/scheduler.py
rename to addons/mrp_procurement/scripts/scheduler.py
diff --git a/addons/point_of_sale/posrule_data.xml b/addons/point_of_sale/posrule_data.xml
index f5839cfd216..46be7f74be2 100644
--- a/addons/point_of_sale/posrule_data.xml
+++ b/addons/point_of_sale/posrule_data.xml
@@ -230,7 +230,7 @@
 			<field name="group_id" ref="res_groups_posuser0"/>
 		</record>
 		<record id="ir_model_access_stockwarehouseorderpoint0" model="ir.model.access">
-			<field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/>
+			<field name="model_id" ref="mrp_procurement.model_stock_warehouse_orderpoint"/>
 			<field eval="1" name="perm_read"/>
 			<field eval="&quot;&quot;&quot;stock.warehouse.orderpoint&quot;&quot;&quot;" name="name"/>
 			<field eval="0" name="perm_unlink"/>
@@ -521,7 +521,7 @@
             name="Reporting"
             parent="stock.menu_stock_root" groups="base.group_user"/>
 		<menuitem action="stock.action_picking_tree" id="stock.menu_action_picking_tree" parent="stock.menu_stock_root" sequence="19" groups="res_groups_posuser0"/>
-        <menuitem id="mrp.menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4" groups="base.group_user"/>
+        <menuitem id="mrp_procurement.menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4" groups="base.group_user"/>
         <menuitem parent="stock.next_id_61" action="stock.action_stock_line_date" id="stock.menu_report_stock_line_date" groups="base.group_user"/>
 
 	</data>
diff --git a/addons/point_of_sale/posrule_data2.xml b/addons/point_of_sale/posrule_data2.xml
index 680ae25d7b7..927584e92ce 100644
--- a/addons/point_of_sale/posrule_data2.xml
+++ b/addons/point_of_sale/posrule_data2.xml
@@ -177,7 +177,7 @@
       ref('stock.menu_action_picking_tree7'),
 	 		ref('stock.menu_action_picking_tree8'),
       ref('stock.menu_action_picking_tree9'),
-	 		ref('mrp.menu_mrp_procurement_action3'),
+	 		ref('mrp_procurement.menu_mrp_procurement_action3'),
 	 		ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
  				<field eval="[(6,0,[ref('point_of_sale.ir_rule_group_point0'),ref('point_of_sale.ir_rule_group_poslinecompany0'),ref('point_of_sale.ir_rule_group_posreporting0')])]" name="rule_groups"/>
 			<field eva="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
@@ -214,7 +214,7 @@
 		</record>
 
 		<record id="ir_modelsmrp_pdt0" model="ir.model.access">
-			<field name="model_id" ref="mrp.model_mrp_procurement"/>
+			<field name="model_id" ref="mrp_procurement.model_mrp_procurement"/>
 			<field eval="1" name="perm_read"/>
 			<field eval="&quot;&quot;&quot;MRP - Procurement&quot;&quot;&quot;" name="name"/>
 			<field eval="0" name="perm_unlink"/>
@@ -557,7 +557,7 @@
 			<field name="group_id" ref="res_groups_posuser0"/>
 		</record>
         <record id="ir_model_access_procurement0" model="ir.model.access">
-            <field name="model_id" ref="mrp.model_mrp_procurement" />
+            <field name="model_id" ref="mrp_procurement.model_mrp_procurement" />
             <field eval="1" name="perm_read" />
             <field eval="1" name="perm_write" />
             <field eval="1" name="perm_create" />
diff --git a/addons/point_of_sale/statement_data.xml b/addons/point_of_sale/statement_data.xml
index 947348a990d..9964e7ba5eb 100644
--- a/addons/point_of_sale/statement_data.xml
+++ b/addons/point_of_sale/statement_data.xml
@@ -33,7 +33,7 @@
 			<field eval="1" name="global"/>
 		</record>
 		<record id="point_of_sale.res_groups_posuser0" model="res.groups">
- 		<field eval="[(6,0,[ref('product.menu_config_product'),ref('product.menu_product_category_action_form'),ref('point_of_sale.menu_point_ofsale'),ref('point_of_sale.menu_point_config'),ref('point_of_sale.menu_statement_tree_all'),ref('stock.menu_stock_root'),ref('stock.menu_action_location_form'),ref('stock.menu_action_location_tree'),ref('stock.menu_picking_waiting'),ref('stock.menu_action_picking_tree3'),ref('stock.menu_action_picking_tree5'),ref('stock.menu_action_picking_form'),ref('stock.menu_action_picking_tree7'),ref('stock.menu_action_picking_tree8'),ref('stock.menu_action_picking_tree9'),ref('mrp.menu_mrp_procurement_action3'),ref('mrp.menu_mrp_procurement_new'),ref('mrp.next_id_77'),ref('mrp.menu_report_workcenter_load'),ref('mrp.menu_report_in_out_picking'),ref('base.menu_sales'),ref('sale.menu_action_shop_form'),ref('sale.menu_sale_order'),ref('sale.menu_action_order_tree'),ref('sale.menu_action_order_tree_all'),ref('sale.menu_action_order_tree2'),ref('sale.menu_action_order_tree3'),ref('sale.menu_action_order_tree7'),ref('sale.menu_action_order_tree8'),ref('sale.menu_action_order_line_tree1'),ref('delivery.menu_action_delivery_carrier_form'),ref('delivery.menu_action_delivery_grid_form'),ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
+ 		<field eval="[(6,0,[ref('product.menu_config_product'),ref('product.menu_product_category_action_form'),ref('point_of_sale.menu_point_ofsale'),ref('point_of_sale.menu_point_config'),ref('point_of_sale.menu_statement_tree_all'),ref('stock.menu_stock_root'),ref('stock.menu_action_location_form'),ref('stock.menu_action_location_tree'),ref('stock.menu_picking_waiting'),ref('stock.menu_action_picking_tree3'),ref('stock.menu_action_picking_tree5'),ref('stock.menu_action_picking_form'),ref('stock.menu_action_picking_tree7'),ref('stock.menu_action_picking_tree8'),ref('stock.menu_action_picking_tree9'),ref('mrp_procurement.menu_mrp_procurement_action3'),ref('mrp_procurement.menu_mrp_procurement_new'),ref('mrp.next_id_77'),ref('mrp.menu_report_workcenter_load'),ref('mrp.menu_report_in_out_picking'),ref('base.menu_sales'),ref('sale.menu_action_shop_form'),ref('sale.menu_sale_order'),ref('sale.menu_action_order_tree'),ref('sale.menu_action_order_tree_all'),ref('sale.menu_action_order_tree2'),ref('sale.menu_action_order_tree3'),ref('sale.menu_action_order_tree7'),ref('sale.menu_action_order_tree8'),ref('sale.menu_action_order_line_tree1'),ref('delivery.menu_action_delivery_carrier_form'),ref('delivery.menu_action_delivery_grid_form'),ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
 			<field eval="[(6,0,[ref('ir_rule_group_bankstatementcompany0'),ref('ir_rule_group_bankstatementlinecompany0'),ref('point_of_sale.ir_rule_group_point0'),ref('point_of_sale.ir_rule_group_poslinecompany0'),ref('point_of_sale.ir_rule_group_posreporting0')])]" name="rule_groups"/>
 			<field eval="&quot;&quot;&quot;POS_user&quot;&quot;&quot;" name="name"/>
 		</record>

From 4e17fcb8e8dc3073f116c21f3fba3aec813c1ced Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 3 May 2010 16:15:06 +0530
Subject: [PATCH 32/84] [IMP] mrp_procurement: Changed workflow for mrp. Moved
 into mrp file.

bzr revid: uco@tinyerp.com-20100503104506-a9mlyw9husj4tn9e
---
 addons/mrp/mrp_workflow.xml                   | 34 ++++++++++-
 .../mrp_procurement_workflow.xml              | 58 +++++++++----------
 2 files changed, 62 insertions(+), 30 deletions(-)

diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml
index 6f7ef00b3d2..4349c3e8cad 100644
--- a/addons/mrp/mrp_workflow.xml
+++ b/addons/mrp/mrp_workflow.xml
@@ -122,9 +122,41 @@
             <field name="subflow_id" search="[('osv','=','mrp.production')]"/>
             <field name="action">action_produce_assign_product()</field>
         </record>
+        <record id="act_produce_check" model="workflow.activity">
+            <field name="wkf_id" ref="mrp_procurement.wkf_procurement"/>
+            <field name="name">produce_check</field>
+        </record>
+        <record id="act_produce_service" model="workflow.activity">
+            <field name="wkf_id" ref="mrp_procurement.wkf_procurement"/>
+            <field name="name">produce_service</field>
+            <field name="kind">function</field>
+            <field name="action">action_produce_assign_service()</field>
+        </record>
+        
+        <record id="trans_confirm_mto_produce_check" model="workflow.transition">
+            <field name="act_from" ref="mrp_procurement.act_confirm_mto"/>
+            <field name="act_to" ref="act_produce_check"/>
+            <field name="condition">check_produce()</field>
+        </record>
+        <record id="trans_product_check_produce_service" model="workflow.transition">
+            <field name="act_from" ref="act_produce_check"/>
+            <field name="act_to" ref="mrp_procurement.act_produce_service"/>
+            <field name="condition">not check_product()</field>
+        </record>
+        
+        <record id="trans_produce_service_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_produce_service"/>
+            <field name="act_to" ref="mrp_procurement.act_cancel"/>
+            <field name="signal">subflow.cancel</field>
+        </record>
+        
+        <record id="trans_produce_service_make_done" model="workflow.transition">
+            <field name="act_from" ref="act_produce_service"/>
+            <field name="act_to" ref="mrp_procurement.act_make_done"/>
+        </record>
         
         <record id="trans_product_check_produce" model="workflow.transition">
-            <field name="act_from" ref="mrp_procurement.act_produce_check"/>
+            <field name="act_from" ref="act_produce_check"/>
             <field name="act_to" ref="act_produce"/>
             <field name="condition">check_product()</field>
         </record>
diff --git a/addons/mrp_procurement/mrp_procurement_workflow.xml b/addons/mrp_procurement/mrp_procurement_workflow.xml
index 5ab36dd4cb8..46c4a10fffc 100644
--- a/addons/mrp_procurement/mrp_procurement_workflow.xml
+++ b/addons/mrp_procurement/mrp_procurement_workflow.xml
@@ -48,16 +48,16 @@
             <field name="kind">function</field>
             <field name="action">action_move_assigned()</field>
         </record>
-        <record id="act_produce_check" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_procurement"/>
-            <field name="name">produce_check</field>
-        </record>
-        <record id="act_produce_service" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_procurement"/>
-            <field name="name">produce_service</field>
-            <field name="kind">function</field>
-            <field name="action">action_produce_assign_service()</field>
-        </record>
+<!--        <record id="act_produce_check" model="workflow.activity">-->
+<!--            <field name="wkf_id" ref="wkf_procurement"/>-->
+<!--            <field name="name">produce_check</field>-->
+<!--        </record>-->
+<!--        <record id="act_produce_service" model="workflow.activity">-->
+<!--            <field name="wkf_id" ref="wkf_procurement"/>-->
+<!--            <field name="name">produce_service</field>-->
+<!--            <field name="kind">function</field>-->
+<!--            <field name="action">action_produce_assign_service()</field>-->
+<!--        </record>-->
         <record id="act_make_done" model="workflow.activity">
             <field name="wkf_id" ref="wkf_procurement"/>
             <field name="name">ready</field>
@@ -155,16 +155,16 @@
             <field name="act_to" ref="act_make_to_stock"/>
             <field name="condition">check_make_to_stock()</field>
         </record>
-        <record id="trans_confirm_mto_produce_check" model="workflow.transition">
-            <field name="act_from" ref="act_confirm_mto"/>
-            <field name="act_to" ref="act_produce_check"/>
-            <field name="condition">check_produce()</field>
-        </record>
-        <record id="trans_product_check_produce_service" model="workflow.transition">
-            <field name="act_from" ref="act_produce_check"/>
-            <field name="act_to" ref="act_produce_service"/>
-            <field name="condition">not check_product()</field>
-        </record>
+<!--        <record id="trans_confirm_mto_produce_check" model="workflow.transition">-->
+<!--            <field name="act_from" ref="act_confirm_mto"/>-->
+<!--            <field name="act_to" ref="act_produce_check"/>-->
+<!--            <field name="condition">check_produce()</field>-->
+<!--        </record>-->
+<!--        <record id="trans_product_check_produce_service" model="workflow.transition">-->
+<!--            <field name="act_from" ref="act_produce_check"/>-->
+<!--            <field name="act_to" ref="act_produce_service"/>-->
+<!--            <field name="condition">not check_product()</field>-->
+<!--        </record>-->
         <record id="trans_make_to_stock_make_done" model="workflow.transition">
             <field name="act_from" ref="act_make_to_stock"/>
             <field name="act_to" ref="act_make_done"/>
@@ -172,15 +172,15 @@
             <field name="trigger_model" eval="False"/>
             <field name="trigger_expr_id" eval="False"/>
         </record>
-        <record id="trans_produce_service_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_produce_service"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">subflow.cancel</field>
-        </record>
-        <record id="trans_produce_service_make_done" model="workflow.transition">
-            <field name="act_from" ref="act_produce_service"/>
-            <field name="act_to" ref="act_make_done"/>
-        </record>
+<!--        <record id="trans_produce_service_cancel" model="workflow.transition">-->
+<!--            <field name="act_from" ref="act_produce_service"/>-->
+<!--            <field name="act_to" ref="act_cancel"/>-->
+<!--            <field name="signal">subflow.cancel</field>-->
+<!--        </record>-->
+<!--        <record id="trans_produce_service_make_done" model="workflow.transition">-->
+<!--            <field name="act_from" ref="act_produce_service"/>-->
+<!--            <field name="act_to" ref="act_make_done"/>-->
+<!--        </record>-->
         <record id="trans_make_done_done" model="workflow.transition">
             <field name="act_from" ref="act_make_done"/>
             <field name="act_to" ref="act_done"/>

From b5f21a627473f67c9bc4e71e3f7c5a4b4d1c043c Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Tue, 4 May 2010 14:19:08 +0530
Subject: [PATCH 33/84] [IMP] mrp_procurement: Task ID-575: Improved
 mrp_procurement workflow and security rules.

bzr revid: uco@tinyerp.com-20100504084908-1ku1xktvegw908q1
---
 addons/mrp/mrp_workflow.xml                         |  2 +-
 .../security/mrp_procurement_security.xml           | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml
index 4349c3e8cad..791c376ef92 100644
--- a/addons/mrp/mrp_workflow.xml
+++ b/addons/mrp/mrp_workflow.xml
@@ -140,7 +140,7 @@
         </record>
         <record id="trans_product_check_produce_service" model="workflow.transition">
             <field name="act_from" ref="act_produce_check"/>
-            <field name="act_to" ref="mrp_procurement.act_produce_service"/>
+            <field name="act_to" ref="act_produce_service"/>
             <field name="condition">not check_product()</field>
         </record>
         
diff --git a/addons/mrp_procurement/security/mrp_procurement_security.xml b/addons/mrp_procurement/security/mrp_procurement_security.xml
index 7dcebdb7782..a0f2ef431bf 100644
--- a/addons/mrp_procurement/security/mrp_procurement_security.xml
+++ b/addons/mrp_procurement/security/mrp_procurement_security.xml
@@ -2,19 +2,6 @@
 <openerp>
 	<data noupdate="0">
 	
-		<record model="ir.rule.group" id="mrp_procurement_rule_group">
-	        <field name="name">mrp_procurement multi-company</field>
-	        <field name="model_id" search="[('model','=','mrp.procurement')]" model="ir.model"/>
-	        <field name="global" eval="True"/>
-	    </record>
-	    <record model="ir.rule" id="mrp_procurement_rule">
-			<field model="ir.model.fields" name="field_id" search="[('model','=','mrp.procurement'),('name','=','company_id')]"/>
-			<field name="operator">child_of</field>
-			<field name="operand">user.company_id.id</field>
-	        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
-	        <field name="rule_group" ref="mrp_procurement_rule_group"/>
-	    </record>
-	
 	    <record model="ir.rule" id="mrp_procurement_rule">
 	    	<field name="name">mrp_procurement multi-company</field>
 	        <field name="model_id" search="[('model','=','mrp.procurement')]" model="ir.model"/>

From 7650793daca8983170e865d74c4a65f5c9d89fca Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Tue, 4 May 2010 16:44:19 +0530
Subject: [PATCH 34/84] [IMP] stock: Task ID-575 (1) The scraped field on
 stock.move changed to related field. (2) Set a default location wich is the
 location having a scrap checkbox on. (3) Changed location field to selection
 field (widget=selection) (4) Added demo data for scraped locations. (5) When
 a move line is added in picking as scraped it should be converted to grey
 color. (6) Corrected tooltip on buttons for 'Scraped products' in outgoing
 picking-> move lines.

bzr revid: uco@tinyerp.com-20100504111419-6j6tla6zj5kqwtkp
---
 addons/stock/stock.py                   |  2 +-
 addons/stock/stock_data.xml             |  5 ++++
 addons/stock/stock_view.xml             | 10 +++----
 addons/stock/wizard/stock_move.py       | 38 +++++++++++++++++++++++--
 addons/stock/wizard/stock_move_view.xml |  4 +--
 5 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 4cee95a16c2..a4211f8f50d 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1214,7 +1214,7 @@ class stock_move(osv.osv):
         'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin"),
         'move_stock_return_history': fields.many2many('stock.move', 'stock_move_return_history', 'move_id', 'return_move_id', 'Move Return History',readonly=True),
         'delivered_id': fields.many2one('stock.delivery', 'Product delivered'),
-        'scraped': fields.boolean('Scraped'),
+        'scraped': fields.related('location_dest_id','scraped',type='boolean',relation='stock.location',string='Scraped'),
     }
     _constraints = [
         (_check_tracking,
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index 704782eddd8..b53d4bed08d 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -37,6 +37,11 @@
             <field name="usage">view</field>
             <field name="icon">terp-mrp</field>
         </record>
+        <record id="stock_location_scraped" model="stock.location">
+            <field name="name">Scraped</field>
+            <field name="location_id" ref="stock_location_locations_virtual"/>
+            <field name="scraped">True</field>
+        </record>
         
         <record id="location_inventory" model="stock.location">
             <field name="name">Inventory loss</field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 45b95779660..5d2a83f695f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -606,7 +606,7 @@
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
-                                <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Stock Moves">
+                                <tree colors="grey:state in ('done','cancel');black:state not in ('cancel','done')" string="Stock Moves">
                                     <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -756,7 +756,7 @@
                         <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
-                                <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Stock Moves">
+                                <tree colors="grey:state in ('done','cancel');black:state not in ('cancel','done')" string="Stock Moves">
                                     <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -934,7 +934,7 @@
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
-                                <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Stock Moves">
+                                <tree colors="grey:state in ('done','cancel');black:state not in ('cancel','done')" string="Stock Moves">
                                     <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -952,7 +952,7 @@
                                            states="draft,waiting,confirmed,assigned" />
                                        <button
                                            name="%(stock.move_scrap)d"
-                                           string="D" type="action"
+                                           string="Scrap Products" type="action"
                                            icon="gtk-convert"
                                            states="draft,waiting,confirmed,assigned" />
                                 </tree>
@@ -1109,7 +1109,7 @@
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_in_id': address_id}">
-                                <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Stock Moves">
+                                <tree colors="grey:state in ('done','cancel');black:state not in ('cancel','done')" string="Stock Moves">
                                     <field name="product_id"/>
                                     <field name="product_qty"/>
                                     <field name="product_uom"/>
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index ea592bf86fa..c566c180003 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -86,7 +86,9 @@ class stock_move_consume(osv.osv_memory):
         if 'product_uom' in fields:
             res.update({'product_uom': move.product_uom.id})    
         if 'product_qty' in fields:
-            res.update({'product_qty': move.product_qty})    
+            res.update({'product_qty': move.product_qty})
+        if 'location_id' in fields:
+            res.update({'location_id': move.location_id.id})
         
         return res   
             
@@ -120,9 +122,41 @@ class stock_move_scrap(osv.osv_memory):
     _inherit = "stock.move.consume"
     
     _defaults = {
-                 'location_id': lambda *x: False
+        'location_id': lambda *x: False
     }
 
+    def default_get(self, cr, uid, fields, context=None):
+        """ 
+             Get default values
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param fields: List of fields for default value 
+             @param context: A standard dictionary 
+             
+             @return: default values of fields
+        
+        """
+        res = super(stock_move_consume, self).default_get(cr, uid, fields, context=context)        
+        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
+        location_obj = self.pool.get('stock.location')
+        scrpaed_location_ids = location_obj.search(cr, uid, [('scraped','=',True)])
+        
+        if 'product_id' in fields:
+            res.update({'product_id': move.product_id.id})     
+        if 'product_uom' in fields:
+            res.update({'product_uom': move.product_uom.id})    
+        if 'product_qty' in fields:
+            res.update({'product_qty': move.product_qty})
+        if 'location_id' in fields:
+            if scrpaed_location_ids:
+                res.update({'location_id': scrpaed_location_ids[0]})
+            else:
+                res.update({'location_id': False})
+        
+        return res
+        
     def move_scrap(self, cr, uid, ids, context={}):
         """ 
              To move scraped products
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 310702392f3..abf8afc0d95 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -40,7 +40,7 @@
                 <form string="Consume Move">
                 	<separator string="Consume Products" colspan="4"/>
 				    <field name="product_id" colspan="4" readonly="1"/>
-				    <field name="location_id" colspan="4"/>
+				    <field name="location_id" colspan="4" widget="selection"/>
 				    <field name="product_qty" colspan="2"/>
 				    <field name="product_uom" nolabel="1" readonly="1"/>
                 	<newline/>
@@ -73,7 +73,7 @@
                 <form string="Scrap Move">
                 	<separator string="Scrap Products" colspan="4"/>
 				    <field name="product_id" colspan="4" readonly="1"/>
-				    <field name="location_id" colspan="4" string="Dest. Location" domain="[('usage','&lt;&gt;','view'),('scraped','=',True)]"/>
+				    <field name="location_id" colspan="4" widget="selection" string="Dest. Location" domain="[('usage','&lt;&gt;','view'),('scraped','=',True)]"/>
 				    <field name="product_qty" colspan="2"/>
 				    <field name="product_uom" nolabel="1" readonly="1"/>
                 	<newline/>

From b311e1f887b1040fc2c35c58697388c6aa3c7427 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Tue, 4 May 2010 17:38:22 +0530
Subject: [PATCH 35/84] [IMP] mrp: Task ID-583: When multi_level_bom is True
 then only bom_lines should be displayed.

bzr revid: uco@tinyerp.com-20100504120822-64ue3n8w5t3u6hqp
---
 addons/mrp/mrp_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 5db08653383..5ce369ff8f8 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -176,14 +176,14 @@
                         <field name="type" groups="base.group_extended"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
-                    <notebook colspan="4">
-                        <page string="General Information">
+                    <notebook colspan="4" >
+                        <page string="General Information" attrs="{'invisible': [('bom_id','!=',False),('multi_level_bom','=',False)]}">
                             <field colspan="4" name="bom_lines" nolabel="1" widget="one2many_list" />
                         </page>
-                        <page string="Revisions" groups="base.group_extended">
+                        <page string="Revisions" groups="base.group_extended" attrs="{'invisible': [('bom_id','!=',False),('multi_level_bom','=',False)]}">
                             <field colspan="4" name="revision_ids" nolabel="1" widget="one2many_list"/>
                         </page>
-                        <page string="Properties" groups="base.group_extended">
+                        <page string="Properties" groups="base.group_extended" attrs="{'invisible': [('bom_id','!=',False),('multi_level_bom','=',False)]}">
                             <field name="position"/>
                             <field name="active"/>
                             <field name="sequence"/>

From 19038f0df0c5e672c024ba303bb66e63d79d71da Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 4 May 2010 18:24:03 +0530
Subject: [PATCH 36/84] [IMP] purchase_requisition: remove the domain,improve
 the search view and view

bzr revid: sbh@tinyerp.com-20100504125403-a84nr12x7h5hg02g
---
 addons/purchase_requisition/__openerp__.py    |  4 ++--
 .../purchase_requisition.py                   |  2 +-
 .../purchase_requisition_view.xml             | 24 +++++++++++--------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index 2e2a5ea8ed3..b5cdc9723c4 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -34,8 +34,8 @@
     "update_xml" : ["wizard/purchase_requisition_partner_view.xml",
                     "purchase_requisition_view.xml",
                     "security/ir.model.access.csv","purchase_requisition_sequence.xml"],
-     "test":['test/purchase_requisition_test.yml',
-                'test/purchase_requisition_exclusive_test.yml'],                    
+#     "test":['test/purchase_requisition_test.yml',
+#                'test/purchase_requisition_exclusive_test.yml'],                    
     "active": False,
     "installable": True
 }
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 14ff085a4c4..fa4a1f8b153 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -78,7 +78,7 @@ class purchase_requisition_line(osv.osv):
     _description="Purchase Requisition Line"
     _rec_name = 'product_id'
     _columns = {
-        'product_id': fields.many2one('product.product', 'Product' , domain=[('purchase_requisition', '=', True)]),
+        'product_id': fields.many2one('product.product', 'Product' ),
         'product_uom_id': fields.many2one('product.uom', 'Product UoM'),
         'product_qty': fields.float('Quantity', digits=(16,2)),
         'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition', ondelete='cascade'),
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 5ce49ec3693..c1acbd32513 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -58,6 +58,14 @@
                             </form>
 
                         </field>
+					<separator colspan="4"/>
+	                <group col="8" colspan="4">
+	                    <field name="state" select="1" readonly ="1"/>
+						<button name="tender_in_progress" states="draft" string="Confirm" type="object" icon="gtk-apply" />
+	                    <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
+						<button name="tender_done" states="in_progress" string="Done" type="object" icon="gtk-jump-to" />
+						<button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
+	                </group>                        
                     </page>
                     <page string="Notes">
                         <field name="description" colspan="4" nolabel="1"/>
@@ -70,15 +78,6 @@
                     	<field name="purchase_ids" nolabel="1" colspan="4"/>
                    </page>
                 </notebook>
-				<separator colspan="4"/>
-	                <group col="8" colspan="4">
-	                    <field name="state" select="1" readonly ="1"/>
-						<button name="tender_in_progress" states="draft" string="Confirm" type="object" icon="gtk-apply" />
-	                    <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
-						<button name="tender_done" states="in_progress" string="Done" type="object" icon="gtk-jump-to" />
-						<button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
-	                </group>
-
 
             </form>
         </field>
@@ -91,6 +90,7 @@
             <tree string="Purchase Requisition">
                 <field name="name"/>
                 <field name="user_id"/>
+                <field name="purchase_ids"/>
                 <field name="date_start"/>
                 <field name="date_end"/>
                 <field name="origin"/>
@@ -106,7 +106,8 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Requisition">
                  <group col='10' colspan='4'>
-                    <filter icon="terp-purchase" string=" Current" domain="[('state','=','draft,in_progress')]" separator="1" help="Current Purchaes Requisition"/>
+                    <filter icon="terp-purchase" string="Current" domain="[('state','=','draft,in_progress')]" separator="1" help="Current Purchaes Requisition"/>
+					<filter icon="terp-purchase" string="Done" domain="[('state','=','done')]" separator="1" help="Current Purchaes Requisition"/>                    
                     <separator orientation="vertical"/>
                     <field name="name" select="1" string="Requisition Reference"/>
                     <field name="purchase_ids" select="1"/>
@@ -119,8 +120,11 @@
                 <newline/>
                   <group expand="1" string="Group By..." colspan="4" col="10">
                     <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+  					<separator orientation="vertical"/>                    
                     <filter string="Date Start" icon="terp-purchase" domain="[]" context="{'group_by':'date_start'}"/>
                     <filter string="Date End" icon="terp-purchase" domain="[]" context="{'group_by':'date_end'}"/>
+                    <separator orientation="vertical"/>                    
+					<filter string="Origin" icon="terp-purchase" domain="[]" context="{'group_by':'origin'}"/>
                 </group>
               </search>
             </field>

From 54a79c4544ce768ba9695cdd670ff09b5908b0f0 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 5 May 2010 10:20:13 +0530
Subject: [PATCH 37/84] [IMP]:usability improvements

bzr revid: nch@tinyerp.com-20100505045013-3yhvi9ownzp7tjpj
---
 bin/addons/base/base_update.xml    |  3 +-
 bin/addons/base/ir/ir.xml          |  1 +
 bin/addons/base/res/res_config.py  | 18 ++++++++++--
 bin/addons/base/res/res_config.xml | 46 ++++++++++++++----------------
 4 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 41797f756f5..1818eb13449 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -284,7 +284,7 @@
                 </form>
 				<xpath expr="//label[@string='description']"
 	                 position="attributes">
-	            <attribute name="string">Choose between the simplified interface and the extended one.If you are testing OpenERP or using it for the first time, we suggest you use the simplified interface. It has less options and fields but is easier to understand.You will be able to switch to the extended interface later.</attribute>
+	            <attribute name="string">Choose between the simplified interface and the extended one. If you are testing OpenERP or using it for the first time, We suggest you use the simplified interface. It has less options and fields but is easier to understand. You will be able to switch to the extended interface later.</attribute>
 	          </xpath>
 	          <xpath expr='//separator[@string="title"]' position='attributes'>
 	          	  <attribute name='string'>Choose Your Interface</attribute>
@@ -325,6 +325,5 @@
             <field name="action_id" ref="action_config_simple_view_form"/>
             <field name="sequence">1</field>
         </record>
-
     </data>
 </openerp>
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 77ae7643645..7eaa78c8a3a 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1370,6 +1370,7 @@
                     <field name="sequence"/>
                     <field name="action_id" select="1"/>
                     <field name="state"/>
+                    <button name="action_id" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
                 </tree>
             </field>
         </record>
diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index 9899830a4f3..e885476eef4 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -19,13 +19,19 @@
 #
 ##############################################################################
 
+import os
+import base64
+import random
 from operator import attrgetter
 
 from osv import osv, fields
+import tools
 from tools.translate import _
 import netsvc
 import pooler
 
+
+
 class res_config_configurable(osv.osv_memory):
     ''' Base classes for new-style configuration items
 
@@ -45,11 +51,19 @@ class res_config_configurable(osv.osv_memory):
             return round(open*100./total)
         return 100.
 
+    def _get_image(self, cr, uid, context=None):
+        file_no = str(random.randint(1,3))
+        path = os.path.join('base','res','config_pixmaps/%s.png'%file_no)
+        file_data = tools.file_open(path,'rb').read()
+        return base64.encodestring(file_data)
+
     _columns = dict(
-        progress=fields.float('Configuration Progress', readonly=True),
+        progress = fields.float('Configuration Progress', readonly=True),
+        config_logo = fields.binary('Image', readonly=True),
         )
     _defaults = dict(
-        progress=_progress
+        progress = _progress,
+        config_logo = _get_image
         )
 
     def _next_action(self, cr, uid):
diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index ca00a4944d2..3981b8f2719 100644
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -6,29 +6,29 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
        <form>
-        	<group colspan="4" col="12">
-              	<group colspan="4">
-                	<image name="gtk-dialog-info"/>
+    		<group colspan="4" col="8">
+              	<group colspan="2">
+                	<field name="config_logo" widget="image" nolabel="1" colspan="1"/>
                 	<newline/>
-                	<label align="0.0" string="description" width="200" colspan="4"/>
+                	<label align="0.0" string="description" width="200" colspan="1"/>
               	</group>
-              	<group colspan="1">
-              		<separator string="vsep" position="vertical" colspan="1" rowspan="12"/>
-            	</group>
-            	<group>
+              	<group colspan="2">
+              		<separator string="vsep" position="vertical" colspan="2" rowspan="12"/>
+              	</group>
+            	<group colspan="4">
               		<separator string="title" colspan="4"/>
               		<group string="res_config_contents"/>
             	</group>
+              </group>
+            	<group colspan="4" col="8">
+            		<separator string="" colspan="8"/>
+            		<field name="progress" widget="progressbar" nolabel="1"/>
+            		<label string="" colspan="5"/>
+		 	 		<button name="action_skip" icon="gtk-goto-last" special="cancel"
+	                    	type="object" string="Skip" colspan="1"/>
+	                <button name="action_next" icon="gtk-go-forward"
+	                	 type="object" string="Next" colspan="1"/>
            </group>
-           <group colspan="4" col="8">
-           		<separator string="" colspan="8"/>
-       			<field name="progress" widget="progressbar" colspan= "1" nolabel="1"/>
-	 	 		<label string="" colspan="2"/>
-	 	 		<button name="action_skip" icon="gtk-goto-last" special="cancel"
-                    	type="object" string="Skip" colspan="1"/>
-                <button name="action_next" icon="gtk-go-forward"
-                	 type="object" string="Next" colspan="1"/>
-	        </group>
         </form>
       </field>
     </record>
@@ -60,13 +60,11 @@
       <field name="model">res.config.installer</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-
         <form>
           <group colspan="4">
-
             <group colspan="4" col="12">
               <group colspan="2">
-                <image name="gtk-dialog-info"/>
+                <field name="config_logo" widget="image" nolabel="1" colspan="1"/>
                 <newline/>
                 <label align="0.0" string="description" width="200"/>
               </group>
@@ -81,13 +79,13 @@
           </group>
           <group colspan="4" col="8">
           	<separator string="" colspan="8"/>
-            <field name="progress" widget="progressbar"/>
-            <label string="" colspan="3"/>
-            <group colspan="1" col="2">
+            <field name="progress" widget="progressbar" nolabel="1"/>
+            <label string="" colspan="5"/>
+            <group colspan="1">
               <button name="action_skip" icon="gtk-goto-last" special="cancel"
                       type="object" string="Skip"/>
             </group>
-            <group colspan="1" col="2">
+            <group colspan="1">
               <button name="action_next" icon="gtk-go-forward"
                       type="object" string="Install Modules"/>
             </group>

From 269825d2fb59f05c998a278287b5800d630f3978 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 5 May 2010 14:57:18 +0530
Subject: [PATCH 38/84] [IMP,ADD]:configuration wizards & pixmaps

bzr revid: nch@tinyerp.com-20100505092718-at0x24fmfvji0iqb
---
 bin/addons/base/res/config_pixmaps/1.png | Bin 0 -> 17870 bytes
 bin/addons/base/res/config_pixmaps/2.png | Bin 0 -> 16988 bytes
 bin/addons/base/res/config_pixmaps/3.png | Bin 0 -> 13902 bytes
 bin/addons/base/res/res_config.py        |  11 ++++++++++-
 bin/addons/base/res/res_config.xml       |  17 ++++++++---------
 bin/addons/base/rng/view.rng             |   1 +
 6 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 bin/addons/base/res/config_pixmaps/1.png
 create mode 100644 bin/addons/base/res/config_pixmaps/2.png
 create mode 100644 bin/addons/base/res/config_pixmaps/3.png

diff --git a/bin/addons/base/res/config_pixmaps/1.png b/bin/addons/base/res/config_pixmaps/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..82b1df612516d3b7a56462956a1128af4fabe70e
GIT binary patch
literal 17870
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

literal 0
HcmV?d00001

diff --git a/bin/addons/base/res/config_pixmaps/2.png b/bin/addons/base/res/config_pixmaps/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b883d17e17eea777381a91277efc2fb3dcc19312
GIT binary patch
literal 16988
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
UX}B4<@&k;Fgrazbs8P`W1KgcZs{jB1

literal 0
HcmV?d00001

diff --git a/bin/addons/base/res/config_pixmaps/3.png b/bin/addons/base/res/config_pixmaps/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d6a19d2880ed6aa527bcb637d93c5d8a363d423
GIT binary patch
literal 13902
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

literal 0
HcmV?d00001

diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index e885476eef4..d474a002faf 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -50,7 +50,16 @@ class res_config_configurable(osv.osv_memory):
         if total:
             return round(open*100./total)
         return 100.
-
+#    def default_get(self, cr, uid, fields_list, context=None):
+#        ''' Set Config Logo...
+#        '''
+#        defaults = super(res_config_configurable, self).default_get(
+#            cr, uid, fields_list, context=context)
+#        file_no = str(random.randint(1,3))
+#        path = os.path.join('base','res','config_pixmaps/%s.png'%file_no)
+#        file_data = tools.file_open(path,'rb').read()
+#        defaults.update({'config_logo':base64.encodestring(file_data)})
+#        return defaults
     def _get_image(self, cr, uid, context=None):
         file_no = str(random.randint(1,3))
         path = os.path.join('base','res','config_pixmaps/%s.png'%file_no)
diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index 3981b8f2719..1615b8a3545 100644
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -7,23 +7,22 @@
       <field name="arch" type="xml">
        <form>
     		<group colspan="4" col="8">
-              	<group colspan="2">
+              	<group colspan="4" width="200" height="250">
                 	<field name="config_logo" widget="image" nolabel="1" colspan="1"/>
                 	<newline/>
-                	<label align="0.0" string="description" width="200" colspan="1"/>
-              	</group>
-              	<group colspan="2">
-              		<separator string="vsep" position="vertical" colspan="2" rowspan="12"/>
+                	<label align="0.0" string="description" width="200" colspan="2"/>
+                	<separator string="vsep" position="vertical" colspan="1" rowspan="12"/>
               	</group>
             	<group colspan="4">
               		<separator string="title" colspan="4"/>
               		<group string="res_config_contents"/>
             	</group>
-              </group>
-            	<group colspan="4" col="8">
+			</group>
+            	<group colspan="8" col="8">
             		<separator string="" colspan="8"/>
-            		<field name="progress" widget="progressbar" nolabel="1"/>
-            		<label string="" colspan="5"/>
+            		<group colspan="4" width="220">
+            			<field name="progress" widget="progressbar" nolabel="1" colspan="2"/>
+            		</group>
 		 	 		<button name="action_skip" icon="gtk-goto-last" special="cancel"
 	                    	type="object" string="Skip" colspan="1"/>
 	                <button name="action_next" icon="gtk-go-forward"
diff --git a/bin/addons/base/rng/view.rng b/bin/addons/base/rng/view.rng
index 5a489a55936..126755c2f68 100644
--- a/bin/addons/base/rng/view.rng
+++ b/bin/addons/base/rng/view.rng
@@ -436,6 +436,7 @@
             <rng:optional><rng:attribute name="string"/></rng:optional>
             <rng:optional><rng:attribute name="fill"/></rng:optional>
             <rng:optional><rng:attribute name="height"/></rng:optional>
+            <rng:optional><rng:attribute name="width"/></rng:optional>
             <rng:optional><rng:attribute name="name"/></rng:optional>
             <rng:optional><rng:attribute name="color" /></rng:optional>
             <rng:zeroOrMore>

From 3a1c44e7b26baa8a6b0033ce1ce59abff8b89453 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Wed, 5 May 2010 15:23:26 +0530
Subject: [PATCH 39/84] [IMP] mrp,mrp_procurement: Task ID-574: Changed
 procurement menus again to normal positions.

bzr revid: uco@tinyerp.com-20100505095326-hmtry42zddm2ldgt
---
 addons/mrp/mrp_view.xml                       | 107 +++++++++++++++++-
 addons/mrp/process/procurement_process.xml    |  27 +++--
 .../mrp/process/service_product_process.xml   |   4 +-
 .../mrp/process/stockable_product_process.xml |   4 +-
 addons/mrp/security/mrp_security.xml          |   2 +-
 .../mrp_procurement/mrp_procurement_view.xml  |  91 ---------------
 .../process/procurement_process.xml           |  10 --
 .../wizard/schedulers_all_view.xml            |   3 -
 addons/purchase/purchase.py                   |   2 +-
 addons/sale/__openerp__.py                    |   2 +-
 10 files changed, 129 insertions(+), 123 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 5ce369ff8f8..ba86fc1facc 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -4,11 +4,93 @@
 
         <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing"
             groups="group_mrp_user,group_mrp_manager" sequence="3"/>
-		<menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
+        <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
+        <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
+
+        <menuitem name="Control" id="menu_mrp_control" parent="base.menu_mrp_root"  sequence="3" />
         <menuitem name="Master Data"
                   id="menu_mrp_bom"
                   parent="base.menu_mrp_root"
                   sequence="5" />
+        
+        <!--
+        Property / Property Group
+        -->
+
+        <record id="mrp_property_group_form_view" model="ir.ui.view">
+            <field name="name">mrp.property.group.form</field>
+            <field name="model">mrp.property.group</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Properties categories">
+                    <separator colspan="4" string="General Information"/>
+                    <field colspan="4" name="name" select="1"/>
+                    <field colspan="4" name="description"/>
+                </form>
+            </field>
+        </record>
+        <record id="mrp_property_group_action" model="ir.actions.act_window">
+            <field name="name">Property Categories</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.property.group</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem
+            id="menu_mrp_configuration"
+            name="Configuration"
+            parent="base.menu_mrp_root"
+            groups="base.group_extended"
+            sequence="50" />
+
+        <record id="mrp_property_tree_view" model="ir.ui.view">
+            <field name="name">mrp.property.tree</field>
+            <field name="model">mrp.property</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Properties">
+                    <field name="name"/>
+                    <field name="composition"/>
+                    <field name="group_id"/>
+                </tree>
+            </field>
+        </record>
+        <record id="mrp_property_form_view" model="ir.ui.view">
+            <field name="name">mrp.property.form</field>
+            <field name="model">mrp.property</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Properties">
+                    <separator colspan="4" string="General Information"/>
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="group_id" select="1"/>
+                    <field name="composition" select="1"/>
+                    <separator colspan="4" string="Description"/>
+                    <field colspan="4" name="description"/>
+                </form>
+            </field>
+        </record>
+        <record id="mrp_property_action" model="ir.actions.act_window">
+            <field name="name">Properties</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.property</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem name="Properties"
+            id="menu_mrp_property"
+            parent="menu_mrp_configuration"
+            groups="base.group_extended"
+            sequence="20" />
+        <menuitem
+            action="mrp_property_action"
+            id="menu_mrp_property_action"
+            parent="menu_mrp_property"
+            groups="base.group_extended" />
+        <menuitem
+            action="mrp_property_group_action"
+            id="menu_mrp_property_group_action"
+            parent="menu_mrp_property"/>
 
         <!--
         Work Centers
@@ -297,10 +379,27 @@
                 </form>
             </field>
         </record>
-
+		
+		<!--
+        Procurement
+        -->
+	
+		<menuitem action="mrp_procurement.mrp_procurement_action" id="menu_mrp_procurement_action"
+        		  parent="mrp.menu_mrp_manufacturing" sequence="2" />
+        <menuitem action="mrp_procurement.mrp_procurement_action5" id="menu_mrp_procurement_exception_action" 
+        		  parent="mrp.menu_mrp_control" sequence="1" />
+     	
+     	<menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="4"/>
+        <menuitem action="mrp_procurement.action_compute_schedulers" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" sequence="90"/>
+	
+		<!-- 
+		Order Point 
+		-->	
+		<menuitem action="mrp_procurement.action_orderpoint_form" id="menu_action_orderpoint_form" parent="mrp.menu_mrp_reordering"/>
+        
         <!--
-    Production Management
-    -->
+	    Production Management
+	    -->
 
         <record id="mrp_production_tree_view" model="ir.ui.view">
             <field name="name">mrp.production.tree</field>
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index b96bf11229f..08d66570b1f 100644
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -1,6 +1,17 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
+    
+    	<record id="process_node_procureproducts0" model="process.node">
+            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+            <field name="model_id" ref="mrp_procurement.model_mrp_procurement"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;The way to procurement depends on the product type.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Procure Products&quot;&quot;&quot;" name="name"/>
+            <field name="process_id" ref="mrp_procurement.process_process_procurementprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
+            <field eval="0" name="flow_start"/>
+        </record>
 
         <record id="process_node_productionorder0" model="process.node">
             <field name="menu_id" ref="mrp.menu_mrp_production_action"/>
@@ -14,7 +25,7 @@
         </record>
 
         <record id="process_node_procureproducts0" model="process.node">
-            <field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;The way to procurement depends on the product type.&quot;&quot;&quot;" name="note"/>
@@ -25,7 +36,7 @@
         </record>
         
         <record id="process_node_minimumstockrule0" model="process.node">
-            <field name="menu_id" ref="mrp_procurement.menu_action_orderpoint_form"/>
+            <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
             <field name="model_id" ref="mrp_procurement.model_stock_warehouse_orderpoint"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Linked to the 'Minimum stock rule' supplying method.&quot;&quot;&quot;" name="note"/>
@@ -35,7 +46,7 @@
         </record>
 
         <record id="process_node_stockproduct0" model="process.node">
-            <field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Product type is Stockable or Consumable.&quot;&quot;&quot;" name="note"/>
@@ -47,7 +58,7 @@
         </record>
         
         <record id="process_node_stockproduct1" model="process.node">
-            <field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;For stockable products and consumables&quot;&quot;&quot;" name="note"/>
@@ -59,7 +70,7 @@
         </record>
 
         <record id="process_node_serviceproduct0" model="process.node">
-            <field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Product type is service&quot;&quot;&quot;" name="note"/>
@@ -71,7 +82,7 @@
         </record>
         
         <record id="process_node_serviceproduct1" model="process.node">
-            <field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;For Services.&quot;&quot;&quot;" name="note"/>
@@ -83,7 +94,7 @@
         </record>
 
         <record id="process_node_purchaseprocure0" model="process.node">
-            <field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Procurement Orders&quot;&quot;&quot;" name="name"/>
@@ -94,7 +105,7 @@
         </record>
 
         <record id="process_node_productminimumstockrule0" model="process.node">
-            <field name="menu_id" ref="mrp_procurement.menu_action_orderpoint_form"/>
+            <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
             <field name="model_id" ref="mrp_procurement.model_stock_warehouse_orderpoint"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Minimum Stock&quot;&quot;&quot;" name="name"/>
diff --git a/addons/mrp/process/service_product_process.xml b/addons/mrp/process/service_product_process.xml
index 42650a5ad24..60bf3b562b9 100644
--- a/addons/mrp/process/service_product_process.xml
+++ b/addons/mrp/process/service_product_process.xml
@@ -17,7 +17,7 @@
 		-->
 
 		<record id="process_node_serviceonorder0" model="process.node">
-			<field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from Production or Purchase Order.&quot;&quot;&quot;" name="note"/>
@@ -28,7 +28,7 @@
 		</record>
 
 		<record id="process_node_servicemts0" model="process.node">
-			<field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from stock.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml
index 57c19ae7d90..c053103f476 100644
--- a/addons/mrp/process/stockable_product_process.xml
+++ b/addons/mrp/process/stockable_product_process.xml
@@ -17,7 +17,7 @@
 		-->
 
 		<record id="process_node_mts0" model="process.node">
-			<field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from stock.&quot;&quot;&quot;" name="note"/>
@@ -28,7 +28,7 @@
 		</record>
 
 		<record id="process_node_stock0" model="process.node">
-			<field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from Production or Purchase Order.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index 98e199f733b..4d47e374e02 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -11,7 +11,7 @@
 
 
 	<!-- restrict access to menu -->
-	<record model='ir.ui.menu' id="mrp_procurement.mrp_Sched_all">
+	<record model='ir.ui.menu' id="mrp_Sched_all">
 		<field eval="[(6,0,[ref('group_mrp_manager')])]" name="groups_id"/>
   	</record>
 
diff --git a/addons/mrp_procurement/mrp_procurement_view.xml b/addons/mrp_procurement/mrp_procurement_view.xml
index 8acbf2e8c29..84b47ee516d 100644
--- a/addons/mrp_procurement/mrp_procurement_view.xml
+++ b/addons/mrp_procurement/mrp_procurement_view.xml
@@ -5,91 +5,6 @@
         Procurement
         -->
         
-        <menuitem id="menu_mrp_procurement" name="Procurements" 
-        	      parent="base.menu_base_partner" sequence="5"/>
-        	      
-        <menuitem name="Procurement Control" id="menu_mrp_control" 
-                  parent="mrp_procurement.menu_mrp_procurement"  sequence="3" />
-
-		<!--
-        Property / Property Group
-        -->
-
-        <record id="mrp_property_group_form_view" model="ir.ui.view">
-            <field name="name">mrp.property.group.form</field>
-            <field name="model">mrp.property.group</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Properties categories">
-                    <separator colspan="4" string="General Information"/>
-                    <field colspan="4" name="name" select="1"/>
-                    <field colspan="4" name="description"/>
-                </form>
-            </field>
-        </record>
-        <record id="mrp_property_group_action" model="ir.actions.act_window">
-            <field name="name">Property Categories</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.property.group</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-        <menuitem
-            id="menu_mrp_configuration"
-            name="Configuration"
-            parent="mrp_procurement.menu_mrp_procurement"
-            groups="base.group_extended"
-            sequence="50" />
-
-        <record id="mrp_property_tree_view" model="ir.ui.view">
-            <field name="name">mrp.property.tree</field>
-            <field name="model">mrp.property</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Properties">
-                    <field name="name"/>
-                    <field name="composition"/>
-                    <field name="group_id"/>
-                </tree>
-            </field>
-        </record>
-        <record id="mrp_property_form_view" model="ir.ui.view">
-            <field name="name">mrp.property.form</field>
-            <field name="model">mrp.property</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Properties">
-                    <separator colspan="4" string="General Information"/>
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="group_id" select="1"/>
-                    <field name="composition" select="1"/>
-                    <separator colspan="4" string="Description"/>
-                    <field colspan="4" name="description"/>
-                </form>
-            </field>
-        </record>
-        <record id="mrp_property_action" model="ir.actions.act_window">
-            <field name="name">Properties</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.property</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-        <menuitem name="Properties"
-            id="menu_mrp_property"
-            parent="menu_mrp_configuration"
-            groups="base.group_extended"
-            sequence="20" />
-        <menuitem
-            action="mrp_property_action"
-            id="menu_mrp_property_action"
-            parent="menu_mrp_property"
-            groups="base.group_extended" />
-        <menuitem
-            action="mrp_property_group_action"
-            id="menu_mrp_property_group_action"
-            parent="menu_mrp_property"/>
-
         <record id="mrp_procurement_tree_view" model="ir.ui.view">
             <field name="name">mrp.procurement.tree</field>
             <field name="model">mrp.procurement</field>
@@ -199,8 +114,6 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_mrp_procurement_filter"/>
         </record>
-        <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" 
-        		  parent="mrp_procurement.menu_mrp_procurement" sequence="2" />
 
         <record id="mrp_procurement_action3" model="ir.actions.act_window">
             <field name="name">Procurements</field>
@@ -222,8 +135,6 @@
             <field name="domain">[('state','=','exception')]</field>
         </record>
 
-        <menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_exception_action" 
-        		  parent="mrp_procurement.menu_mrp_control" sequence="1" />
         <record id="mrp_procurement_action4" model="ir.actions.act_window">
             <field name="name">Procurement Exceptions to Fix</field>
             <field name="type">ir.actions.act_window</field>
@@ -324,8 +235,6 @@
             <field name="view_id" ref="view_warehouse_orderpoint_tree"/>
             <field name="search_view_id" ref="warehouse_orderpoint_search" />
         </record>
-        <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
-        <menuitem action="action_orderpoint_form" id="menu_action_orderpoint_form" parent="menu_mrp_reordering"/>
 
         <act_window domain="[('warehouse_id', '=', active_id)]" id="act_stock_warehouse_2_stock_warehouse_orderpoint" name="Minimum Stock Rules" res_model="stock.warehouse.orderpoint" src_model="stock.warehouse"/>
 
diff --git a/addons/mrp_procurement/process/procurement_process.xml b/addons/mrp_procurement/process/procurement_process.xml
index 0b39dca3a0c..21f953c6a6f 100644
--- a/addons/mrp_procurement/process/procurement_process.xml
+++ b/addons/mrp_procurement/process/procurement_process.xml
@@ -16,16 +16,6 @@
             Process Node
         -->
 
-        <record id="process_node_procureproducts0" model="process.node">
-            <field name="menu_id" ref="mrp_procurement.menu_mrp_procurement_action"/>
-            <field name="model_id" ref="mrp_procurement.model_mrp_procurement"/>
-            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;The way to procurement depends on the product type.&quot;&quot;&quot;" name="note"/>
-            <field eval="&quot;&quot;&quot;Procure Products&quot;&quot;&quot;" name="name"/>
-            <field name="process_id" ref="process_process_procurementprocess0"/>
-            <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
-            <field eval="0" name="flow_start"/>
-        </record>
         
     </data>
 </openerp>
diff --git a/addons/mrp_procurement/wizard/schedulers_all_view.xml b/addons/mrp_procurement/wizard/schedulers_all_view.xml
index 2866eb97275..33861287278 100644
--- a/addons/mrp_procurement/wizard/schedulers_all_view.xml
+++ b/addons/mrp_procurement/wizard/schedulers_all_view.xml
@@ -30,8 +30,5 @@
             key2="client_action_multi"    
 		    id="action_compute_schedulers"/>            
         
-        <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="menu_mrp_procurement" sequence="4"/>
-        <menuitem action="action_compute_schedulers" id="mrp_Sched_all" parent="mrp_procurement.menu_mrp_scheduler" sequence="90"/>
-		
 	</data>
 </openerp>	
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 79030850e84..a7d69159873 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -770,7 +770,7 @@ class mrp_procurement(osv.osv):
                 'fiscal_position': partner.property_account_position and partner.property_account_position.id or False
             })
             res[procurement.id] = purchase_id
-            self.write(cr, uid, [procurement.id], {'state': 'running'}) #, 'purchase_id': purchase_id
+            self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': purchase_id})
         return res
 mrp_procurement()
 
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 987b333888f..23e72c60775 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -57,7 +57,7 @@
         'report/sale_report_view.xml',
         'sale_report.xml',
         'stock_view.xml',
-        'process/sale_process.xml',
+#        'process/sale_process.xml',
     ],
     'demo_xml': ['sale_demo.xml'],
     'installable': True,

From bacc4e1ffb798583b13f9d7dd5fee1addf612416 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Wed, 5 May 2010 11:58:24 +0200
Subject: [PATCH 40/84] [IMP] point_of_sale: improved field name:
 user_salesman_id instead of user_saleman (typo + missing _id for a m2o)

bzr revid: qdp-launchpad@tinyerp.com-20100505095824-o0r4s5osih51pqrw
---
 addons/point_of_sale/__init__.py            |  2 --
 addons/point_of_sale/pos.py                 | 10 +++++-----
 addons/point_of_sale/pos_demo.xml           |  6 +++---
 addons/point_of_sale/pos_view.xml           |  2 +-
 addons/point_of_sale/report/pos_receipt.rml |  2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/addons/point_of_sale/__init__.py b/addons/point_of_sale/__init__.py
index ddd7dc3c01f..0baf4639019 100644
--- a/addons/point_of_sale/__init__.py
+++ b/addons/point_of_sale/__init__.py
@@ -27,7 +27,5 @@ import stock
 import wizard
 import report
 
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 7c872bda845..0f83cefa852 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -287,7 +287,7 @@ class pos_order(osv.osv):
         'date_payment': fields.function(_get_date_payment2, method=True, string='Payment Date', type='date',  store=True),
         'date_validity': fields.date('Validity Date', required=True),
         'user_id': fields.many2one('res.users', 'Connected Salesman', readonly=True),
-        'user_saleman': fields.many2one('res.users', 'Salesman', required=True),
+        'user_salesman_id': fields.many2one('res.users', 'Salesman', required=True),
         'sale_manager': fields.many2one('res.users', 'Salesman Manager'),
         'amount_tax': fields.function(_amount_all, method=True, string='Taxes',digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
         'amount_total': fields.function(_amount_total, method=True, string='Total'),
@@ -703,7 +703,7 @@ class pos_order(osv.osv):
         inv_ids = []
 
         for order in self.browse(cr, uid, ids, context):
-            curr_c = order.user_saleman.company_id
+            curr_c = order.user_salesman_id.company_id
             if order.invoice_id:
                 inv_ids.append(order.invoice_id.id)
                 continue
@@ -980,8 +980,8 @@ class pos_order(osv.osv):
                     create_contract_nb = True
                     break
             if create_contract_nb:
-                seq = sequence_obj.get(cr, uid, 'pos.user_%s' % pos.user_saleman.login)
-                vals['contract_number'] ='%s-%s' % (pos.user_saleman.login, seq)
+                seq = sequence_obj.get(cr, uid, 'pos.user_%s' % pos.user_salesman_id.login)
+                vals['contract_number'] ='%s-%s' % (pos.user_salesman_id.login, seq)
         self.write(cr, uid, ids, vals)
 
     def action_paid(self, cr, uid, ids, context=None):
@@ -1328,4 +1328,4 @@ class product_product(osv.osv):
         'disc_controle': lambda *a: True,
 }
 product_product()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/pos_demo.xml b/addons/point_of_sale/pos_demo.xml
index f3573abc791..b75f4362578 100644
--- a/addons/point_of_sale/pos_demo.xml
+++ b/addons/point_of_sale/pos_demo.xml
@@ -57,7 +57,7 @@
 			<field name="shop_id" ref="sale.shop"/>
 			<field eval="&quot;&quot;&quot;2009-05-29&quot;&quot;&quot;" name="date_order"/>
 			<field name="partner_id" ref="base.res_partner_5"/>
-			<field name="user_saleman" ref="base.user_root"/>
+			<field name="user_salesman_id" ref="base.user_root"/>
 			<field name="sale_manager" ref="base.user_root"/>
 			<field eval="&quot;&quot;&quot;POS/001&quot;&quot;&quot;" name="name"/>
 			<field name="company_id" ref="res_company_tinyshop0"/>
@@ -93,7 +93,7 @@
       <field name="shop_id" ref="sale.shop"/>
 			<field eval="&quot;&quot;&quot;2009-05-29&quot;&quot;&quot;" name="date_order"/>
 			<field name="partner_id" ref="base.res_partner_3"/>
-			<field name="user_saleman" ref="res_users_sofia0"/>
+			<field name="user_salesman_id" ref="res_users_sofia0"/>
 			<field name="sale_manager" ref="base.user_root"/>
 			<field eval="&quot;&quot;&quot;POS/002&quot;&quot;&quot;" name="name"/>
 			<field name="company_id" ref="res_company_shop0"/>
@@ -135,7 +135,7 @@
 			<field eval="&quot;&quot;&quot;2009-11-29&quot;&quot;&quot;" name="date_validity"/>
 			<field eval="&quot;&quot;&quot;2009-05-29&quot;&quot;&quot;" name="date_order"/>
 			<field name="partner_id" ref="base.res_partner_3"/>
-			<field name="user_saleman" ref="res_users_sofia0"/>
+			<field name="user_salesman_id" ref="res_users_sofia0"/>
 			<field name="sale_manager" ref="base.user_root"/>
 			<field eval="&quot;&quot;&quot;POS/0012&quot;&quot;&quot;" name="name"/>
 			<field name="company_id" ref="res_company_shop0"/>
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index e9829addbda..637d37fa0b8 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -11,7 +11,7 @@
                     <notebook >
                         <page string="Order lines">
                             <group colspan="4" col="6">
-                                <field name="user_saleman" />
+                                <field name="user_salesman_id" />
                                 <field name="partner_id" on_change="onchange_partner_pricelist(partner_id)"/>
                                 <field name="contract_number" select="1" groups="base.group_extended"/>
                             </group>
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index 807d9e497d6..d615fc74534 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -103,7 +103,7 @@
         <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
         <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
         <para style="terp_default_Centre_9">Shop : [[ o.shop_id.name ]]</para>
-        <para style="terp_default_Centre_9">Vendeur : [[ o.user_saleman.name ]]</para>
+        <para style="terp_default_Centre_9">Vendeur : [[ o.user_salesman_id.name ]]</para>
         <para style="terp_default_Centre_9">Date : [[ formatLang(o.date_order,date = True) ]]</para>
         <para style="P4">
             <font color="white"> </font>

From 33bbc9770cf5fd606ac100af550f720f782aba4e Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 5 May 2010 16:12:36 +0530
Subject: [PATCH 41/84] Task-578: Merge the file and remove the unused  code
 and Fix the problem of ir.rule

bzr revid: sbh@tinyerp.com-20100505104236-9zl2uy1k9r9p2c11
---
 addons/point_of_sale/__init__.py              |   3 +-
 .../point_of_sale/account_bank_statement.py   |  21 ++--
 addons/point_of_sale/pos.py                   |  16 +--
 .../pos_account_bank_statement.py             |  67 ----------
 addons/point_of_sale/pos_view.xml             |   4 +-
 addons/point_of_sale/posrule_data.xml         |  56 +++------
 addons/point_of_sale/statement_data.xml       |   4 +-
 addons/point_of_sale/statement_rules.xml      |   5 -
 .../wizard/pos_open_statement.py              |   6 -
 addons/purchase_requisition/__openerp__.py    |   2 -
 .../purchase_requisition_exclusive_test.yml   |  93 --------------
 .../test/purchase_requisition_test.yml        | 117 ------------------
 12 files changed, 33 insertions(+), 361 deletions(-)
 delete mode 100644 addons/point_of_sale/pos_account_bank_statement.py
 delete mode 100644 addons/point_of_sale/statement_rules.xml
 delete mode 100644 addons/purchase_requisition/test/purchase_requisition_exclusive_test.yml
 delete mode 100644 addons/purchase_requisition/test/purchase_requisition_test.yml

diff --git a/addons/point_of_sale/__init__.py b/addons/point_of_sale/__init__.py
index ddd7dc3c01f..8b041be5801 100644
--- a/addons/point_of_sale/__init__.py
+++ b/addons/point_of_sale/__init__.py
@@ -20,9 +20,8 @@
 #
 ##############################################################################
 
-import pos
 import account_bank_statement
-import pos_account_bank_statement
+import pos
 import stock
 import wizard
 import report
diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
index 57276219861..f1ce05dada0 100644
--- a/addons/point_of_sale/account_bank_statement.py
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -132,8 +132,6 @@ class account_bank_statement(osv.osv):
     _columns = {
           'journal_id': fields.many2one('account.journal', 'Journal', required=True),
           'balance_start': fields.function(_get_starting_balance, method=True, string='Starting Balance', type='float',digits=(16,2)),
-         # 'balance_start': fields.float('Starting Balance',digits=(16,2)),
-         # 'balance_end': fields.float('Balance',digits=(16,2)),
           'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirm'),('open','Open')],
                                     'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
           'total_entry_encoding':fields.function(_get_sum_entry_encoding, method=True, string="Total of Entry encoding"),
@@ -142,6 +140,8 @@ class account_bank_statement(osv.osv):
           'starting_details_ids': fields.one2many('singer.statement', 'starting_id', string='Starting Details'),
           'ending_details_ids': fields.one2many('singer.statement', 'ending_id', string='Ending Details'),
           'name': fields.char('Name', size=64, required=True, readonly=True),
+          'company_id':fields.many2one('res.company', 'Company', required=True),
+          'user_id': fields.many2one('res.users',ondelete='cascade',string='User', readonly=True),        
 
     }
     _defaults = {
@@ -149,7 +149,8 @@ class account_bank_statement(osv.osv):
           'name': lambda *a: '/',
           'date': lambda *a:time.strftime("%Y-%m-%d %H:%M:%S"),
           'journal_id': _default_journal_id,
-
+          'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
+          'user_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).id        
          }
 
     def create(self, cr, uid, vals, context=None):
@@ -210,12 +211,13 @@ class account_bank_statement(osv.osv):
         @return: True 
         """       
         obj_inv = self.browse(cr, uid, ids)[0]
+        sequence_obj=self.pool.get('ir.sequence')
         s_id=obj_inv.journal_id
         if s_id.statement_sequence_id:
             s_id=s_id.id
-            number = self.pool.get('ir.sequence').get_id(cr, uid, s_id)
+            number = sequence_obj.get_id(cr, uid, s_id)
         else:
-            number = self.pool.get('ir.sequence').get(cr, uid,
+            number = sequence_obj.get(cr, uid,
                             'account.bank.statement')
 
         self.write(cr, uid, ids, {'date':time.strftime("%Y-%m-%d %H:%M:%S"), 'state':'open', 'name':number})
@@ -244,17 +246,8 @@ class account_bank_statement(osv.osv):
                     raise osv.except_osv(_('Invalid action !'), _(' You can not confirm your cashbox, Please enter ending details, missing value matches to "%s"')%(abs(Decimal(str(val))-(Decimal(str(val_statement_line))+Decimal(str(val2))))))
 
             self.write(cr, uid, statement.id, {'balance_end_real':Decimal(str(val_statement_line))+Decimal(str(val2)),'closing_date':time.strftime("%Y-%m-%d %H:%M:%S"),'state':'draft'})
-           # self.write(cr, uid, statement.id, {'balance_end_real':bal_st+val_statement_line,'closing_date':time.strftime("%Y-%m-%d %H:%M:%S"),'state':'draft'})
         return  super(account_bank_statement, self).button_confirm(cr, uid, ids, context=None)
 
 account_bank_statement()
 
-#class singer_account_bank_statement_line(osv.osv):
-#    _inherit = 'account.bank.statement.line'
-#    _columns = {
-#           'pos_statement_id': fields.many2one('pos.order',ondelete='cascade'),
-#     }
-#
-#singer_account_bank_statement_line()
-
 
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 7c872bda845..a59ae6e9d5b 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -500,7 +500,6 @@ class pos_order(osv.osv):
                     cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order.shop_id.warehouse_id.id))
                     res=cr.fetchone()
                     location_id=res and res[0] or None
-#                    location_id = order and order.shop_id and order.shop_id.warehouse_id and order.shop_id.warehouse_id.lot_stock_id.id or None
                     stock_dest_id = int(val.split(',')[1])
                     if line.qty < 0:
                         location_id, stock_dest_id = stock_dest_id, location_id
@@ -1015,18 +1014,9 @@ class pos_order(osv.osv):
 
 pos_order()
 
-class account_bank_statement(osv.osv):
-    _inherit = 'account.bank.statement'
-    _columns={
-        'user_id': fields.many2one('res.users',ondelete='cascade',string='User', readonly=True),
-    }
-    _defaults = {
-        'user_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).id
-    }
-account_bank_statement()
-
 class account_bank_statement_line(osv.osv):
     _inherit = 'account.bank.statement.line'
+    
     def _get_statement_journal(self, cr, uid, ids, context, *a):
         res = {}
         for line in self.browse(cr, uid, ids):
@@ -1037,7 +1027,11 @@ class account_bank_statement_line(osv.osv):
         'am_out':fields.boolean("To count"),
         'is_acc':fields.boolean("Is accompte"),
         'pos_statement_id': fields.many2one('pos.order',ondelete='cascade'),
+        'company_id':fields.many2one('res.company', 'Company', required=True),        
     }
+    _defaults = {
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
+    }    
 account_bank_statement_line()
 
 class pos_order_line(osv.osv):
diff --git a/addons/point_of_sale/pos_account_bank_statement.py b/addons/point_of_sale/pos_account_bank_statement.py
deleted file mode 100644
index 60924350014..00000000000
--- a/addons/point_of_sale/pos_account_bank_statement.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import osv, fields
-import time
-import netsvc
-
-
-class account_bank_statement(osv.osv):
-    
-    _inherit = 'account.bank.statement'
-    _columns = {
-        'company_id':fields.many2one('res.company', 'Company', required=True),
-    }
-    _defaults = {
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
-    }
-account_bank_statement()
-
-class account_bank_statement_line(osv.osv):
-    
-    def _default_company(self, cr, uid, context={}):
-
-        """ To get default company for the object"
-        
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of bank statement ids
-        @param context: A standard dictionary for contextual values 
-        @return: company 
-        """          
-        
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        if user.company_id:
-            return user.company_id.id
-        return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
-    
-    _inherit = 'account.bank.statement.line'
-    _columns = {
-        'company_id':fields.many2one('res.company', 'Company', required=True),
-    }
-    _defaults = {
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
-    }
-account_bank_statement_line()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index e9829addbda..f32c23b92ff 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -175,7 +175,9 @@
         <menuitem name="Point of Sale" id="menu_point_root" sequence="10"/>
         <menuitem name="Point of Sale" id="menu_point_of_sale" parent="menu_point_root" sequence="1" />
         <menuitem name="Sales Order" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1"/>
-        <menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale" sequence="2" name="Products"/>
+        <menuitem name="Products" id="menu_point_of_sale_product" parent="menu_point_root" sequence="2" />
+        
+        <menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale_product" sequence="2" name="Products"/>
 
         <!--  POS Order view (date_payment)  -->
          <record model="ir.actions.act_window" id="action_pos_pos_form_user">
diff --git a/addons/point_of_sale/posrule_data.xml b/addons/point_of_sale/posrule_data.xml
index b85fe0b8e4c..69dcf769700 100644
--- a/addons/point_of_sale/posrule_data.xml
+++ b/addons/point_of_sale/posrule_data.xml
@@ -25,23 +25,18 @@
             <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="login"/>
             <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
         </record>
-		<record id="ir_rule_group_posline0" model="ir.rule.group">
-			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
-			<field eval="&quot;&quot;&quot;POS line&quot;&quot;&quot;" name="name"/>
-			<field eval="1" name="global"/>
-		</record>
 		<record id="ir_rule_0" model="ir.rule">
-			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
-			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
-			<field name="field_id" ref="point_of_sale.field_pos_order_line_company_id"/>
-			<field name="rule_group" ref="ir_rule_group_posline0"/>
+			<field name="name">POS line</field>
+	        <field name="model_id" ref="model_pos_order_line"/>
+	        <field name="global" eval="True"/>
+	        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
 		</record>
 	</data>
 
 	<data>
 		<record id="res_groups_posuserposline0" model="res.groups">
 			<field eval="[(6,0,[ref('point_of_sale.menu_action_pos_order_line'),ref('point_of_sale.menu_action_pos_order_line_day')])]" name="menu_access"/>
-			<field eval="[(6,0,[ref('ir_rule_group_posline0')])]" name="rule_groups"/>
+			<field eval="[(6,0,[ref('ir_rule_0')])]" name="groups"/>
 			<field eval="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
 			<field eval="&quot;&quot;&quot;POS_user_pos_line&quot;&quot;&quot;" name="name"/>
 		</record>
@@ -66,42 +61,21 @@
 	</data>
 
 	<data>
-		<record id="ir_rule_group_point0" model="ir.rule.group">
-			<field name="model_id" ref="point_of_sale.model_pos_order"/>
-			<field eval="&quot;&quot;&quot;point&quot;&quot;&quot;" name="name"/>
-			<field eval="1" name="global"/>
-		</record>
-		<record id="ir_rule_0" model="ir.rule">
-			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
-			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
-			<field name="field_id" ref="point_of_sale.field_pos_order_company_id"/>
-			<field name="rule_group" ref="ir_rule_group_point0"/>
-		</record>
-
-
-		 <record id="ir_rule_group_poslinecompany0" model="ir.rule.group">
-			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
-			<field eval="&quot;&quot;&quot;POS line company&quot;&quot;&quot;" name="name"/>
-			<field eval="1" name="global"/>
-		</record>
-		<record id="ir_rule_4" model="ir.rule">
-			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
-			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
-			<field name="field_id" ref="point_of_sale.field_pos_order_line_company_id"/>
-			<field name="rule_group" ref="ir_rule_group_poslinecompany0"/>
-		</record>
-
-		<record id="ir_rule_group_posreporting0" model="ir.rule.group">
+	<record id="ir_rule_0" model="ir.rule">		
+    	<field eval="&quot;&quot;&quot;point&quot;&quot;&quot;" name="name"/>
+		<field name="model_id" ref="model_pos_order"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+	</record>     
+		<record id="ir_rule_group_posreporting0" model="ir.rule">
 			<field name="model_id" ref="point_of_sale.model_report_transaction_pos"/>
 			<field eval="&quot;&quot;&quot;POS Reporting&quot;&quot;&quot;" name="name"/>
-			<field eval="1" name="global"/>
+	  		<field name="global" eval="True"/>
 		</record>
 
 		<record id="ir_rule_5" model="ir.rule">
-			<field eval="&quot;&quot;&quot;=&quot;&quot;&quot;" name="operator"/>
-			<field eval="&quot;&quot;&quot;user.id&quot;&quot;&quot;" name="operand"/>
-			<field name="field_id" ref="point_of_sale.field_report_transaction_pos_user_id"/>
-			<field name="rule_group" ref="ir_rule_group_posreporting0"/>
+			<field name="model_id" ref="point_of_sale.model_report_transaction_pos"/>		
+			<field name="domain_force">['|',('user_id','=',False),('user_id','=',[user.id])]</field>			
 		</record>
 
 	</data>
diff --git a/addons/point_of_sale/statement_data.xml b/addons/point_of_sale/statement_data.xml
index 947348a990d..098f4cb2b00 100644
--- a/addons/point_of_sale/statement_data.xml
+++ b/addons/point_of_sale/statement_data.xml
@@ -21,13 +21,13 @@
 			<field eval="1" name="perm_create"/>
 			<field name="group_id" ref="point_of_sale.res_groups_posuser0"/>
 		</record>
-		<record id="ir_rule_group_bankstatementcompany0" model="ir.rule.group">
+		<record id="ir_rule_group_bankstatementcompany0" model="ir.rule">
 			<field name="model_id" ref="account.model_account_bank_statement"/>
 			<field eval="&quot;&quot;&quot;Bank Statement company&quot;&quot;&quot;" name="name"/>
 			<field eval="1" name="global"/>
 		</record>
 
-		<record id="ir_rule_group_bankstatementlinecompany0" model="ir.rule.group">
+		<record id="ir_rule_group_bankstatementlinecompany0" model="ir.rule">
 			<field name="model_id" ref="account.model_account_bank_statement_line"/>
 			<field eval="&quot;&quot;&quot;Bank Statement line Company&quot;&quot;&quot;" name="name"/>
 			<field eval="1" name="global"/>
diff --git a/addons/point_of_sale/statement_rules.xml b/addons/point_of_sale/statement_rules.xml
deleted file mode 100644
index eba649f3ec5..00000000000
--- a/addons/point_of_sale/statement_rules.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-	<data>
-</data>
-</openerp>
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
index 6605f3e46e8..d30b3c0a898 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.py
+++ b/addons/point_of_sale/wizard/pos_open_statement.py
@@ -61,12 +61,6 @@ class pos_open_statement(osv.osv_memory):
                 number = sequence_obj.get(cr, uid,
                                 'account.bank.statement')
 
-    #        statement_id=statement_obj.create(cr,uid,{'journal_id':journal.id,
-    #                                                  'company_id':company_id,
-    #                                                  'user_id':uid,
-    #                                                  'state':'open',
-    #                                                  'name':number
-    #                                                  })
             period = statement_obj._get_period(cr, uid, context) or None
             cr.execute("INSERT INTO account_bank_statement(journal_id,company_id,user_id,state,name, period_id,date) VALUES(%d,%d,%d,'open','%s',%d,'%s')"%(journal.id, company_id, uid, number, period, time.strftime('%Y-%m-%d %H:%M:%S')))
             cr.commit()
diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index b5cdc9723c4..35e7e8a82ca 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -34,8 +34,6 @@
     "update_xml" : ["wizard/purchase_requisition_partner_view.xml",
                     "purchase_requisition_view.xml",
                     "security/ir.model.access.csv","purchase_requisition_sequence.xml"],
-#     "test":['test/purchase_requisition_test.yml',
-#                'test/purchase_requisition_exclusive_test.yml'],                    
     "active": False,
     "installable": True
 }
diff --git a/addons/purchase_requisition/test/purchase_requisition_exclusive_test.yml b/addons/purchase_requisition/test/purchase_requisition_exclusive_test.yml
deleted file mode 100644
index 55b7cd44640..00000000000
--- a/addons/purchase_requisition/test/purchase_requisition_exclusive_test.yml
+++ /dev/null
@@ -1,93 +0,0 @@
--
-  In order to test the purchase requicisition module, I will do a sale order -> purchase_requisition ->
-  purchase flow and I will buy the required products at two different suppliers.
--
-  I start by creating a new product 'Laptop ACER', which is purchased at Asustek, in MTO,
-  with the generation of purchase requisitions.
-- 
-  Creating an product.product record
-- 
-  !record {model: product.product, id: product_product_laptopacer0}:
-    categ_id: product.product_category_3
-    cost_method: standard
-    list_price: 1000.0
-    mes_type: fixed
-    name: Laptop ACER1
-    procure_method: make_to_order
-    purchase_requisition: 1
-    seller_ids:
-      - delay: 1
-        name: base.res_partner_asus
-        qty: 5.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit    
-- 
-  Creating an sale.order record
-- 
-  !record {model: sale.order, id: sale_order_testtender0}:
-    date_order: '2010-04-20'
-    invoice_quantity: order
-    name: TEST/TENDER/0002
-    order_line:
-      - name: Laptop ACER1
-        price_unit: 1000.0
-        product_uom: product.product_uom_unit
-        product_uom_qty: 5.0
-        state: draft
-        'delay': 7.0
-        'product_id': product_product_laptopacer0
-        'type': make_to_order
-    order_policy: manual
-    partner_id: base.res_partner_agrolait
-    partner_invoice_id: base.res_partner_address_8
-    partner_order_id: base.res_partner_address_8
-    partner_shipping_id: base.res_partner_address_8
-    picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.shop
-- 
-  Performing a workflow action order_confirm on module sale.order
-- 
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_testtender0}
--
-  I launch he scheduler to compute all procurements, and planify all requisitions order  
-- 
-  !python {model: mrp.procurement.compute.all}: |
-    proc_obj = self.pool.get('mrp.procurement')
-    proc_obj._procure_confirm(cr,uid)
-
--
-  Creating an purchase.requisition record
--  
-  !record {model: purchase.requisition.partner, id: purchase_requisition_partner_1}:
-      partner_id: base.res_partner_4
-      partner_address_id: base.res_partner_address_7
-- 
- !python {model: purchase.requisition}: |
-    requisition_obj = self.pool.get('purchase.requisition.partner')
-    req_obj = self.pool.get('purchase.requisition')
-    ids =req_obj.search(cr, uid, [('origin','=','TEST/TENDER/0002')])
-    requisition_obj.create_order(cr,uid, [ref('purchase_requisition_partner_1')],{'active_ids': ids})
--    
- !python {model: purchase.requisition}: |
-    purchase_obj = self.pool.get('purchase.order')
-    ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0002')])[0]
-    self.write(cr,uid,ids,{'exclusive': 'exclusive' })
-    ids =purchase_obj.search(cr, uid, [('requisition_id','in',[ids])])
-    assert (len(ids)<2),"Purchase Order  hasn't Created"
--
-  I change the quantities so that the purchase order for DistriPC includes 3 pieces and the
-  purchase order for Asustek includes 2 pieces.    
--
- !python {model: purchase.order}: |
-    purchase_id= self.search(cr, uid, [('origin','=','TEST/TENDER/0002')])
-    order_line=self.browse(cr, uid, purchase_id, context)[0].order_line[0].id
-    self.pool.get('purchase.order.line').write(cr, uid, [order_line], {'product_qty':5})
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")  
-    if purchase_id:
-      wf_service.trg_validate(uid, 'purchase.order',purchase_id[0],'purchase_confirm', cr)
-      wf_service.trg_validate(uid, 'purchase.order',purchase_id[0],'purchase_approve', cr)     
--
\ No newline at end of file
diff --git a/addons/purchase_requisition/test/purchase_requisition_test.yml b/addons/purchase_requisition/test/purchase_requisition_test.yml
deleted file mode 100644
index de4af5c9b6b..00000000000
--- a/addons/purchase_requisition/test/purchase_requisition_test.yml
+++ /dev/null
@@ -1,117 +0,0 @@
--
-  In order to test the purchase requicisition module, I will do a sale order -> purchase_requisition ->
-  purchase flow and I will buy the required products at two different suppliers.
--
-  I start by creating a new product 'Laptop ACER', which is purchased at Asustek, in MTO,
-  with the generation of purchase requisitions.
-- 
-  Creating an product.product record
-- 
-  !record {model: product.product, id: product_product_laptopacer0}:
-    categ_id: product.product_category_3
-    cost_method: standard
-    list_price: 1000.0
-    mes_type: fixed
-    name: Laptop ACER
-    procure_method: make_to_order
-    purchase_requisition: 1
-    seller_ids:
-      - delay: 1
-        name: base.res_partner_asus
-        qty: 5.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit    
-- 
-  Creating an sale.order record
-- 
-  !record {model: sale.order, id: sale_order_so0}:
-    date_order: '2010-04-20'
-    invoice_quantity: order
-    name: TEST/TENDER/0001
-    order_line:
-      - name: Laptop ACER
-        price_unit: 1000.0
-        product_uom: product.product_uom_unit
-        product_uom_qty: 5.0
-        state: draft
-        'delay': 7.0
-        'product_id': product_product_laptopacer0
-        'type': make_to_order
-    order_policy: manual
-    partner_id: base.res_partner_agrolait
-    partner_invoice_id: base.res_partner_address_8
-    partner_order_id: base.res_partner_address_8
-    partner_shipping_id: base.res_partner_address_8
-    picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.shop
-- 
-  Performing a workflow action order_confirm on module sale.order
-- 
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so0}
--
-  I launch he scheduler to compute all procurements, and planify all requisitions order  
-- 
-  !python {model: mrp.procurement.compute.all}: |
-    proc_obj = self.pool.get('mrp.procurement')
-    proc_obj._procure_confirm(cr,uid)
-
--
-  Creating an purchase.requisition record
--  
-  !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}:
-      partner_id: base.res_partner_4
-      partner_address_id: base.res_partner_address_7
--
-  On the purchase tender, I create a new purchase order for the supplier 'DistriPC' by clicking on
-  the button 'New RfQ'. This opens a window to ask me the supplier and I set DistriPC      
-- 
- !python {model: purchase.requisition}: |
-    requisition_obj = self.pool.get('purchase.requisition.partner')
-    req_obj = self.pool.get('purchase.requisition')
-    ids =req_obj.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
-    requisition_obj.create_order(cr,uid, [ref('purchase_requisition_partner_0')],{'active_ids': ids})
--
-   check that I have two purchase orders on the purchase tender    
--    
- !python {model: purchase.requisition}: |
-    purchase_obj = self.pool.get('purchase.order')
-    requisition_ids= self.search(cr, uid, [],context)
-    ids =purchase_obj.search(cr, uid, [('requisition_id','in',requisition_ids)])
-    assert len(ids) < 2,"Purchase Order  hasn't Created"
--
-  I change the quantities so that the purchase order for DistriPC includes 3 pieces and the
-  purchase order for Asustek includes 2 pieces.    
-- 
-  !python {model: purchase.order}: |
-    purchase_id1= self.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
-    purchase_id2= self.search(cr, uid, [('origin','=','TE00001')])
-    order_line1=self.browse(cr, uid, purchase_id1, context)[0].order_line[0].id
-    order_line2=self.browse(cr, uid, purchase_id2, context)[0].order_line[0].id    
-    self.pool.get('purchase.order.line').write(cr, uid, [order_line1], {'product_qty':2})
-    self.pool.get('purchase.order.line').write(cr, uid, [order_line2], {'product_qty':3})
-    todo=[]
-    todo.append(purchase_id1[0])
-    todo.append(purchase_id2[0])
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")
-    for ids in todo: 
-      wf_service.trg_validate(uid, 'purchase.order',ids,'purchase_confirm', cr)    
-      wf_service.trg_validate(uid, 'purchase.order',ids,'purchase_approve', cr)        
--
-  Create a record in purchase requisition
--
-   !python {model: purchase.requisition}: | 
-     ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
-     self.tender_done(cr,uid,ids)  
--     
-  I check that the delivery order of the customer is in state 'Waiting Goods'
-- 
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so0"))  
-    assert (so.picking_ids[0].state) =='confirmed',"Delivery Order not confirmed"
-    assert (so.picking_ids[0].move_lines[0].state=='waiting')
--
-  I receive the order of the supplier Asustek from the Incoming Products menu

From 998f57878682cc7352449232311310d25d888a3a Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 5 May 2010 16:46:30 +0530
Subject: [PATCH 42/84] [IMP]:template of configuration wizards

bzr revid: nch@tinyerp.com-20100505111630-ygnzg2lnwi832hsg
---
 bin/addons/base/res/res_config.xml | 49 +++++++++++++-----------------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index 1615b8a3545..95e36b883ce 100644
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -60,35 +60,28 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form>
-          <group colspan="4">
-            <group colspan="4" col="12">
-              <group colspan="2">
-                <field name="config_logo" widget="image" nolabel="1" colspan="1"/>
-                <newline/>
-                <label align="0.0" string="description" width="200"/>
-              </group>
-              <group colspan="2">
-          		<separator string="vsep" position="vertical" colspan="1" rowspan="12"/>
-	          </group>
-              <group>
-              	<separator string="title" colspan="4"/>
-              	 <group colspan="8" />
+        	<group colspan="4" col="8">
+              	<group colspan="4" width="200" height="250">
+                	<field name="config_logo" widget="image" nolabel="1" colspan="1"/>
+                	<newline/>
+                	<label align="0.0" string="description" width="200" colspan="2"/>
+                	<separator string="vsep" position="vertical" colspan="1" rowspan="12"/>
               	</group>
-            </group>
-          </group>
-          <group colspan="4" col="8">
-          	<separator string="" colspan="8"/>
-            <field name="progress" widget="progressbar" nolabel="1"/>
-            <label string="" colspan="5"/>
-            <group colspan="1">
-              <button name="action_skip" icon="gtk-goto-last" special="cancel"
-                      type="object" string="Skip"/>
-            </group>
-            <group colspan="1">
-              <button name="action_next" icon="gtk-go-forward"
-                      type="object" string="Install Modules"/>
-            </group>
-          </group>
+            	<group colspan="4">
+              		<separator string="title" colspan="4"/>
+              		<group colspan="8"/>
+            	</group>
+			</group>
+            	<group colspan="8" col="8">
+            		<separator string="" colspan="8"/>
+            		<group colspan="4" width="220">
+            			<field name="progress" widget="progressbar" nolabel="1" colspan="2"/>
+            		</group>
+		 	 		<button name="action_skip" icon="gtk-goto-last" special="cancel"
+	                    	type="object" string="Skip" colspan="1"/>
+	                <button name="action_next" icon="gtk-go-forward"
+	                	 type="object" string="Install Modules" colspan="1"/>
+   				</group>
         </form>
 
       </field>

From ab3736820c55459ed3d05c20a94647b46b6a9566 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Wed, 5 May 2010 13:40:20 +0200
Subject: [PATCH 43/84] [IMP] stock: import statement was twice in the same
 __init__ file

bzr revid: qdp-launchpad@tinyerp.com-20100505114020-94ojibtj4qkzx0b2
---
 addons/stock/report/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/stock/report/__init__.py b/addons/stock/report/__init__.py
index 8fd64d9f112..a0a4bcb8ea5 100644
--- a/addons/stock/report/__init__.py
+++ b/addons/stock/report/__init__.py
@@ -29,7 +29,6 @@ import lot_overview_all
 import report_stock
 import report_stock_move
 import report_stock_picking
-import report_stock_move
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From 1ef96229cc00b93b0cfada2c6c92e7f18bb0df61 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Wed, 5 May 2010 13:58:15 +0200
Subject: [PATCH 44/84] [IMP] stock: improve field name: 'scrap location'
 instead of 'scraped' on stock.location

bzr revid: qdp-launchpad@tinyerp.com-20100505115815-eoqa80ydw00i0bql
---
 addons/stock/stock.py                   | 4 ++--
 addons/stock/wizard/stock_move_view.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 4cee95a16c2..111ae31ded4 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -182,7 +182,7 @@ class stock_location(osv.osv):
         'stock_real_value': fields.function(_product_value, method=True, type='float', string='Real Stock Value', multi="stock"),
         'stock_virtual_value': fields.function(_product_value, method=True, type='float', string='Virtual Stock Value', multi="stock"),
         'company_id': fields.many2one('res.company', 'Company', required=True,select=1),
-        'scraped': fields.boolean('Scraped'),
+        'scrap_location': fields.boolean('Scrap Location', help='Check this box if the current location is a place for destroyed items'),
     }
     _defaults = {
         'active': lambda *a: 1,
@@ -195,7 +195,7 @@ class stock_location(osv.osv):
         'posy': lambda *a: 0,
         'posz': lambda *a: 0,
         'icon': lambda *a: False,
-        'scraped': lambda *a: False,
+        'scrap_location': lambda *a: False,
     }
 
     def chained_location_get(self, cr, uid, location, partner=None, product=None, context={}):
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 310702392f3..481722f8d7f 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -73,7 +73,7 @@
                 <form string="Scrap Move">
                 	<separator string="Scrap Products" colspan="4"/>
 				    <field name="product_id" colspan="4" readonly="1"/>
-				    <field name="location_id" colspan="4" string="Dest. Location" domain="[('usage','&lt;&gt;','view'),('scraped','=',True)]"/>
+				    <field name="location_id" colspan="4" string="Dest. Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]"/>
 				    <field name="product_qty" colspan="2"/>
 				    <field name="product_uom" nolabel="1" readonly="1"/>
                 	<newline/>

From 100b5a092147653aff0583244215413c4d41f876 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Wed, 5 May 2010 14:05:32 +0200
Subject: [PATCH 45/84] [IMP] stock: improved field name: 'scrap_location'
 instead of 'scraped' for stock.location object

bzr revid: qdp-launchpad@tinyerp.com-20100505120532-nghd0hu829ieor9c
---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 45b95779660..bb7331f4b58 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -404,7 +404,7 @@
                     <field name="location_id"/>
                     <field name="address_id" context="{'contact_display':'partner'}"/>
                     <field name="icon"/>
-                    <field name="scraped"/>
+                    <field name="scrap_location"/>
                     <newline/>
                     <group col="2" colspan="2" groups="base.group_extended">
                         <separator string="Chained Locations" colspan="2"/>

From 894efa65640302708bcff737558e426c9d208d43 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 5 May 2010 18:18:59 +0530
Subject: [PATCH 46/84] Task-ID:506 Improve the onchange on product_id

bzr revid: sbh@tinyerp.com-20100505124859-ir4qt1lbfjefe0bf
---
 addons/point_of_sale/posrule_data.xml                    | 2 +-
 addons/purchase_requisition/purchase_requisition.py      | 9 +++++----
 .../purchase_requisition/purchase_requisition_view.xml   | 6 +++---
 .../wizard/purchase_requisition_partner.py               | 4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/addons/point_of_sale/posrule_data.xml b/addons/point_of_sale/posrule_data.xml
index 69dcf769700..57e909ae913 100644
--- a/addons/point_of_sale/posrule_data.xml
+++ b/addons/point_of_sale/posrule_data.xml
@@ -36,7 +36,7 @@
 	<data>
 		<record id="res_groups_posuserposline0" model="res.groups">
 			<field eval="[(6,0,[ref('point_of_sale.menu_action_pos_order_line'),ref('point_of_sale.menu_action_pos_order_line_day')])]" name="menu_access"/>
-			<field eval="[(6,0,[ref('ir_rule_0')])]" name="groups"/>
+			<field eval="[(6,0,[ref('ir_rule_0')])]" name="rule_groups"/>
 			<field eval="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
 			<field eval="&quot;&quot;&quot;POS_user_pos_line&quot;&quot;&quot;" name="name"/>
 		</record>
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index fa4a1f8b153..e7b1f09aa90 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -86,7 +86,7 @@ class purchase_requisition_line(osv.osv):
         'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition', ondelete='cascade')
     }
 
-    def onchange_product_id(self, cr, uid, ids, product_id, context={}):
+    def onchange_product_id(self, cr, uid, ids, product_id,product_uom_id, context={}):
 
         """ Changes UoM and name if product_id changes.
         @param name: Name of the field
@@ -94,13 +94,14 @@ class purchase_requisition_line(osv.osv):
         @return:  Dictionary of changed values
         """
         value = {}
-
+        
         if product_id:
             prod = self.pool.get('product.product').browse(cr, uid, [product_id])[0]
-
             value = {'product_uom_id': prod.uom_id.id}
-
+            if product_uom_id != prod.uom_id.id:
+                value = {'product_uom_id': prod.uom_id.id}            
         return {'value': value}
+
     _defaults = {
                  'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
                  }
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index c1acbd32513..1df006ec3ab 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -46,14 +46,14 @@
                     <page string="Products">
                         <field name="line_ids" colspan="4" nolabel="1">
                             <tree string="Products" editable="bottom">
-                                <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                                <field name="product_id" on_change="onchange_product_id(product_id,product_uom_id)"/>
                                 <field name="product_qty"/>
                                 <field name="product_uom_id"/>
                             </tree>
                             <form string="Products" editable="bottom">
-                                <field name="product_id"/>
+                                <field name="product_id" />
 								<field name="product_qty"/>
-                                <field name="product_uom_id"/>
+                                <field name="product_uom_id" />
 								<field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             </form>
 
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index ea5195936cc..e886ba302b9 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -111,11 +111,11 @@ class purchase_requisition_partner(osv.osv_memory):
                         })   
                     list_line.append(purchase_order_line)
                 purchase_id = order_obj.create(cr, uid, {
-                            'origin': tender.name,
+                            'origin': tender.purchase_ids and tender.purchase_ids[0].origin or tender.name,
                             'partner_id': partner_id,
                             'partner_address_id': address_id,
                             'pricelist_id': pricelist_id,
-                            'location_id': line.product_id.product_tmpl_id.property_stock_production.id,                            
+                            'location_id': tender.purchase_ids and tender.purchase_ids[0].location_id.id or line.product_id.product_tmpl_id.property_stock_production.id,                        
                             'company_id': tender.company_id.id,
                             'fiscal_position': partner.property_account_position and partner.property_account_position.id or False,
                             'requisition_id':tender.id,

From ebde563d056eebd30c0d3f7a329fee442da57d7a Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 5 May 2010 19:01:47 +0530
Subject: [PATCH 47/84] [IMP]:gtk contact form

bzr revid: nch@tinyerp.com-20100505133147-9lpdgkf1tn75v8ws
---
 bin/tools/misc.py | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index 7aee1aed1b0..e552660e3e2 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -33,6 +33,8 @@ import release
 import socket
 import re
 from itertools import islice
+import threading
+
 
 if sys.version_info[:2] < (2, 4):
     from threadinglocal import local
@@ -472,7 +474,7 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
     for key, value in x_headers.iteritems():
         msg['X-OpenERP-%s' % key] = str(value)
         msg['%s' % key] = str(value)
-    
+
     if openobject_id:
         msg['Message-Id'] = "<%s-openobject-%s@%s>" % (time.time(), openobject_id, socket.gethostname())
 
@@ -1284,6 +1286,23 @@ if __name__ == '__main__':
     import doctest
     doctest.testmod()
 
+class upload_data_thread(threading.Thread):
+    def __init__(self, email, data, type):
+        self.args = [('email',email),('type',type),('data',data)]
+        super(upload_data_thread,self).__init__()
+    def run(self):
+        try:
+            import urllib
+            args = urllib.urlencode(self.args)
+            fp = urllib.urlopen('http://www.openerp.com/scripts/survey.php', args)
+            fp.read()
+            fp.close()
+        except:
+            pass
 
+def upload_data(email, data, type='SURVEY'):
+    a = upload_data_thread(email, data, type)
+    a.start()
+    return True
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From 83909e727ff3bd40e4dfb5b0d56267703cd7eb58 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Wed, 5 May 2010 19:04:01 +0530
Subject: [PATCH 48/84] [IMP] purchase: Task ID-574: Improved workflow for
 purchase.

bzr revid: uco@tinyerp.com-20100505133401-034efr7mmalysg3c
---
 addons/purchase/purchase_workflow.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index b8171cf5e53..d7684be1875 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -193,6 +193,12 @@
             <field name="condition">check_buy()</field>
         </record>
         
+        <record id="trans_buy_make_done" model="workflow.transition">
+            <field name="act_from" ref="act_buy"/>
+            <field name="act_to" ref="mrp_procurement.act_make_done"/>
+            <field name="signal">subflow.delivery_done</field>
+        </record>
+        
         <record id="trans_buy_cancel" model="workflow.transition">
             <field name="act_from" ref="act_buy"/>
             <field name="act_to" ref="mrp_procurement.act_cancel"/>

From f5867d9489132a26a347c017d667fb2c8ea9d311 Mon Sep 17 00:00:00 2001
From: "HDA (OpenERP)" <hda@tinyerp.com>
Date: Wed, 5 May 2010 19:43:30 +0530
Subject: [PATCH 49/84] usability improvement for sale

bzr revid: hda@tinyerp.com-20100505141330-zfbcuifv7nluauad
---
 bin/addons/base/res/partner/partner.py        |  6 ++--
 .../base/res/partner/partner_report.xml       |  4 +--
 bin/addons/base/res/partner/partner_view.xml  | 30 ++++++++++++++++---
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index 0cdf3d927d4..3e890e6efed 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -134,7 +134,7 @@ class res_partner(osv.osv):
         'title': fields.selection(_partner_title_get, 'Title', size=32),
         'parent_id': fields.many2one('res.partner','Parent Partner', select=2),
         'child_ids': fields.one2many('res.partner', 'parent_id', 'Partner Ref.'),
-        'ref': fields.char('Code', size=64),
+        'ref': fields.char('Reference', size=64),
         'lang': fields.selection(_lang_get, 'Language', size=5, help="If the selected language is loaded in the system, all documents related to this partner will be printed in this language. If not, it will be english."),
         'user_id': fields.many2one('res.users', 'Salesman', help='The internal user that is in charge of communicating with this partner if any.'),
         'vat': fields.char('VAT',size=32 ,help="Value Added Tax number. Check the box if the partner is subjected to the VAT. Used by the VAT legal statement."),
@@ -151,7 +151,9 @@ class res_partner(osv.osv):
         'supplier': fields.boolean('Supplier', help="Check this box if the partner is a supplier. If it's not checked, purchase people will not see it when encoding a purchase order."),
         'city': fields.related('address', 'city', type='char', string='City'), 
         'phone': fields.related('address', 'phone', type='char', string='Phone'), 
-        'country': fields.related('address', 'country_id', type='many2one', relation='res.country', string='Country'), 
+        'country': fields.related('address', 'country_id', type='many2one', relation='res.country', string='Country'),
+        'employee': fields.boolean('Employee', help="Check this box if the partner is an Employee."),
+        'email': fields.related('address', 'email', type='char', size=240, string='E-mail'),
         'company_id': fields.many2one('res.company', 'Company', select=1), 
     }
 
diff --git a/bin/addons/base/res/partner/partner_report.xml b/bin/addons/base/res/partner/partner_report.xml
index b4057414f56..61e3876527f 100644
--- a/bin/addons/base/res/partner/partner_report.xml
+++ b/bin/addons/base/res/partner/partner_report.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <report id="res_partner_address_report" model="res.partner" name="res.partner.address" string="Labels" xml="base/res/partner/report/partner_address.xml" xsl="base/res/partner/report/partner_address.xsl"/>
-        <!-- 
+        <report id="res_partner_address_report" model="res.partner" name="res.partner.address" string="Labels" xml="base/res/partner/report/partner_address.xml" xsl="base/res/partner/report/partner_address.xsl" groups="base.group_extended"/>
+        <!--
 		<report string="Business Cards" model="res.partner" name="res.partner.businesscard" xml="base/res/partner/report/business_card.xml" xsl="base/res/partner/report/business_card.xsl"/>
 		-->
     </data>
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 38dbeb34bc8..840ee132481 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -6,7 +6,7 @@
         <menuitem id="menu_base_config" name="Configuration" parent="menu_base_partner" sequence="9"
             groups="group_system"/>
 
-        <menuitem id="menu_base_config_partner" name="Partners" parent="menu_base_config" sequence="10" />
+        <menuitem id="menu_base_config_partner" name="Partners" parent="menu_base_config" sequence="10" groups="base.group_extended"/>
         <menuitem id="menu_base_config_contact" name="Contacts" parent="menu_base_config" sequence="20" />
 
         <!--
@@ -249,10 +249,11 @@
             <field name="arch" type="xml">
                 <tree string="Partners">
                     <field name="name"/>
-                    <field name="ref"/>
+                    <field name="ref" groups="base.group_extended"/>
                     <field name="phone"/>
                     <field name="city"/>
                     <field name="country"/>
+                    <field name="email"/>
                     <field name="lang"/>
                     <field name="user_id"/>
                 </tree>
@@ -275,6 +276,7 @@
                         <group colspan="1" col="2">
                             <field name="customer" select="1"/>
                             <field name="supplier"/>
+                            <field name="employee"/>
                         </group>
                     </group>
                     <notebook colspan="4">
@@ -315,7 +317,7 @@
                                 </tree>
                             </field>
                             <separator colspan="4" string="Categories"/>
-                            <field colspan="4" name="category_id" nolabel="1" height="90"/>
+                            <field colspan="4" name="category_id" nolabel="1" height="90" groups="base.group_extended"/>
                         </page>
                         <page string="Sales &amp; Purchases">
                             <separator string="General Information" colspan="4"/>
@@ -349,6 +351,7 @@
                         <separator orientation="vertical"/>
                         <filter string="Customers" icon="terp-partner" domain="[('customer','=',1)]" help="Customer Partners"/>
                         <filter string="Suppliers" icon="terp-partner" domain="[('supplier','=',1)]" help="Supplier Partners"/>
+                         <filter string="Employees" icon="terp-partner" domain="[('employee','=',1)]" help="Employee Partners"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="address" select="1"/>
@@ -406,6 +409,16 @@
             <field name="filter" eval="True"/>
         </record>
 
+        <record id="action_partner_employee_form" model="ir.actions.act_window">
+            <field name="name">Employees</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">res.partner</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('employee','=',1)]</field>
+            <field name="context">{'default_customer':0, 'default_supplier':0 , 'default_employee':1}</field>
+            <field name="filter" eval="True"/>
+        </record>
+
         <record id="action_partner_other_form" model="ir.actions.act_window">
             <field name="name">Other Partners</field>
             <field name="type">ir.actions.act_window</field>
@@ -621,7 +634,16 @@
         <act_window domain="[('partner_id', '=', active_id)]"
             id="act_res_partner_event" name="Events"
             res_model="res.partner.event"
-            src_model="res.partner"/>
+            src_model="res.partner"
+            groups="base.group_extended"
+            />
+
+        <record id="ir_ui_view_sc_partner0" model="ir.ui.view_sc">
+            <field name="name">Partner</field>
+            <field name="resource">ir.ui.menu</field>
+            <field name="user_id" ref="base.user_root"/>
+             <field name="res_id" ref="menu_partner_form"/>
+        </record>
 
     </data>
 </openerp>

From 5c1695e248ceeebf30dca9326b5795053141124d Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 6 May 2010 12:50:19 +0530
Subject: [PATCH 50/84] [FIX] :point_of_sale: fix the probelm of ir_property

bzr revid: sbh@tinyerp.com-20100506072019-yyoeeq5lrfdepc4e
---
 addons/point_of_sale/pos.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 8b31c3348d3..6a1e78ecbe0 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -496,11 +496,11 @@ class pos_order(osv.osv):
                     if line.product_id and line.product_id.type=='service':
                         continue
                     prop_ids = self.pool.get("ir.property").search(cr, uid, [('name', '=', 'property_stock_customer')])
-                    val = self.pool.get("ir.property").browse(cr, uid, prop_ids[0]).value
+                    val = self.pool.get("ir.property").browse(cr, uid, prop_ids[0]).value_reference
                     cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order.shop_id.warehouse_id.id))
                     res=cr.fetchone()
                     location_id=res and res[0] or None
-                    stock_dest_id = int(val.split(',')[1])
+                    stock_dest_id = val.id
                     if line.qty < 0:
                         location_id, stock_dest_id = stock_dest_id, location_id
 
@@ -609,7 +609,7 @@ class pos_order(osv.osv):
         if 'payment_name' in data.keys():
             args['name'] = data['payment_name'] + ' ' +order.name
         account_def = self.pool.get('ir.property').get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
-        args['account_id'] = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def or curr_c.account_receivable.id
+        args['account_id'] = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def.id or curr_c.account_receivable.id
         if data.get('is_acc',False):
             args['is_acc']=data['is_acc']
             args['account_id']= prod_obj.browse(cr,uid, data['product_id']).property_account_income and prod_obj.browse(cr,uid, data['product_id']).property_account_income.id
@@ -773,7 +773,7 @@ class pos_order(osv.osv):
             to_reconcile = []
             group_tax = {}
             account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
-            order_account = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def or curr_c.account_receivable.id
+            order_account = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def.id or curr_c.account_receivable.id
 
             # Create an entry for the sale
             move_id = account_move_obj.create(cr, uid, {

From b0929a59a28622f2306192e6588ec8628ffa2189 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 6 May 2010 12:54:37 +0530
Subject: [PATCH 51/84] [FIX] :point_of_sale: fix the probelm of ir_property in
 pos_return wizard

bzr revid: sbh@tinyerp.com-20100506072437-2qw1unb3bdn3mhre
---
 addons/point_of_sale/wizard/pos_return.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index f0a63eeb00f..592ce3db56b 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -147,11 +147,11 @@ class pos_return(osv.osv_memory):
 
             for order_id in order_obj.browse(cr, uid, [record_id], context=context):
                 prop_ids = property_obj.search(cr, uid,[('name', '=', 'property_stock_customer')])
-                val = property_obj.browse(cr, uid,prop_ids[0]).value
+                val = property_obj.browse(cr, uid,prop_ids[0]).value_reference
                 cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
                 res=cr.fetchone()
                 location_id=res and res[0] or None
-                stock_dest_id = int(val.split(',')[1])
+                stock_dest_id = val.id
                                     
                 new_picking=picking_obj.copy(cr, uid, order_id.last_out_picking.id, {'name':'%s (return)' % order_id.name,
                                                                                     'move_lines':[], 'state':'draft', 'type':'in',
@@ -232,11 +232,11 @@ class add_product(osv.osv_memory):
                 prod=data['product_id']
                 qty=data['quantity']
                 prop_ids = property_obj.search(cr, uid,[('name', '=', 'property_stock_customer')])
-                val = property_obj.browse(cr, uid,prop_ids[0]).value
+                val = property_obj.browse(cr, uid,prop_ids[0]).value_reference
                 cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
                 res=cr.fetchone()
                 location_id=res and res[0] or None
-                stock_dest_id = int(val.split(',')[1])
+                stock_dest_id = val.id
         
                 prod_id=prod_obj.browse(cr,uid,prod)
                 new_picking=picking_obj.create(cr,uid,{
@@ -295,11 +295,11 @@ class add_product(osv.osv_memory):
         wf_service = netsvc.LocalService("workflow")
         for order_id in order_obj.browse(cr, uid, [record_id], context=context):
             prop_ids =property_obj.search(cr, uid,[('name', '=', 'property_stock_customer')])
-            val = property_obj.browse(cr, uid,prop_ids[0]).value
+            val = property_obj.browse(cr, uid,prop_ids[0]).value_reference
             cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
             res=cr.fetchone()
             location_id=res and res[0] or None
-            stock_dest_id = int(val.split(',')[1])
+            stock_dest_id = val.id
     
             order_obj.write(cr,uid,[order_id.id],{'type_rec':'Exchange'})
             if order_id.invoice_id:

From 9188a9c47b10cbea19db8c7701d349e1bdbd83ef Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 6 May 2010 15:41:38 +0530
Subject: [PATCH 52/84] [Fix]: point_of_sale: Fix the problem of account_id

bzr revid: sbh@tinyerp.com-20100506101138-670uvxm5oml2jvzg
---
 addons/point_of_sale/pos.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 711c41f1960..ede0f7bd15c 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -610,7 +610,7 @@ class pos_order(osv.osv):
         if 'payment_name' in data.keys():
             args['name'] = data['payment_name'] + ' ' +order.name
         account_def = self.pool.get('ir.property').get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
-        args['account_id'] = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def or curr_c.account_receivable.id
+        args['account_id'] = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def.id or curr_c.account_receivable.id
         if data.get('is_acc',False):
             args['is_acc']=data['is_acc']
             args['account_id']= prod_obj.browse(cr,uid, data['product_id']).property_account_income and prod_obj.browse(cr,uid, data['product_id']).property_account_income.id

From 1ec225ce8c6444f7d03770574c22a04544d34f5f Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Thu, 6 May 2010 17:32:27 +0530
Subject: [PATCH 53/84] [FIX] pos: remove record_id from context

bzr revid: hmo@tinyerp.com-20100506120227-gsnmwtry60a6uld2
---
 addons/point_of_sale/pos_view.xml         |  2 +-
 addons/point_of_sale/wizard/pos_return.py | 54 ++++++++++++-----------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 4958afc82fd..6e5b2933ee1 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -65,7 +65,7 @@
                                 <button name="%(action_report_pos_receipt)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
                                 <button name="set_to_draft" string="Set to draft" states="paid" icon="gtk-execute" type="object" />
                                 <button name="%(action_view_pos_return)d" string="Return Picking" type="action" icon="gtk-ok" states="paid"
-                                    attrs="{'invisible':[('state','!=','paid'),('state','!=','invoiced')]}"  context="{'record_id':'active_id'}" />                             
+                                    attrs="{'invisible':[('state','!=','paid'),('state','!=','invoiced')]}" >                             
                             </group>
                         </page>
 
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index 592ce3db56b..07423eddc0d 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -52,11 +52,11 @@ class pos_return(osv.osv_memory):
         """ 
 
         res = super(pos_return, self).default_get(cr, uid, fields, context=context)
-        order_obj=self.pool.get('pos.order')      
-        record_id=context.get('record_id')
+        order_obj = self.pool.get('pos.order')
+        active_ids = context.get('active_ids')
         if not context:
             context={}
-        for order in order_obj.browse(cr, uid,[record_id]):
+        for order in order_obj.browse(cr, uid, active_ids):
             for line in order.lines:
                 if 'return%s'%(line.id) in fields:
                     res['return%s'%(line.id)] = line.qty        
@@ -66,9 +66,10 @@ class pos_return(osv.osv_memory):
         res = super(pos_return, self).view_init(cr, uid, fields_list, context=context)
         order_obj=self.pool.get('pos.order')           
         if not context:
-            context={}
-        record_id=context.get('record_id')            
-        for order in order_obj.browse(cr, uid,[record_id]):            
+            context={}       
+        
+        active_ids=context.get('active_ids')            
+        for order in order_obj.browse(cr, uid, active_ids):            
             for line in order.lines:    
                 if 'return%s'%(line.id) not in self._columns:
                     self._columns['return%s'%(line.id)] = fields.float("Quantity")
@@ -79,14 +80,17 @@ class pos_return(osv.osv_memory):
         result = super(pos_return, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
         if not context:
             context={}
-        order_obj=self.pool.get('pos.order')
-        record_id = context.get('record_id', False)
-        if record_id:
+        active_model = context.get('active_model')
+        if not active_model and active_model != 'pos.order':
+            return result
+        order_obj = self.pool.get('pos.order')
+        active_id = context.get('active_id', False)
+        if active_id:
             _moves_arch_lst="""<?xml version="1.0"?>
                             <form string="Return lines">
                             <label string="Quantities you enter, match to products that will return to the stock." colspan="4"/>"""
             _line_fields = result['fields']                
-            order=order_obj.browse(cr, uid, record_id)
+            order=order_obj.browse(cr, uid, active_id)
             for line in order.lines:    
                 quantity=line.qty    
                 _line_fields.update({
@@ -130,7 +134,7 @@ class pos_return(osv.osv_memory):
                 'type': 'ir.actions.act_window',
         }
     def create_returns2(self, cr, uid, ids, context):
-        record_id = context.get('record_id', False)        
+        active_id = context.get('active_id', False)        
         order_obj =self.pool.get('pos.order')
         line_obj = self.pool.get('pos.order.line')
         picking_obj = self.pool.get('stock.picking')
@@ -139,13 +143,13 @@ class pos_return(osv.osv_memory):
         uom_obj =self. pool.get('product.uom')
         wf_service = netsvc.LocalService("workflow")
         #Todo :Need to clean the code
-        if record_id:
-            picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in',[record_id]), ('state', '=', 'done')])
+        if active_id:
+            picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in',[active_id]), ('state', '=', 'done')])
             data=self.read(cr,uid,ids)[0]
             clone_list = []
             date_cur=time.strftime('%Y-%m-%d')
 
-            for order_id in order_obj.browse(cr, uid, [record_id], context=context):
+            for order_id in order_obj.browse(cr, uid, [active_id], context=context):
                 prop_ids = property_obj.search(cr, uid,[('name', '=', 'property_stock_customer')])
                 val = property_obj.browse(cr, uid,prop_ids[0]).value_reference
                 cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
@@ -206,10 +210,10 @@ class add_product(osv.osv_memory):
              @return : Retrun the add product form again for adding more product
         """               
         
-        if not context.get('record_id', False):
+        if not context.get('active_id', False):
             super(add_product).select_product(cr,uid,ids)
         else:    
-            record_id=context.get('record_id', False)
+            active_id=context.get('active_id', False)
             data =  self.read(cr, uid, ids)[0] 
                    
             order_obj = self.pool.get('pos.order')
@@ -219,16 +223,16 @@ class add_product(osv.osv_memory):
             move_obj = self.pool.get('stock.move')
             property_obj= self.pool.get("ir.property")
             invoice_obj= self.pool.get('account.invoice')
-            picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in',[record_id]), ('state', '=', 'done')])
+            picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in',[active_id]), ('state', '=', 'done')])
             clone_list = []
             date_cur=time.strftime('%Y-%m-%d')
             uom_obj = self.pool.get('product.uom')
             prod_obj=self.pool.get('product.product')
             wf_service = netsvc.LocalService("workflow")
             return_boj=self.pool.get('pos.return')
-            order_obj.add_product(cr, uid, record_id,data['product_id'],data['quantity'], context=context)
+            order_obj.add_product(cr, uid, active_id,data['product_id'],data['quantity'], context=context)
               
-            for order_id in order_obj.browse(cr, uid, [record_id], context=context):
+            for order_id in order_obj.browse(cr, uid, [active_id], context=context):
                 prod=data['product_id']
                 qty=data['quantity']
                 prop_ids = property_obj.search(cr, uid,[('name', '=', 'property_stock_customer')])
@@ -259,7 +263,7 @@ class add_product(osv.osv_memory):
         
                 wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
                 picking_obj.force_assign(cr, uid, [new_picking], context)
-                order_obj.write(cr,uid,record_id,{'last_out_picking':new_picking})
+                order_obj.write(cr,uid,active_id,{'last_out_picking':new_picking})
                 
              
         return {            
@@ -276,7 +280,7 @@ class add_product(osv.osv_memory):
 
     def close_action(self, cr, uid, ids, context):
 
-        record_id=context.get('record_id', False)            
+        active_id=context.get('active_id', False)            
         order_obj = self.pool.get('pos.order')
         lines_obj = self.pool.get('pos.order.line')
         picking_obj = self.pool.get('stock.picking')
@@ -284,7 +288,7 @@ class add_product(osv.osv_memory):
         move_obj = self.pool.get('stock.move')
         property_obj= self.pool.get("ir.property")   
         invoice_obj=self.pool.get('account.invoice')
-        picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', [record_id]), ('state', '=', 'done')])
+        picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', [active_id]), ('state', '=', 'done')])
         clone_list = []
         date_cur=time.strftime('%Y-%m-%d')
         uom_obj = self.pool.get('product.uom')
@@ -293,7 +297,7 @@ class add_product(osv.osv_memory):
         data=return_boj.read(cr,uid,return_id,[])[0]
                         
         wf_service = netsvc.LocalService("workflow")
-        for order_id in order_obj.browse(cr, uid, [record_id], context=context):
+        for order_id in order_obj.browse(cr, uid, [active_id], context=context):
             prop_ids =property_obj.search(cr, uid,[('name', '=', 'property_stock_customer')])
             val = property_obj.browse(cr, uid,prop_ids[0]).value_reference
             cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
@@ -328,11 +332,11 @@ class add_product(osv.osv_memory):
                     })
             wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
             picking_obj.force_assign(cr, uid, [new_picking], context)
-        obj=order_obj.browse(cr,uid, record_id)                
+        obj=order_obj.browse(cr,uid, active_id)                
         if obj.amount_total != obj.amount_paid:
             return {
             'name': _('Make Payment'),
-            'context ':context and context.get('record_id', False),
+            'context ':context and context.get('active_id', False),
             'view_type': 'form',
             'view_mode': 'form',
             'res_model': 'pos.make.payment',

From 27e1daebc0b9336057290f9e5a446219b00563c6 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Thu, 6 May 2010 17:46:04 +0530
Subject: [PATCH 54/84] [FIX] stock: Changed field name for scrap_location in
 stock.move.

bzr revid: uco@tinyerp.com-20100506121604-lf2qnizxrw71yqdz
---
 addons/stock/stock_data.xml       | 2 +-
 addons/stock/wizard/stock_move.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index b53d4bed08d..9b3bf1fb9d5 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -40,7 +40,7 @@
         <record id="stock_location_scraped" model="stock.location">
             <field name="name">Scraped</field>
             <field name="location_id" ref="stock_location_locations_virtual"/>
-            <field name="scraped">True</field>
+            <field name="scrap_location">True</field>
         </record>
         
         <record id="location_inventory" model="stock.location">
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index c566c180003..00b7b616aa5 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -141,7 +141,7 @@ class stock_move_scrap(osv.osv_memory):
         res = super(stock_move_consume, self).default_get(cr, uid, fields, context=context)        
         move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
         location_obj = self.pool.get('stock.location')
-        scrpaed_location_ids = location_obj.search(cr, uid, [('scraped','=',True)])
+        scrpaed_location_ids = location_obj.search(cr, uid, [('scrap_location','=',True)])
         
         if 'product_id' in fields:
             res.update({'product_id': move.product_id.id})     

From b1ba2545e8573adf0bf0902590885b5268aa5caf Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 6 May 2010 17:55:49 +0530
Subject: [PATCH 55/84] [Fix] point_of_sale: Fix the problem of active_id

bzr revid: sbh@tinyerp.com-20100506122549-zmncey68qq2vuh9a
---
 addons/point_of_sale/pos_view.xml             |  2 +-
 .../point_of_sale/wizard/pos_add_product.py   |  2 +-
 addons/point_of_sale/wizard/pos_payment.py    | 55 ++++++++++---------
 addons/point_of_sale/wizard/pos_return.py     | 16 ++----
 4 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 6e5b2933ee1..d67476a414d 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -65,7 +65,7 @@
                                 <button name="%(action_report_pos_receipt)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
                                 <button name="set_to_draft" string="Set to draft" states="paid" icon="gtk-execute" type="object" />
                                 <button name="%(action_view_pos_return)d" string="Return Picking" type="action" icon="gtk-ok" states="paid"
-                                    attrs="{'invisible':[('state','!=','paid'),('state','!=','invoiced')]}" >                             
+                                    attrs="{'invisible':[('state','!=','paid'),('state','!=','invoiced')]}"/>                             
                             </group>
                         </page>
 
diff --git a/addons/point_of_sale/wizard/pos_add_product.py b/addons/point_of_sale/wizard/pos_add_product.py
index b977f901eec..c62f4f80ce9 100644
--- a/addons/point_of_sale/wizard/pos_add_product.py
+++ b/addons/point_of_sale/wizard/pos_add_product.py
@@ -63,7 +63,7 @@ class add_product(osv.osv_memory):
         }
     def close_action(self, cr, uid, ids, context):
 
-        record_id = context and context.get('record_id', False)
+        record_id = context and context.get('active_id', False)
         order_obj= self.pool.get('pos.order')
         order_line_obj= self.pool.get('pos.order.line')
         obj=order_obj.browse(cr,uid, record_id)
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index 3c608e452fa..2b64d06d440 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -43,7 +43,7 @@ class pos_make_payment(osv.osv_memory):
          @return: A dictionary which of fields with values. 
         """
         res = super(pos_make_payment, self).default_get(cr, uid, fields, context=context)
-        record_id = context and context.get('record_id',False)  
+        active_id = context and context.get('active_id',False)  
         j_obj = self.pool.get('account.journal')
         company_id = self.pool.get('res.users').browse(cr,uid,uid).company_id.id
         journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', company_id)])
@@ -55,14 +55,14 @@ class pos_make_payment(osv.osv_memory):
         wf_service = netsvc.LocalService("workflow")
 
         order_obj=self.pool.get('pos.order')
-        order = order_obj.browse(cr, uid, record_id, context)
+        order = order_obj.browse(cr, uid, active_id, context)
         #get amount to pay
         amount = order.amount_total - order.amount_paid
         if amount <= 0.0:
             context.update({'flag': True})
-            order_obj.action_paid(cr, uid, [record_id], context)
+            order_obj.action_paid(cr, uid, [active_id], context)
         elif order.amount_paid > 0.0:
-            order_obj.write(cr, uid, [record_id], {'state': 'advance'})
+            order_obj.write(cr, uid, [active_id], {'state': 'advance'})
         invoice_wanted_checked = False
     
         current_date = time.strftime('%Y-%m-%d')
@@ -81,8 +81,8 @@ class pos_make_payment(osv.osv_memory):
         
     def view_init(self, cr, uid, fields_list, context=None):
         res = super(pos_make_payment, self).view_init(cr, uid, fields_list, context=context)
-        record_id = context and context.get('record_id', False) or False        
-        order = self.pool.get('pos.order').browse(cr, uid, record_id)
+        active_id = context and context.get('active_id', False) or False        
+        order = self.pool.get('pos.order').browse(cr, uid, active_id)
         if not order.lines:
                 raise osv.except_osv('Error!','No order lines defined for this sale ')
         True
@@ -99,10 +99,15 @@ class pos_make_payment(osv.osv_memory):
              @return: New arch of view.
         
         """
-        record_id = context and context.get('record_id', False) or False        
-        res = super(pos_make_payment, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
-        if record_id:
-            order = self.pool.get('pos.order').browse(cr, uid, record_id)
+     
+                
+        result = super(pos_make_payment, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+        active_model = context.get('active_model')
+        if not active_model and active_model != 'pos.order':
+            return result           
+        active_id = context.get('active_id', False)        
+        if active_id:
+            order = self.pool.get('pos.order').browse(cr, uid, active_id)
             if order.amount_total == order.amount_paid:
                 res['arch'] = """ <form string="Make Payment" colspan="4">
                                 <group col="2" colspan="2">
@@ -121,10 +126,10 @@ class pos_make_payment(osv.osv_memory):
         if the order is not paid: continue payment,
         if the order is paid print invoice (if wanted) or ticket.
         """
-        record_id = context and context.get('record_id',False)      
+        active_id = context and context.get('active_id',False)      
         order_obj = self.pool.get('pos.order')
         jrnl_obj = self.pool.get('account.journal')        
-        order = order_obj.browse(cr, uid, record_id, context)
+        order = order_obj.browse(cr, uid, active_id, context)
         amount = order.amount_total - order.amount_paid
         data =  self.read(cr, uid, ids)[0]
         
@@ -134,35 +139,35 @@ class pos_make_payment(osv.osv_memory):
             jrnl_used=False
             if data.get('journal',False):
                 jrnl_used=jrnl_obj.browse(cr,uid,data['journal'])
-            order_obj.write(cr, uid, [record_id], {'invoice_wanted': invoice_wanted})
-            order_obj.add_payment(cr, uid, record_id, data, context=context)            
+            order_obj.write(cr, uid, [active_id], {'invoice_wanted': invoice_wanted})
+            order_obj.add_payment(cr, uid, active_id, data, context=context)            
         # Todo need to check
 #        if amount<=0.0:
 #            context.update({'flag':True})
-#            order_obj.action_paid(cr,uid,[record_id],context)
-        if order_obj.test_paid(cr, uid, [record_id]):
+#            order_obj.action_paid(cr,uid,[active_id],context)
+        if order_obj.test_paid(cr, uid, [active_id]):
             if order.partner_id and order.invoice_wanted:
                 return self.create_invoice(cr,uid,ids,context)
             else:
                 context.update({'flag': True})                
-                order_obj.action_paid(cr,uid,[record_id],context)                
-                order_obj.write(cr, uid, [record_id],{'state':'paid'})                            
+                order_obj.action_paid(cr,uid,[active_id],context)                
+                order_obj.write(cr, uid, [active_id],{'state':'paid'})                            
                 return self.print_report(cr, uid, ids, context)  
         if order.amount_paid > 0.0:
             context.update({'flag': True})
             # Todo need to check
-            order_obj.action_paid(cr, uid, [record_id], context)            
-            self.pool.get('pos.order').write(cr, uid, [record_id],{'state':'advance'})
+            order_obj.action_paid(cr, uid, [active_id], context)            
+            self.pool.get('pos.order').write(cr, uid, [active_id],{'state':'advance'})
             return self.print_report(cr, uid, ids, context)            
         return {}
 
     
     def create_invoice(self, cr, uid, ids, context):
         wf_service = netsvc.LocalService("workflow")
-        record_ids = [context and context.get('record_id',False)]      
-        for i in record_ids:
+        active_ids = [context and context.get('active_id',False)]      
+        for i in active_ids:
             wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
-        datas = {'ids' : context.get('record_id', [])}        
+        datas = {'ids' : context.get('active_id', [])}        
         return { 
                 'type' : 'ir.actions.report.xml',
                 'report_name':'pos.invoice',
@@ -180,8 +185,8 @@ class pos_make_payment(osv.osv_memory):
          @param context: A standard dictionary 
          @return : retrun report
         """        
-        record_id=context.get('record_id',[])        
-        datas = {'ids' : [record_id]}
+        active_id=context.get('active_id',[])        
+        datas = {'ids' : [active_id]}
         res =  {}        
         datas['form'] = res
 
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index 07423eddc0d..c4eae9296cd 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -209,13 +209,10 @@ class add_product(osv.osv_memory):
              @param context: A standard dictionary 
              @return : Retrun the add product form again for adding more product
         """               
-        
-        if not context.get('active_id', False):
-            super(add_product).select_product(cr,uid,ids)
-        else:    
-            active_id=context.get('active_id', False)
-            data =  self.read(cr, uid, ids)[0] 
-                   
+    
+        active_id=context.get('active_id', False)
+        data =  self.read(cr, uid, ids)[0] 
+        if active_id:               
             order_obj = self.pool.get('pos.order')
             lines_obj = self.pool.get('pos.order.line')
             picking_obj = self.pool.get('stock.picking')
@@ -277,10 +274,9 @@ class add_product(osv.osv_memory):
                 'views': False,
                 'type': 'ir.actions.act_window',
                 }
-
+    
     def close_action(self, cr, uid, ids, context):
-
-        active_id=context.get('active_id', False)            
+        active_id=context.get('active_id', False)     
         order_obj = self.pool.get('pos.order')
         lines_obj = self.pool.get('pos.order.line')
         picking_obj = self.pool.get('stock.picking')

From 163d2bb69d252a60385326fe21f98dc4609254d0 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 6 May 2010 18:02:24 +0530
Subject: [PATCH 56/84] [IMP] point_of_sale: remove the record_id and used
 active_id

bzr revid: sbh@tinyerp.com-20100506123224-7ekkisu26jgkwo4t
---
 addons/point_of_sale/pos_view.xml              | 2 +-
 addons/point_of_sale/wizard/pos_add_product.py | 2 +-
 addons/point_of_sale/wizard/pos_details.xml    | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index d67476a414d..c36420da08a 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -61,7 +61,7 @@
                             <separator colspan="4" string="Actions"/>
                             <group colspan="4" col="6">
                                 <field name="state" select="1"/>
-                                <button name="%(action_pos_payment)d" string="Ma_ke Payment" icon="gtk-ok" type="action" states="draft,advance" context="{'record_id':'active_id'}" />
+                                <button name="%(action_pos_payment)d" string="Ma_ke Payment" icon="gtk-ok" type="action" states="draft,advance" />
                                 <button name="%(action_report_pos_receipt)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
                                 <button name="set_to_draft" string="Set to draft" states="paid" icon="gtk-execute" type="object" />
                                 <button name="%(action_view_pos_return)d" string="Return Picking" type="action" icon="gtk-ok" states="paid"
diff --git a/addons/point_of_sale/wizard/pos_add_product.py b/addons/point_of_sale/wizard/pos_add_product.py
index c62f4f80ce9..5d88b75d7ff 100644
--- a/addons/point_of_sale/wizard/pos_add_product.py
+++ b/addons/point_of_sale/wizard/pos_add_product.py
@@ -71,7 +71,7 @@ class add_product(osv.osv_memory):
         if obj.amount_total != obj.amount_paid:
             return {
             'name': _('Make Payment'),
-            'context ':context and context.get('record_id', False),
+            'context ':context and context.get('active_id', False),
             'view_type': 'form',
             'view_mode': 'form',
             'res_model': 'pos.make.payment',
diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml
index 077e2ed89dc..bb62b94fb75 100644
--- a/addons/point_of_sale/wizard/pos_details.xml
+++ b/addons/point_of_sale/wizard/pos_details.xml
@@ -29,7 +29,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-            <field name="context">{'record_id' : active_id}</field>
         </record>
 
         

From 56ded53b7c4ecc641bb26ee15d6f0d72b900ebed Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 6 May 2010 18:08:34 +0530
Subject: [PATCH 57/84] [Fix] point_of_sale: Fix the problem of active_id in
 pos_payment

bzr revid: sbh@tinyerp.com-20100506123834-e72pyj3ahb9d0jvl
---
 addons/point_of_sale/wizard/pos_payment.py | 29 ++++++++++++----------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index 2b64d06d440..f5bc1ea9d8c 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -105,20 +105,23 @@ class pos_make_payment(osv.osv_memory):
         active_model = context.get('active_model')
         if not active_model and active_model != 'pos.order':
             return result           
-        active_id = context.get('active_id', False)        
+        active_id = context.get('active_id', False)  
         if active_id:
-            order = self.pool.get('pos.order').browse(cr, uid, active_id)
-            if order.amount_total == order.amount_paid:
-                res['arch'] = """ <form string="Make Payment" colspan="4">
-                                <group col="2" colspan="2">
-                                    <label string="Do you want to print the Receipt?" colspan="4"/>
-                                    <separator colspan="4"/>
-                                    <button icon="gtk-cancel" special="cancel" string="No" readonly="0"/>
-                                    <button name="print_report" string="Print Receipt" type="object" icon="gtk-print"/>
-                                </group>
-                            </form>
-                        """
-        return res
+            try:            
+                order = self.pool.get('pos.order').browse(cr, uid, active_id)
+                if order.amount_total == order.amount_paid:
+                    res['arch'] = """ <form string="Make Payment" colspan="4">
+                                    <group col="2" colspan="2">
+                                        <label string="Do you want to print the Receipt?" colspan="4"/>
+                                        <separator colspan="4"/>
+                                        <button icon="gtk-cancel" special="cancel" string="No" readonly="0"/>
+                                        <button name="print_report" string="Print Receipt" type="object" icon="gtk-print"/>
+                                    </group>
+                                </form>
+                            """
+            except:
+                return result                            
+        return result
 
     def check(self, cr, uid, ids, context=None):
         

From 7de93b1c1f0f834dbf7cb19ee8c98094bdc51c65 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Thu, 6 May 2010 20:04:30 +0530
Subject: [PATCH 58/84] [pos] fix: context problems

bzr revid: hmo@tinyerp.com-20100506143430-0kshbbhq00hm43q2
---
 addons/point_of_sale/wizard/pos_payment.py | 38 ++++++++++------------
 addons/point_of_sale/wizard/pos_return.py  | 16 +++++----
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index f5bc1ea9d8c..f59d814522c 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -43,6 +43,7 @@ class pos_make_payment(osv.osv_memory):
          @return: A dictionary which of fields with values. 
         """
         res = super(pos_make_payment, self).default_get(cr, uid, fields, context=context)
+        
         active_id = context and context.get('active_id',False)  
         j_obj = self.pool.get('account.journal')
         company_id = self.pool.get('res.users').browse(cr,uid,uid).company_id.id
@@ -84,8 +85,8 @@ class pos_make_payment(osv.osv_memory):
         active_id = context and context.get('active_id', False) or False        
         order = self.pool.get('pos.order').browse(cr, uid, active_id)
         if not order.lines:
-                raise osv.except_osv('Error!','No order lines defined for this sale ')
-        True
+            raise osv.except_osv('Error!','No order lines defined for this sale ')
+        return True
     
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         """ 
@@ -103,24 +104,21 @@ class pos_make_payment(osv.osv_memory):
                 
         result = super(pos_make_payment, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
         active_model = context.get('active_model')
-        if not active_model and active_model != 'pos.order':
-            return result           
-        active_id = context.get('active_id', False)  
-        if active_id:
-            try:            
-                order = self.pool.get('pos.order').browse(cr, uid, active_id)
-                if order.amount_total == order.amount_paid:
-                    res['arch'] = """ <form string="Make Payment" colspan="4">
-                                    <group col="2" colspan="2">
-                                        <label string="Do you want to print the Receipt?" colspan="4"/>
-                                        <separator colspan="4"/>
-                                        <button icon="gtk-cancel" special="cancel" string="No" readonly="0"/>
-                                        <button name="print_report" string="Print Receipt" type="object" icon="gtk-print"/>
-                                    </group>
-                                </form>
-                            """
-            except:
-                return result                            
+        active_id = context.get('active_id', False)
+        if not active_id or (active_model and active_model != 'pos.order'):
+            return result                  
+                 
+        order = self.pool.get('pos.order').browse(cr, uid, active_id)
+        if order.amount_total == order.amount_paid:
+            res['arch'] = """ <form string="Make Payment" colspan="4">
+                            <group col="2" colspan="2">
+                                <label string="Do you want to print the Receipt?" colspan="4"/>
+                                <separator colspan="4"/>
+                                <button icon="gtk-cancel" special="cancel" string="No" readonly="0"/>
+                                <button name="print_report" string="Print Receipt" type="object" icon="gtk-print"/>
+                            </group>
+                        </form>
+                    """                                   
         return result
 
     def check(self, cr, uid, ids, context=None):
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index c4eae9296cd..bdb6f46e71e 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -131,6 +131,7 @@ class pos_return(osv.osv_memory):
                 'view_id': False,
                 'target':'new',
                 'views': False,
+                'context': context,
                 'type': 'ir.actions.act_window',
         }
     def create_returns2(self, cr, uid, ids, context):
@@ -193,6 +194,7 @@ class pos_return(osv.osv_memory):
                 'auto_refresh':0,
                 'res_id':new_order,
                 'view_id': False,
+                'context':context,
                 'type': 'ir.actions.act_window'
             }
         return act
@@ -276,7 +278,7 @@ class add_product(osv.osv_memory):
                 }
     
     def close_action(self, cr, uid, ids, context):
-        active_id=context.get('active_id', False)     
+        active_ids=context.get('active_ids', False)         
         order_obj = self.pool.get('pos.order')
         lines_obj = self.pool.get('pos.order.line')
         picking_obj = self.pool.get('stock.picking')
@@ -284,7 +286,7 @@ class add_product(osv.osv_memory):
         move_obj = self.pool.get('stock.move')
         property_obj= self.pool.get("ir.property")   
         invoice_obj=self.pool.get('account.invoice')
-        picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', [active_id]), ('state', '=', 'done')])
+        picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', active_ids), ('state', '=', 'done')])
         clone_list = []
         date_cur=time.strftime('%Y-%m-%d')
         uom_obj = self.pool.get('product.uom')
@@ -293,7 +295,7 @@ class add_product(osv.osv_memory):
         data=return_boj.read(cr,uid,return_id,[])[0]
                         
         wf_service = netsvc.LocalService("workflow")
-        for order_id in order_obj.browse(cr, uid, [active_id], context=context):
+        for order_id in order_obj.browse(cr, uid, active_ids, context=context):
             prop_ids =property_obj.search(cr, uid,[('name', '=', 'property_stock_customer')])
             val = property_obj.browse(cr, uid,prop_ids[0]).value_reference
             cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
@@ -328,11 +330,12 @@ class add_product(osv.osv_memory):
                     })
             wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
             picking_obj.force_assign(cr, uid, [new_picking], context)
-        obj=order_obj.browse(cr,uid, active_id)                
+        obj=order_obj.browse(cr,uid, active_ids[0])    
+
         if obj.amount_total != obj.amount_paid:
             return {
             'name': _('Make Payment'),
-            'context ':context and context.get('active_id', False),
+            'context ':context,
             'view_type': 'form',
             'view_mode': 'form',
             'res_model': 'pos.make.payment',
@@ -341,7 +344,8 @@ class add_product(osv.osv_memory):
             'views': False,
             'type': 'ir.actions.act_window',
             
-            }                    
+            }
+        return True                    
                  
 add_product()        
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From fe0683b6c5d6d8667fc50b454d8eeddb8e301924 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 10 May 2010 10:35:07 +0530
Subject: [PATCH 59/84] [ADD] mrp: Added a yaml for production order.

bzr revid: uco@tinyerp.com-20100510050507-226w7n75zheys6pw
---
 addons/mrp/__openerp__.py                |   2 +-
 addons/mrp/test/mrp_phantom_bom.yml      |  14 ++-
 addons/mrp/test/mrp_production_order.yml | 139 +++++++++++++++++++++++
 3 files changed, 150 insertions(+), 5 deletions(-)
 create mode 100644 addons/mrp/test/mrp_production_order.yml

diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index 43e0eb3af8d..0fa66ac7bd1 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -77,7 +77,7 @@
         'report/mrp_production_order_view.xml',
     ],
     'demo_xml': ['mrp_demo.xml', 'mrp_order_point.xml'],
-#    'test': ['test/mrp_phantom_bom.yml'],
+#    'test': ['test/mrp_phantom_bom.yml','test/mrp_production_order.yml'],
     'installable': True,
     'active': False,
     'certificate': '0032052481373',
diff --git a/addons/mrp/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml
index f841739e366..df4ade1cb6e 100644
--- a/addons/mrp/test/mrp_phantom_bom.yml
+++ b/addons/mrp/test/mrp_phantom_bom.yml
@@ -222,7 +222,13 @@
 -
   I receive both the products. My incoming pickings are done.
 -
-  !function {model: stock.move.split, name: split_lot}:
-    - model: stock.picking
-      search: "[('origin','in',['PO00001:SCHEDULER','PO00002:SCHEDULER','PO00003:OP/00002','PO00004:OP/00003']),('type','=','in')]"
-   
\ No newline at end of file
+  !record {model: stock.partial.picking, id: stock_partial_picking0}:
+    date: '2010-04-30 16:53:36'
+    partner_id: base.res_partner_asus
+    address_id: base.res_partner_address_tang
+-
+  !python {model: stock.partial.picking}: |
+     pick_obj = self.pool.get('stock.picking')
+     picking_ids = pick_obj.search(cr, uid, [('origin','in',['PO00001:SCHEDULER','PO00002:SCHEDULER','PO00003:OP/00002','PO00004:OP/00003']),('type','=','in')])
+     self.do_partial(cr, uid, [1],context={'active_ids': picking_ids})
+     
\ No newline at end of file
diff --git a/addons/mrp/test/mrp_production_order.yml b/addons/mrp/test/mrp_production_order.yml
new file mode 100644
index 00000000000..023a9f22f31
--- /dev/null
+++ b/addons/mrp/test/mrp_production_order.yml
@@ -0,0 +1,139 @@
+-
+  In order to test the manufacturing order working with procurements I will use
+  some products with different supply method and procurement method, also check 
+  the bills of material for the products.
+-
+  I am creating one manufacturing order.
+- 
+  !record {model: mrp.production, id: mrp_production_mo0}:
+    bom_id: mrp.mrp_bom_9
+    routing_id: mrp.mrp_routing_0
+    company_id: base.main_company
+    date_planned: '2010-05-06 14:55:52'
+    location_dest_id: stock.stock_location_stock
+    location_src_id: stock.stock_location_stock
+    name: MO/00004
+    product_id: product.product_product_pc1
+    product_qty: 5.0
+    product_uom: product.product_uom_unit
+    product_uos_qty: 0.0
+- 
+  Creating a mrp.production.workcenter.line record
+- 
+  !record {model: mrp.production.workcenter.line, id: mrp_production_workcenter_line_assemblyline0}:
+    cycle: 5.0
+    hour: 10.0
+    name: Assembly Line 1
+    production_id: mrp_production_mo0
+    sequence: 0.0
+    workcenter_id: mrp.mrp_workcenter_0
+- 
+  Creating a mrp.production.product.line record
+- 
+  !record {model: mrp.production.product.line, id: mrp_production_product_line_regularprocessorconfig0}:
+    name: Regular processor config
+    product_id: product.product_product_cpu_gen
+    product_qty: 5.0
+    product_uom: product.product_uom_unit
+    product_uos_qty: 0.0
+    production_id: mrp_production_mo0
+- 
+  Creating a mrp.production.product.line record
+- 
+  !record {model: mrp.production.product.line, id: mrp_production_product_line_hddseagategb0}:
+    name: HDD Seagate 7200.8 80GB
+    product_id: product.product_product_hdd1
+    product_qty: 5.0
+    product_uom: product.product_uom_unit
+    product_uos_qty: 0.0
+    production_id: mrp_production_mo0
+- 
+  Creating a mrp.production.product.line record
+- 
+  !record {model: mrp.production.product.line, id: mrp_production_product_line_atxmidsizetower0}:
+    name: ATX Mid-size Tower
+    product_id: product.product_product_tow1
+    product_qty: 5.0
+    product_uom: product.product_uom_unit
+    product_uos_qty: 0.0
+    production_id: mrp_production_mo0
+- 
+  Creating a mrp.production.product.line record
+- 
+  !record {model: mrp.production.product.line, id: mrp_production_product_line_mouse0}:
+    name: Mouse
+    product_id: product.product_product_25
+    product_qty: 5.0
+    product_uom: product.product_uom_unit
+    product_uos_qty: 0.0
+    production_id: mrp_production_mo0
+- 
+  Creating a mrp.production.product.line record
+- 
+  !record {model: mrp.production.product.line, id: mrp_production_product_line_keyboard0}:
+    name: Keyboard
+    product_id: product.product_product_24
+    product_qty: 5.0
+    product_uom: product.product_uom_unit
+    product_uos_qty: 0.0
+    production_id: mrp_production_mo0
+-
+  I confirm the order.
+- 
+  !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_mo0}
+-
+  I am checking Procurement orders. 
+-
+  !python {model: mrp.procurement}: |
+    from tools.translate import _
+    proc_ids = self.search(cr, uid, [('origin','=',':MO/00004')])
+    assert proc_ids, _('No Procurements!')
+-
+  The scheduler runs.
+-
+  !function {model: mrp.procurement, name: run_scheduler}:
+    - model: mrp.procurement
+      search: "[('origin','=',':MO/00004')]"
+-
+  I am checking Internal picking.
+-
+  !python {model: stock.picking}: |
+    from tools.translate import _
+    pick_ids = self.search(cr, uid, [('origin','=',':MO/00004'),('type','=','internal')])
+    assert pick_ids, _('No Internal Pickings!')
+-
+  I see that there is a manufacturing order for the subproduct of PC1 with ready state.
+-
+  !python {model: mrp.production}: |
+    from tools.translate import _
+    order_ids = self.search(cr, uid, [('origin','=',':MO/00004'),('state','=','ready')])
+    assert order_ids, _('No manufacturing order!')
+-
+  I start producing that product first. So I marked it as started.
+-
+  !record {model: mrp.product.produce, id: mrp_product_produce0}:
+    product_qty: 5.00
+    mode: 'consume_produce'
+-
+  !python {model: mrp.product.produce}: |
+    prod_obj = self.pool.get('mrp.production')
+    prod_ids = prod_obj.search(cr, uid, [('origin','=',':MO/00004')])
+    self.do_produce(cr, uid, [1], context={'active_ids': prod_ids})
+-
+  Now the manufacturing order for subproduct CPU_GEN is done. And manufacturing
+  order for PC1 is in ready state.
+-
+  !python {model: mrp.production}: |
+    from tools.translate import _
+    prod_ids = self.search(cr, uid, [('origin','=',':MO/00004'),('state','=','done')])
+    assert prod_ids, _('Manufacturing order is yet not done!')
+-
+  I start producing the product PC1.
+-
+  !workflow {model: mrp.production, action: button_produce, ref: mrp_production_mo0}
+-
+  !python {model: mrp.product.produce}: |
+    from tools.translate import _
+    prod_obj = self.pool.get('mrp.production')
+    prod_ids = prod_obj.search(cr, uid, [('product_id.default_code','=','PC1')])
+    self.do_produce(cr, uid, [1], context={'active_ids': prod_ids})

From 5cb824dbc3418bde27ffaed6fd6b04741c3f95a5 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 10 May 2010 11:40:36 +0530
Subject: [PATCH 60/84] [REF] mrp,mrp_repair: Changed context value for
 fetching active_id.

bzr revid: uco@tinyerp.com-20100510061036-7d5jhokehaaxdv2e
---
 addons/mrp/wizard/mrp_track_prod.py       | 56 ++++++++++++-----------
 addons/mrp_repair/wizard/cancel_repair.py | 33 ++++++-------
 2 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/addons/mrp/wizard/mrp_track_prod.py b/addons/mrp/wizard/mrp_track_prod.py
index 11e1ec32ec6..43929b47dc7 100644
--- a/addons/mrp/wizard/mrp_track_prod.py
+++ b/addons/mrp/wizard/mrp_track_prod.py
@@ -56,33 +56,35 @@ class mrp_track_move(osv.osv_memory):
         """
         res = super(mrp_track_move, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
         record_id = context and context.get('active_id', False) or False
-        if record_id:
-            prod_obj = self.pool.get('mrp.production')
-            prod = prod_obj.browse(cr, uid, record_id)
-            try:
-                if prod.state != 'done':
-                    res['arch'] = '''<form string="Track lines">
-                                        <label colspan="4" string="You can not split an unfinished production Output." />
-                                        <group col="2" colspan="4">
-                                            <button icon='gtk-cancel' special="cancel"
-                                                string="Exit" />
-                                        </group>
-                                    </form>
-                                    '''
-                else:
-                    arch_lst = ['<form string="Track lines">', '<label colspan="4" string="The field on each line says whether this lot should be tracked or not." />']
-                    for m in [line for line in prod.move_created_ids]:
-                        quantity = m.product_qty
-                        res['fields']['track%s' %m.id] = {'string' : m.product_id.name, 'type' : 'boolean', 'default' : lambda x,y,z: False}
-                        arch_lst.append('<field name="track%s" />\n<newline />' %m.id)
-                    arch_lst.append('<group col="2" colspan="4">')
-                    arch_lst.append('<button icon=\'gtk-cancel\' special="cancel" string="Cancel" />')
-                    arch_lst.append('<button name="track_lines" string="Track" colspan="1" type="object" icon="gtk-ok" />')
-                    arch_lst.append('</group>')
-                    arch_lst.append('</form>')
-                    res['arch'] = '\n'.join(arch_lst)
-            except Exception,e:
-                return res
+        active_model = context.get('active_model')
+
+        if not record_id or (active_model and active_model != 'mrp.production'):
+            return res
+        
+        prod_obj = self.pool.get('mrp.production')
+        prod = prod_obj.browse(cr, uid, record_id)
+        if prod.state != 'done':
+            res['arch'] = '''<form string="Track lines">
+                                <label colspan="4" string="You can not split an unfinished production Output." />
+                                <group col="2" colspan="4">
+                                    <button icon='gtk-cancel' special="cancel"
+                                        string="Exit" />
+                                </group>
+                            </form>
+                            '''
+        else:
+            arch_lst = ['<form string="Track lines">', '<label colspan="4" string="The field on each line says whether this lot should be tracked or not." />']
+            for m in [line for line in prod.move_created_ids]:
+                quantity = m.product_qty
+                res['fields']['track%s' %m.id] = {'string' : m.product_id.name, 'type' : 'boolean', 'default' : lambda x,y,z: False}
+                arch_lst.append('<field name="track%s" />\n<newline />' %m.id)
+            arch_lst.append('<group col="2" colspan="4">')
+            arch_lst.append('<button icon=\'gtk-cancel\' special="cancel" string="Cancel" />')
+            arch_lst.append('<button name="track_lines" string="Track" colspan="1" type="object" icon="gtk-ok" />')
+            arch_lst.append('</group>')
+            arch_lst.append('</form>')
+            res['arch'] = '\n'.join(arch_lst)
+        
         return res
     
     def track_lines(self, cr, uid, ids, context):
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index 371b7ba82e3..ecc88ef6aae 100644
--- a/addons/mrp_repair/wizard/cancel_repair.py
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -57,23 +57,24 @@ class repair_cancel(osv.osv_memory):
         @param context: A standard dictionary 
         @return: New arch of view.
         """
-        record_id = context and context.get('active_id', False) or False        
         res = super(repair_cancel, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
-        if record_id:
-            try:
-                repair_order = self.pool.get('mrp.repair').browse(cr, uid, record_id)
-                if not repair_order.invoiced:
-                    res['arch'] = """ <form string="Cancel Repair" colspan="4">
-                                    <group col="2" colspan="2">
-                                        <label string="Do you want to continue?" colspan="4"/>
-                                        <separator colspan="4"/>
-                                        <button icon="gtk-cancel" special="cancel" string="No" readonly="0"/>
-                                        <button name="cancel_repair" string="Yes" type="object" icon="gtk-ok"/>
-                                    </group>
-                                </form>                             
-                            """
-            except:
-                return res
+        record_id = context and context.get('active_id', False) or False        
+        active_model = context.get('active_model')
+        
+        if not record_id or (active_model and active_model != 'mrp.repair'):
+            return res
+        
+        repair_order = self.pool.get('mrp.repair').browse(cr, uid, record_id)
+        if not repair_order.invoiced:
+            res['arch'] = """ <form string="Cancel Repair" colspan="4">
+                            <group col="2" colspan="2">
+                                <label string="Do you want to continue?" colspan="4"/>
+                                <separator colspan="4"/>
+                                <button icon="gtk-cancel" special="cancel" string="No" readonly="0"/>
+                                <button name="cancel_repair" string="Yes" type="object" icon="gtk-ok"/>
+                            </group>
+                        </form>                             
+                    """
         return res
 
 repair_cancel()

From c5479dc8e369d3612c5fbb421add22e6d523f1e5 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 10 May 2010 11:55:03 +0530
Subject: [PATCH 61/84] [FIX] mrp_repair: Fixed domain error in mrp.repair.fee
 view.

bzr revid: uco@tinyerp.com-20100510062503-rjixonfngw4x84i3
---
 addons/mrp_repair/mrp_repair_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 9f629ad8a46..667e9763827 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -115,7 +115,7 @@
                                                 <field name="invoiced"/>
                                             </group>
                                             <newline/>
-                                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&gt;&gt;','purchase')]"/>
+                                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                          </page>
                                          <page string="History" groups="base.group_extended">
                                             <field colspan="4" name="invoice_line_id" />

From e08b461fcd2a9f86e3c4ba4e287a0aff15e6cad4 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Mon, 10 May 2010 13:32:14 +0530
Subject: [PATCH 62/84] [IMP]:base installer wizard

bzr revid: nch@tinyerp.com-20100510080214-4f1kcgyslk1l0vl7
---
 bin/addons/base/res/res_config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index 95e36b883ce..06fd9c380bb 100644
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -74,7 +74,7 @@
 			</group>
             	<group colspan="8" col="8">
             		<separator string="" colspan="8"/>
-            		<group colspan="4" width="220">
+            		<group string="progress" colspan="4" width="220">
             			<field name="progress" widget="progressbar" nolabel="1" colspan="2"/>
             		</group>
 		 	 		<button name="action_skip" icon="gtk-goto-last" special="cancel"

From 0bac4d348eeefbbb871e657b1397956b79ad39b6 Mon Sep 17 00:00:00 2001
From: Quentin De Paoli <qdp@cyan>
Date: Mon, 10 May 2010 14:21:19 +0200
Subject: [PATCH 63/84] [IMP] hr_contract: improved label

bzr revid: qdp@cyan-20100510122119-b4cdze60az0ewwnx
---
 addons/hr_contract/hr_contract.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index b8a310cc7bd..ddc29bd26a1 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -86,7 +86,7 @@ class hr_contract(osv.osv):
         'job_id': fields.many2one('hr.job', 'Job Title'),
         'date_start': fields.date('Start Date', required=True),
         'date_end': fields.date('End Date'),
-        'working_hours': fields.many2one('resource.calendar','Working hours'),
+        'working_hours': fields.many2one('resource.calendar','Working Schedule'),
         'wage_type_id': fields.many2one('hr.contract.wage.type', 'Wage Type', required=True),
         'wage': fields.float('Wage', digits=(16,2), required=True),
         'advantages': fields.text('Advantages'),
@@ -99,4 +99,4 @@ class hr_contract(osv.osv):
     }
 hr_contract()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 22d3a19c2048476b29c6255b794381901625bb19 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Tue, 11 May 2010 05:19:06 +0100
Subject: [PATCH 64/84] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100511041906-ew82achw4z0i6oko
---
 addons/account/i18n/it.po |  8 ++++----
 addons/event/i18n/et.po   | 42 +++++++++++++++++++--------------------
 addons/hr/i18n/tr.po      | 10 +++++-----
 addons/idea/i18n/hr.po    |  8 ++++----
 addons/product/i18n/tr.po |  8 ++++----
 addons/wiki/i18n/tr.po    | 38 +++++++++++++++++------------------
 6 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index d38b9e78254..3e1cac8d4b5 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-26 07:46+0000\n"
+"PO-Revision-Date: 2010-05-10 08:37+0000\n"
 "Last-Translator: eLBati - albatos.com <lorenzo.battistini@albatos.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-28 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-05-11 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1192,7 +1192,7 @@ msgstr "Report tassa"
 #: wizard_button:account.analytic.account.chart,init,open:0
 #: wizard_button:account.chart,init,open:0
 msgid "Open Charts"
-msgstr "Apri"
+msgstr "Apri conti"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close.state,init:0
@@ -4162,7 +4162,7 @@ msgstr "Fattura"
 #: wizard_button:account.open_closed_fiscalyear,init,open:0
 #: wizard_button:account_use_models,create,open_move:0
 msgid "Open"
-msgstr "Apri"
+msgstr "Aperto"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_29
diff --git a/addons/event/i18n/et.po b/addons/event/i18n/et.po
index d184aebb4cc..d7595209b97 100644
--- a/addons/event/i18n/et.po
+++ b/addons/event/i18n/et.po
@@ -7,25 +7,25 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 13:36+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-10 10:27+0000\n"
+"Last-Translator: lyyser <logard.1961@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-05-11 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
 #: field:event.event,date_end:0
 #: field:report.event.registration,date_end:0
 msgid "Ending date"
-msgstr ""
+msgstr "Lõpu kuupäev"
 
 #. module: event
 #: field:event.event,register_min:0
 msgid "Minimum Registrations"
-msgstr ""
+msgstr "Miinimum registreerimised"
 
 #. module: event
 #: constraint:ir.actions.act_window:0
@@ -35,17 +35,17 @@ msgstr "Vigane mudeli nimi toimingu definitsioonis."
 #. module: event
 #: field:event.event,mail_registr:0
 msgid "Registration Email"
-msgstr ""
+msgstr "Registreerimise Email"
 
 #. module: event
 #: model:crm.case.section,name:event.event_0_crm_case_section
 msgid "Concert of Bon Jovi"
-msgstr ""
+msgstr "Bon Jovi kontsert"
 
 #. module: event
 #: field:event.event,mail_confirm:0
 msgid "Confirmation Email"
-msgstr ""
+msgstr "Kinnitus Email"
 
 #. module: event
 #: constraint:crm.case.section:0
@@ -55,7 +55,7 @@ msgstr "Viga! Sa ei saa luua rekursiivseid sektsioone."
 #. module: event
 #: model:ir.model,name:event.model_event_registration
 msgid "Event Registration"
-msgstr ""
+msgstr "Sündmuse registreerimine"
 
 #. module: event
 #: model:ir.actions.wizard,name:event.event_reg_invoice
@@ -65,52 +65,52 @@ msgstr ""
 #. module: event
 #: field:report.event.type.registration,draft_state:0
 msgid "Draft Registrations"
-msgstr ""
+msgstr "Registreerimiste mustand"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Event on Registration"
-msgstr ""
+msgstr "Registreerimise sündmus"
 
 #. module: event
 #: wizard_button:event.reg_make_invoice,init,end:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: event
 #: field:event.event,mail_auto_confirm:0
 msgid "Mail Auto Confirm"
-msgstr ""
+msgstr "Autokinnituse meil"
 
 #. module: event
 #: model:product.template,name:event.event_product_1_product_template
 msgid "Ticket for Opera"
-msgstr ""
+msgstr "Ooperi pilet"
 
 #. module: event
 #: wizard_field:event.reg_make_invoice,init,inv_rejected:0
 msgid "Invoice Rejected"
-msgstr ""
+msgstr "Arve väljapraagitud"
 
 #. module: event
 #: view:event.event:0
 msgid "Confirm Event"
-msgstr ""
+msgstr "Kinnita sündmus"
 
 #. module: event
 #: model:crm.case.section,name:event.event_1_crm_case_section
 msgid "Opera of Verdi"
-msgstr ""
+msgstr "Verdi ooper"
 
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid "Draft Registration"
-msgstr ""
+msgstr "Registreerimise mustand"
 
 #. module: event
 #: wizard_view:event.reg_make_invoice,init:0
 msgid "Create Invoices"
-msgstr ""
+msgstr "Loo arved"
 
 #. module: event
 #: model:ir.module.module,description:event.module_meta_information
@@ -134,12 +134,12 @@ msgstr ""
 #. module: event
 #: view:event.registration:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Täiendav info"
 
 #. module: event
 #: view:event.registration:0
 msgid "Registration"
-msgstr ""
+msgstr "Registreerimine"
 
 #. module: event
 #: field:event.type,name:0
diff --git a/addons/hr/i18n/tr.po b/addons/hr/i18n/tr.po
index 5e4be7c5558..86e7205ef3a 100644
--- a/addons/hr/i18n/tr.po
+++ b/addons/hr/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-14 21:34+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-10 13:18+0000\n"
+"Last-Translator: Angel Spy <melissadilara@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-05-11 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -62,7 +62,7 @@ msgstr ""
 #. module: hr
 #: view:hr.department:0
 msgid "Department"
-msgstr ""
+msgstr "Bölüm"
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
@@ -340,7 +340,7 @@ msgstr "Firmalar"
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Wednesday"
-msgstr "Carsamba"
+msgstr "Çarşamba"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
diff --git a/addons/idea/i18n/hr.po b/addons/idea/i18n/hr.po
index 9083bd8d0aa..97112788aea 100644
--- a/addons/idea/i18n/hr.po
+++ b/addons/idea/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-24 10:38+0000\n"
-"Last-Translator: Drazen Bosak <Unknown>\n"
+"PO-Revision-Date: 2010-05-10 06:56+0000\n"
+"Last-Translator: nafterburner <nafterburner@gmail.com>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-05-11 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
@@ -336,7 +336,7 @@ msgstr "Kreator"
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_tools
 msgid "Tools"
-msgstr "Pomagala"
+msgstr "Alati"
 
 #. module: idea
 #: field:idea.comment,idea_id:0
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index bb924db644c..62e52d410d2 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-27 08:20+0000\n"
-"Last-Translator: Oktay Altunergil <Unknown>\n"
+"PO-Revision-Date: 2010-05-10 16:32+0000\n"
+"Last-Translator: Angel Spy <melissadilara@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-05-11 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -90,7 +90,7 @@ msgstr ""
 #. module: product
 #: field:product.packaging,width:0
 msgid "Width"
-msgstr "En/Genişlik"
+msgstr "Genişlik"
 
 #. module: product
 #: help:product.pricelist.item,product_tmpl_id:0
diff --git a/addons/wiki/i18n/tr.po b/addons/wiki/i18n/tr.po
index 0fd7250c93c..3d518e67a0d 100644
--- a/addons/wiki/i18n/tr.po
+++ b/addons/wiki/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-14 21:39+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-10 17:37+0000\n"
+"Last-Translator: Nurettin Ayarcı <nurettinx@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
+"X-Launchpad-Export-Date: 2010-05-11 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
@@ -25,7 +25,7 @@ msgstr ""
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "Nesne adı x_ ile başlamalı ve özel karakter içermemelidir!"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_groups_link
@@ -78,7 +78,7 @@ msgstr ""
 #. module: wiki
 #: field:wiki.wiki,text_area:0
 msgid "Content"
-msgstr ""
+msgstr "İçerik"
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_document_configuration
@@ -119,7 +119,7 @@ msgstr ""
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Create a Menu"
-msgstr ""
+msgstr "Menü Oluştur"
 
 #. module: wiki
 #: field:wiki.groups,notes:0
@@ -195,7 +195,7 @@ msgstr "Görüntüleme mimarisi için Geçersiz XML"
 #. module: wiki
 #: field:wiki.wiki.history,text_area:0
 msgid "Text area"
-msgstr ""
+msgstr "Metin alanı"
 
 #. module: wiki
 #: wizard_field:wiki.create.menu,init,menu_parent_id:0
@@ -216,7 +216,7 @@ msgstr ""
 #: wizard_view:wiki.create.menu,init:0
 #: wizard_view:wiki.make.index,init:0
 msgid "Menu Information"
-msgstr ""
+msgstr "Menü Bilgisi"
 
 #. module: wiki
 #: field:wiki.groups,parent_id:0
@@ -228,12 +228,12 @@ msgstr ""
 #: field:wiki.wiki,summary:0
 #: field:wiki.wiki.history,summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Özet"
 
 #. module: wiki
 #: field:wiki.groups,create_date:0
 msgid "Created Date"
-msgstr ""
+msgstr "Oluşturulma Tarihi"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_history
@@ -259,12 +259,12 @@ msgstr ""
 #. module: wiki
 #: wizard_field:wiki.create.menu,init,menu_name:0
 msgid "Menu Name"
-msgstr ""
+msgstr "Menu İsmi"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Modifications"
-msgstr ""
+msgstr "Değişiklikler"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
@@ -275,18 +275,18 @@ msgstr ""
 #: model:ir.ui.menu,name:wiki.menu_document
 #: view:wiki.wiki:0
 msgid "Wiki"
-msgstr ""
+msgstr "Wiki"
 
 #. module: wiki
 #: field:wiki.wiki,write_date:0
 msgid "Modification Date"
-msgstr ""
+msgstr "Değiştirilme Tarihi"
 
 #. module: wiki
 #: model:ir.actions.wizard,name:wiki.wizard_make_index
 #: wizard_button:wiki.make.index,init,yes:0
 msgid "Create Index"
-msgstr ""
+msgstr "dizin yarat"
 
 #. module: wiki
 #: field:wiki.wiki.history,minor_edit:0
@@ -299,12 +299,12 @@ msgstr ""
 #: wizard_button:wiki.create.menu,init,create_menu:0
 #: wizard_view:wiki.make.index,init:0
 msgid "Create Menu"
-msgstr ""
+msgstr "Menü Oluştur"
 
 #. module: wiki
 #: field:wiki.wiki,tags:0
 msgid "Tags"
-msgstr ""
+msgstr "Etiketler"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_groups
@@ -330,12 +330,12 @@ msgstr ""
 #: wizard_button:wiki.create.menu,init,end:0
 #: wizard_button:wiki.make.index,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Vazgeç"
 
 #. module: wiki
 #: field:wizard.wiki.history.show_diff,diff:0
 msgid "Diff"
-msgstr ""
+msgstr "Farklar"
 
 #. module: wiki
 #: field:wiki.wiki,review:0

From f551530b24fa75aa3fb2df2a0265f0b7f4de952c Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Tue, 11 May 2010 12:47:20 +0530
Subject: [PATCH 65/84] [IMP]:config wizards

bzr revid: nch@tinyerp.com-20100511071720-q6j9a0oyuagitstp
---
 bin/addons/base/res/res_config.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index 06fd9c380bb..6d1d8f98b7f 100644
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -8,7 +8,7 @@
        <form>
     		<group colspan="4" col="8">
               	<group colspan="4" width="200" height="250">
-                	<field name="config_logo" widget="image" nolabel="1" colspan="1"/>
+                	<field name="config_logo" widget="image" width="150" height="100" nolabel="1" colspan="1"/>
                 	<newline/>
                 	<label align="0.0" string="description" width="200" colspan="2"/>
                 	<separator string="vsep" position="vertical" colspan="1" rowspan="12"/>
@@ -62,7 +62,7 @@
         <form>
         	<group colspan="4" col="8">
               	<group colspan="4" width="200" height="250">
-                	<field name="config_logo" widget="image" nolabel="1" colspan="1"/>
+                	<field name="config_logo" widget="image" width="150" height="100" nolabel="1" colspan="1"/>
                 	<newline/>
                 	<label align="0.0" string="description" width="200" colspan="2"/>
                 	<separator string="vsep" position="vertical" colspan="1" rowspan="12"/>

From a9c0b3f78ea3f1b73c3b1b3922cc5d4470258e5f Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Tue, 11 May 2010 15:08:58 +0530
Subject: [PATCH 66/84] [IMP]:config wizard templates

bzr revid: nch@tinyerp.com-20100511093858-f6mxmosml69axxzp
---
 bin/addons/base/base_update.xml    |  5 +++--
 bin/addons/base/res/res_config.py  | 11 +----------
 bin/addons/base/res/res_config.xml | 10 +++++-----
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 1d4a4f0f290..5db326cf0d6 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -291,10 +291,11 @@
 	          </xpath>
 	          <xpath expr='//separator[@string="vsep"]' position='attributes'>
 	          	  <attribute name='string'></attribute>
+	          	  <attribute name='rowspan'>14</attribute>
 		      </xpath>
                <group string="res_config_contents" position="replace">
-	              	<group colspan="5">
-	              		<field colspan="5" name="view" nolabel="1"/>
+	              	<group colspan="4">
+	              		<field colspan="4" name="view" nolabel="1"/>
 					</group>
             	</group>
                 <xpath expr='//button[@name="action_skip"]' position='replace'/>
diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index d474a002faf..e885476eef4 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -50,16 +50,7 @@ class res_config_configurable(osv.osv_memory):
         if total:
             return round(open*100./total)
         return 100.
-#    def default_get(self, cr, uid, fields_list, context=None):
-#        ''' Set Config Logo...
-#        '''
-#        defaults = super(res_config_configurable, self).default_get(
-#            cr, uid, fields_list, context=context)
-#        file_no = str(random.randint(1,3))
-#        path = os.path.join('base','res','config_pixmaps/%s.png'%file_no)
-#        file_data = tools.file_open(path,'rb').read()
-#        defaults.update({'config_logo':base64.encodestring(file_data)})
-#        return defaults
+
     def _get_image(self, cr, uid, context=None):
         file_no = str(random.randint(1,3))
         path = os.path.join('base','res','config_pixmaps/%s.png'%file_no)
diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index 6d1d8f98b7f..e8d4d1df167 100644
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -7,12 +7,12 @@
       <field name="arch" type="xml">
        <form>
     		<group colspan="4" col="8">
-              	<group colspan="4" width="200" height="250">
+              	<group colspan="3" width="200" height="250">
                 	<field name="config_logo" widget="image" width="150" height="100" nolabel="1" colspan="1"/>
                 	<newline/>
                 	<label align="0.0" string="description" width="200" colspan="2"/>
-                	<separator string="vsep" position="vertical" colspan="1" rowspan="12"/>
               	</group>
+              	<separator string="vsep" position="vertical" colspan="1" rowspan="12"/>
             	<group colspan="4">
               		<separator string="title" colspan="4"/>
               		<group string="res_config_contents"/>
@@ -61,12 +61,12 @@
       <field name="arch" type="xml">
         <form>
         	<group colspan="4" col="8">
-              	<group colspan="4" width="200" height="250">
+              	<group colspan="3" width="200" height="300">
                 	<field name="config_logo" widget="image" width="150" height="100" nolabel="1" colspan="1"/>
                 	<newline/>
                 	<label align="0.0" string="description" width="200" colspan="2"/>
-                	<separator string="vsep" position="vertical" colspan="1" rowspan="12"/>
               	</group>
+              	<separator string="vsep" position="vertical" colspan="1" rowspan="12"/>
             	<group colspan="4">
               		<separator string="title" colspan="4"/>
               		<group colspan="8"/>
@@ -74,7 +74,7 @@
 			</group>
             	<group colspan="8" col="8">
             		<separator string="" colspan="8"/>
-            		<group string="progress" colspan="4" width="220">
+            		<group colspan="4" width="220">
             			<field name="progress" widget="progressbar" nolabel="1" colspan="2"/>
             		</group>
 		 	 		<button name="action_skip" icon="gtk-goto-last" special="cancel"

From 74451deac21bcc507cba9721f335c699f62a35a5 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Tue, 11 May 2010 12:12:48 +0200
Subject: [PATCH 67/84] [FIX] crm: Lead -> Opportunity: Use the right email
 address

bzr revid: stephane@openerp.com-20100511101248-80pmbxul0w9t6fwn
---
 addons/crm/crm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 91ef20be892..34d8b46bcf4 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -774,7 +774,7 @@ class crm_case_history(osv.osv):
         """
         res = {}
         for hist in self.browse(cursor, user, ids, context or {}):
-            res[hist.id] = (hist.email or '/') + ' (' + str(hist.date) + ')\n'
+            res[hist.id] = (hist.email_from or '/') + ' (' + str(hist.date) + ')\n'
             res[hist.id] += (hist.description or '')
         return res
 

From 7c7be29028dbe4568e7179afc5d193adb86f4db7 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Tue, 11 May 2010 12:55:36 +0200
Subject: [PATCH 68/84] [FIX] crm: Remove the duplicated Reply-To in the email
 from the mailgateway

bzr revid: stephane@openerp.com-20100511105536-lhhfbmlnx7d3garr
---
 addons/crm/wizard/crm_send_email.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index b0d20cd6e55..ae9ff8541c6 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -92,9 +92,10 @@ class crm_send_new_email(osv.osv_memory):
             email_from = data.get('email_from', False)
             case_pool._history(cr, uid, [case], _('Send'), history=True, email=data['email_to'], details=body, email_from=email_from, message_id=message_id)
 
-            x_headers = {
-                'Reply-To':"%s" % case.section_id.reply_to,
-            }
+            x_headers = dict()
+            #x_headers = {
+            #    'Reply-To':"%s" % case.section_id.reply_to,
+            #}
             if message_id:
                 x_headers['References'] = "%s" % (message_id)
 

From 374f730ac9e205cdc00a747be6330e6279a7dd76 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Tue, 11 May 2010 13:24:38 +0200
Subject: [PATCH 69/84] [FIX] crm: Invert the open and closed datetime in the
 crm.lead view

bzr revid: stephane@openerp.com-20100511112438-nigo9t9gge6t5orw
---
 addons/crm/crm_lead_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f89c558fee4..9608616debd 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -141,8 +141,8 @@
                         <separator string="Dates" colspan="2" col="2"/>
                         <field name="create_date"/>
                         <field name="write_date"/>
-                        <field name="date_closed"/>
                         <field name="date_open"/>
+                        <field name="date_closed"/>
                     </group>
                     <group colspan="2" col="2">
                         <separator string="Statistics" colspan="2" col="2"/>

From d18a8da4699ac7613c2d7f189d0656634b8799d9 Mon Sep 17 00:00:00 2001
From: Quentin De Paoli <qdp@cyan>
Date: Tue, 11 May 2010 14:50:02 +0200
Subject: [PATCH 70/84] [IMP] base_vat: improved the constraint message

bzr revid: qdp@cyan-20100511125002-4gpqy6m0w02z5did
---
 addons/base_vat/partner.py | 43 ++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/addons/base_vat/partner.py b/addons/base_vat/partner.py
index 61643781fed..c4f166fd7d5 100644
--- a/addons/base_vat/partner.py
+++ b/addons/base_vat/partner.py
@@ -24,6 +24,11 @@ from osv import osv
 from osv import fields
 import string
 from tools.func import partial
+from tools.translate import _
+
+_ref_vat = {
+    'be': 'BE0477472701',
+}
 
 def mult_add(i, j):
     """Sum each digits of the multiplication of i and j."""
@@ -32,6 +37,10 @@ def mult_add(i, j):
 class res_partner(osv.osv):
     _inherit = 'res.partner'
 
+    def _split_vat(self, vat):
+        vat_country, vat_number = vat[:2].lower(), vat[2:].replace(' ', '')
+        return vat_country, vat_number
+
     def check_vat(self, cr, uid, ids):
         '''
         Check the VAT number depending of the country.
@@ -39,35 +48,37 @@ class res_partner(osv.osv):
         '''
         for partner in self.browse(cr, uid, ids):
             if not partner.vat:
-                continue    #FIXME return False? empty vat numbre is invalid?
+                continue    
 
-            vat_country, vat_number = partner.vat[:2].lower(), partner.vat[2:].replace(' ', '')
+            vat_country, vat_number = self._split_vat(partner.vat)
+            if not hasattr(self, 'check_vat_' + vat_country):
+                return False
             check = getattr(self, 'check_vat_' + vat_country)
             if not check(vat_number):
                 return False
 
         return True
 
-    def __getattr__(self, attr):
-        if not attr.startswith('check_vat_'):
-            super(res_partner, self).__getattr__(attr)
-        
-        def default_vat_check(self, cn, vn):
-            # by default, a VAT number is valid if:
-            #  it starts with 2 letters
-            #  has more than 3 characters
-            return len(vn) > 0 and len(cn) == 2 and cn[0] in string.ascii_lowercase and cn[1] in string.ascii_lowercase
-
-        return partial(default_vat_check, self, attr[10:])
-
-
     def vat_change(self, cr, uid, ids, value, context={}):
         return {'value': {'vat_subjected': bool(value)}}
 
     _columns = {
         'vat_subjected': fields.boolean('VAT Legal Statement', help="Check this box if the partner is subjected to the VAT. It will be used for the VAT legal statement.")
     }
-    _constraints = [(check_vat, "The VAT doesn't seem to be correct.", ["vat"])]
+
+    def _construct_constraint_msg(self, cr, uid, ids):
+        def default_vat_check(cn, vn):
+            # by default, a VAT number is valid if:
+            #  it starts with 2 letters
+            #  has more than 3 characters
+            return cn[0] in string.ascii_lowercase and cn[1] in string.ascii_lowercase
+
+        vat_country, vat_number = self._split_vat(self.browse(cr, uid, ids)[0].vat)
+        if default_vat_check(vat_country, vat_number):
+            return _('The Vat does not seems to be correct. You should have entered something like this %s'), (_ref_vat[vat_country])
+        return _('The VAT is invalid, it shoul begin with the country code'), ()
+
+    _constraints = [(check_vat, _construct_constraint_msg, ["vat"])]
 
     # code from the following methods come from Tryton (B2CK)
     # http://www.tryton.org/hgwebdir.cgi/modules/relationship/file/544d1de586d9/party.py 

From e46a978c2fd62fc6bcc977068d53c3dda49540eb Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Tue, 11 May 2010 15:51:57 +0200
Subject: [PATCH 71/84] [IMP] crm: Use an osv_memory to represent the
 attachments in the send email wizard

bzr revid: stephane@openerp.com-20100511135157-f2w58mbbdjtzts3j
---
 addons/crm/wizard/crm_send_email.py       | 61 ++++++++++++++---------
 addons/crm/wizard/crm_send_email_view.xml | 27 ++++++----
 2 files changed, 56 insertions(+), 32 deletions(-)

diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index ae9ff8541c6..506bca661a0 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -26,6 +26,24 @@ import base64
 import tools
 from crm import crm
 
+class crm_send_new_email(osv.osv_memory):
+    """ Sends new email for the case"""
+    _name = "crm.send.mail"
+
+crm_send_new_email()
+
+class crm_send_new_email_attachment(osv.osv_memory):
+    _name = 'crm.send.mail.attachment'
+
+    _columns = {
+        'binary' : fields.binary('Attachment', required=True),
+        'name' : fields.char('Name', size=128, required=True),
+
+        'wizard_id' : fields.many2one('crm.send.mail', 'Wizard', required=True),
+    }
+
+crm_send_new_email_attachment()
+
 class crm_send_new_email(osv.osv_memory):
     """ Sends new email for the case"""
     _name = "crm.send.mail"
@@ -38,12 +56,8 @@ class crm_send_new_email(osv.osv_memory):
         'subject': fields.char('Subject', size=128, required=True),
         'text': fields.text('Message', required=True),
         'state': fields.selection(crm.AVAILABLE_STATES, string='Set New State To', required=True),
-        'doc1': fields.binary("Attachment1"),
-        'doc1_fname': fields.char("File Name", size=64),
-        'doc2': fields.binary("Attachment2"),
-        'doc2_fname': fields.char("File Name", size=64),
-        'doc3': fields.binary("Attachment3"),
-        'doc3_fname': fields.char("File Name", size=64),
+
+        'attachment_ids' : fields.one2many('crm.send.mail.attachment', 'wizard_id'),
     }
 
     def action_cancel(self, cr, uid, ids, context=None):
@@ -68,12 +82,13 @@ class crm_send_new_email(osv.osv_memory):
         case_pool = self.pool.get(model)
         res_id = context and context.get('active_id', False) or False
 
-        for data in self.read(cr, uid, ids, context=context):
-            attach = filter(lambda x: x, [data['doc1'], data['doc2'], data['doc3']])
-            attach = map(lambda x: (data['doc' + str(attach.index(x) + 1) \
-                            + '_fname'], base64.decodestring(x)), attach)
-            message_id = None            
-            
+        for obj in self.browse(cr, uid, ids, context=context):
+            attach = [
+                (x.name, base64.decodestring(x.binary)) for x in obj.attachment_ids
+            ]
+
+            message_id = None
+
             case = case_pool.browse(cr, uid, res_id)
             if context.get('mail', 'new') == 'new':
                 if len(case.history_line):
@@ -84,13 +99,13 @@ class crm_send_new_email(osv.osv_memory):
                 model = hist.log_id.model_id.model
                 model_pool = self.pool.get(model)
                 case = model_pool.browse(cr, uid, hist.log_id.res_id)
-            emails = [data['email_to']] + (data['email_cc'] or '').split(',')
+            emails = [obj.email_to] + (obj.email_cc or '').split(',')
             emails = filter(None, emails)
-            body = data['text']
+            body = obj.text
 
             body = case_pool.format_body(body)
-            email_from = data.get('email_from', False)
-            case_pool._history(cr, uid, [case], _('Send'), history=True, email=data['email_to'], details=body, email_from=email_from, message_id=message_id)
+            email_from = getattr(obj, 'email_from', False)
+            case_pool._history(cr, uid, [case], _('Send'), history=True, email=obj.email_to, details=body, email_from=email_from, message_id=message_id)
 
             x_headers = dict()
             #x_headers = {
@@ -106,7 +121,7 @@ class crm_send_new_email(osv.osv_memory):
                     uid=uid, 
                     server_id=case.section_id.server_id.id,
                     emailto=emails,
-                    subject=data['subject'],
+                    subject=obj.subject,
                     body="<pre>%s</pre>" % body,
                     attachments=attach,
                     headers=x_headers
@@ -115,7 +130,7 @@ class crm_send_new_email(osv.osv_memory):
                 flag = tools.email_send(
                     email_from,
                     emails,
-                    data['subject'],
+                    obj.subject,
                     body,
                     attach=attach,
                     reply_to=case.section_id.reply_to,
@@ -124,14 +139,14 @@ class crm_send_new_email(osv.osv_memory):
                 )
             
             if flag:
-                if data['state'] == 'unchanged':
+                if obj.state == 'unchanged':
                     pass
-                elif data['state'] == 'done':
+                elif obj.state == 'done':
                     case_pool.case_close(cr, uid, [case.id])
-                elif data['state'] == 'draft':
+                elif obj.state == 'draft':
                     case_pool.case_reset(cr, uid, [case.id])
-                elif data['state'] in ['cancel', 'open', 'pending']:
-                    act = 'case_' + data['state']
+                elif obj.state in ['cancel', 'open', 'pending']:
+                    act = 'case_' + obj.state
                     getattr(case_pool, act)(cr, uid, [case.id])
                 cr.commit()
 
diff --git a/addons/crm/wizard/crm_send_email_view.xml b/addons/crm/wizard/crm_send_email_view.xml
index 49758245eb0..35d78f895fc 100644
--- a/addons/crm/wizard/crm_send_email_view.xml
+++ b/addons/crm/wizard/crm_send_email_view.xml
@@ -19,12 +19,15 @@
                             <field name="text" nolabel="1" colspan="4"/>
                         </page>
                         <page string="Attachments">
-                            <field name="doc1" filename="doc1_fname"/>
-                            <field name="doc1_fname" invisible="1" />
-                            <field name="doc2" filename="doc2_fname" />
-                            <field name="doc2_fname" invisible="1" />
-                            <field name="doc3" filename="doc3_fname" />
-                            <field name="doc3_fname" invisible="1" />
+                            <field name="attachment_ids" colspan="4" nolabel="1">
+                                <form string="Attachment">
+                                    <field name="binary" filename="name" />
+                                    <field name="name" />
+                                </form>
+                                <tree string="Attachments">
+                                    <field name="name" />
+                                </tree>
+                            </field>
                         </page>
                     </notebook>
                     <group colspan="2" col="4" >
@@ -60,9 +63,15 @@
                     <field name="email_to" />
                     <field name="email_cc" />
                     <field name="subject" />
-                    <field name="doc1" />
-                    <field name="doc2" />
-                    <field name="doc3" />
+                    <field name="attachment_ids" colspan="4" nolabel="1">
+                        <form string="Attachment">
+                            <field name="binary" filename="name" />
+                            <field name="name" />
+                        </form>
+                        <tree string="Attachments">
+                            <field name="name" />
+                        </tree>
+                    </field>
                     <separator string="" colspan="4"/>
                     <field name="text" nolabel="1" colspan="4"/>
                     <separator string=" " colspan="4"/>

From ac3e6c51ba6019aa10b3c5445d17b5577bbb6d10 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Tue, 11 May 2010 16:45:16 +0200
Subject: [PATCH 72/84] [FIX] crm: Rename 'Contact Name' to 'Company Name'

bzr revid: stephane@openerp.com-20100511144516-vy7c7478745u0nel
---
 addons/crm/crm_lead.py       | 2 +-
 addons/crm/crm_lead_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 9c4c38875c5..d6995cb6644 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -113,7 +113,7 @@ class crm_lead(osv.osv):
         'type_id': fields.many2one('crm.case.resource.type', 'Lead Type', \
                          domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.lead')]"),
-        'partner_name': fields.char("Contact Name", size=64),
+        'partner_name': fields.char("Company Name", size=64),
 
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'date_closed': fields.datetime('Closed', readonly=True),
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 9608616debd..ade89c792b1 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -69,7 +69,7 @@
                 <page string="Lead">
                     <group colspan="2" col="4">
                         <separator string="Contact" colspan="4" col="4"/>
-                        <field name="partner_name" string="Contact Name" colspan="4"/>
+                        <field name="partner_name" colspan="4"/>
                         <newline/>
                         <field domain="[('domain', '=', 'contact')]" name="title"/>
                         <field name="function_name" />

From 823e69341e844235250e5440158254d30fb89d78 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Tue, 11 May 2010 16:45:48 +0200
Subject: [PATCH 73/84] [FIX] crm: Remove the '\r' character in the Mailgateway

bzr revid: stephane@openerp.com-20100511144548-fpq3uzh85407f5q7
---
 addons/crm/scripts/openerp_mailgate/openerp_mailgate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
index 607b0fbd434..110a922c27f 100755
--- a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
@@ -168,7 +168,7 @@ class email_parser(object):
 
     def _decode_header(self, s):
         from email.Header import decode_header
-        s = decode_header(s) 
+        s = decode_header(s.replace('\r', '')) 
         return ''.join(map(lambda x:self._to_decode(x[0], [x[1]]), s or []))
 
     def msg_new(self, msg):

From 9e382c11a7d83e2e5bfd9064d1741b68dec6ce50 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Tue, 11 May 2010 17:02:58 +0200
Subject: [PATCH 74/84] [FIX] crm: mailgateway: Use the right fields from the
 email for the 'From' and 'To' in the crm.case (and decode them)

bzr revid: stephane@openerp.com-20100511150258-6cbaxmkgi598m14o
---
 addons/crm/scripts/openerp_mailgate/openerp_mailgate.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
index 110a922c27f..5775319ee0a 100755
--- a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
@@ -175,6 +175,7 @@ class email_parser(object):
         message = self.msg_body_get(msg)
         msg_subject = self._decode_header(msg['Subject'])
         msg_from = self._decode_header(msg['From'])
+        msg_to = self._decode_header(msg['To'])
         msg_cc = self._decode_header(msg['Cc'] or '')
         
         data = {
@@ -189,7 +190,7 @@ class email_parser(object):
 
         try:
             id = self.rpc(self.model, 'create', data)
-            self.rpc(self.model, 'history', [id], 'Receive', True, msg['From'], message['body'], False, False, {'model' : self.model})
+            self.rpc(self.model, 'history', [id], 'Receive', True, msg_to, message['body'], msg_from, False, {'model' : self.model})
             #self.rpc(self.model, 'case_open', [id])
         except Exception, e:
             if getattr(e, 'faultCode', '') and 'AccessError' in e.faultCode:
@@ -314,7 +315,7 @@ class email_parser(object):
                 'res_id': id
             }
             self.rpc('ir.attachment', 'create', data_attach)
-        self.rpc(self.model, 'history', [id], 'Send', True, msg['From'], body['body'])
+        self.rpc(self.model, 'history', [id], 'Send', True, self._decode_header(msg['From']), body['body'])
         return id
 
     def msg_send(self, msg, emails, priority=None):
@@ -357,7 +358,7 @@ class email_parser(object):
                 'res_id': id
             }
             self.rpc('ir.attachment', 'create', data_attach)
-        self.rpc(self.model, 'history', [id], 'Send', True, msg['From'], message['body'])
+        self.rpc(self.model, 'history', [id], 'Send', True, self._decode_header(msg['From']), message['body'])
         return id
 
     def msg_test(self, msg, case_str):

From 41ef3a09e8e9fb1b18449678c601928d086ff851 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Tue, 11 May 2010 17:30:43 +0200
Subject: [PATCH 75/84] [FIX] crm: Add the signature of the user in the 'reply
 to the mail' wizard

bzr revid: stephane@openerp.com-20100511153043-6iiq1lzykdrb81q8
---
 addons/crm/wizard/crm_send_email.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 506bca661a0..f62c3b2b8f3 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -217,7 +217,11 @@ class crm_send_new_email(osv.osv_memory):
                 to = 'To: %s' % (hist.email_to or '')
                 sentdate = 'Date: %s' % (hist.date)
                 desc = '\n%s'%(hist.description)
-                original = [header, sender, to, sentdate, desc]
+
+                if case.user_id.signature:
+                    signature = '--\n' + case.user_id.signature
+
+                original = [header, sender, to, sentdate, desc, signature]
                 original = '\n'.join(original)
                 res['text']=original
             if 'subject' in fields:

From 5365ed0efcb1bcfcbc85810f575d5a904118b4d0 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Tue, 11 May 2010 17:40:23 +0200
Subject: [PATCH 76/84] [FIX] crm: Check if there is a model for the log of the
 crm.case

bzr revid: stephane@openerp.com-20100511154023-joyuanu159l6bw00
---
 addons/crm/wizard/crm_send_email.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index f62c3b2b8f3..b31a08e465e 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -202,6 +202,11 @@ class crm_send_new_email(osv.osv_memory):
         res = {}
         for hist in hist_obj.browse(cr, uid, res_ids):
             model = hist.log_id.model_id.model
+
+            # In the case where the crm.case does not exist in the database
+            if not model:
+                return {}
+
             model_pool = self.pool.get(model)
             case = model_pool.browse(cr, uid, hist.log_id.res_id)
             if 'email_to' in fields:

From 9f92862f80e4fff53514e7f5421a547e867678d7 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Tue, 11 May 2010 18:53:54 +0200
Subject: [PATCH 77/84] [FIX] crm: Change the help message for the active field
 in the case

bzr revid: stephane@openerp.com-20100511165354-jlab2xsh2t58p8yc
---
 addons/crm/crm.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 34d8b46bcf4..fd629edc745 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -315,8 +315,7 @@ class crm_case(osv.osv):
     _columns = {
         'id': fields.integer('ID', readonly=True), 
         'name': fields.char('Description', size=1024, required=True), 
-        'active': fields.boolean('Active', help="If the active field is set to\
-                     true, it will allow you to hide the case without removing it."), 
+        'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."), 
         'description': fields.text('Description'), 
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
                         select=True, help='Sales team to which Case belongs to.\

From c1fa53db2bd9fba956dfad34b4f29de8cb0bf5ac Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Tue, 11 May 2010 18:54:16 +0200
Subject: [PATCH 78/84] [FIX] crm: Declare the signature variable

bzr revid: stephane@openerp.com-20100511165416-vmilmnn9zws8dxrd
---
 addons/crm/wizard/crm_send_email.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index b31a08e465e..a3a86d4b509 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -223,6 +223,7 @@ class crm_send_new_email(osv.osv_memory):
                 sentdate = 'Date: %s' % (hist.date)
                 desc = '\n%s'%(hist.description)
 
+                signature = ''
                 if case.user_id.signature:
                     signature = '--\n' + case.user_id.signature
 

From 8e7c75cdbe5cea97d2d2331edb1092b8a8c49d51 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 11 May 2010 23:27:24 +0200
Subject: [PATCH 79/84] [IMP] typo

bzr revid: fp@tinyerp.com-20100511212724-1jwdgpto1meccg62
---
 addons/stock/stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 3795351e03a..dcb054c1cf7 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -490,7 +490,7 @@ class stock_picking(osv.osv):
         'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
                  method=True, store=True, type='datetime', string='Expected Date', select=1, help="Expected date for Picking. Default it takes current date"),
         'date': fields.datetime('Order Date', help="Date of Order"),
-        'date_done': fields.datetime('Date Done', help="Date of completion"),
+        'date_done': fields.datetime('Date Done', help="Date of Completion"),
         'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
                  method=True, store=True, type='datetime', string='Max. Expected Date', select=2),
         'move_lines': fields.one2many('stock.move', 'picking_id', 'Entry lines', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),

From bd933e119001332a6eea3255d490a62ccf7fb5fb Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Wed, 12 May 2010 05:20:21 +0100
Subject: [PATCH 80/84] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100512042021-eihz304t7ur8oz1s
---
 addons/account/i18n/ug.po         | 5928 +++++++++++++++++++++++++++++
 addons/account_payment/i18n/sl.po |   16 +-
 addons/smtpclient/i18n/de.po      |  840 ++++
 3 files changed, 6778 insertions(+), 6 deletions(-)
 create mode 100644 addons/account/i18n/ug.po
 create mode 100644 addons/smtpclient/i18n/de.po

diff --git a/addons/account/i18n/ug.po b/addons/account/i18n/ug.po
new file mode 100644
index 00000000000..77cd0bc0552
--- /dev/null
+++ b/addons/account/i18n/ug.po
@@ -0,0 +1,5928 @@
+# Uyghur translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-05-11 05:21+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Uyghur <ug@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-12 04:20+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account
+#: field:account.tax.template,description:0
+msgid "Internal Name"
+msgstr "ئىچكى ئىسمى"
+
+#. module: account
+#: view:account.tax.code:0
+msgid "Account Tax Code"
+msgstr "باج نۇمۇرى"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree9
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree9
+msgid "Unpaid Supplier Invoices"
+msgstr "تاپشۇرۇلمىغان سېتىۋېلىش پىيوسى"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_entries
+msgid "Entries Encoding"
+msgstr "كىنىشكىگە ئاساسەن تىزىملىتىپ كىرىش"
+
+#. module: account
+#: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
+msgid "Specify The Message for the Overdue Payment Report."
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
+msgid "Confirm statement from draft"
+msgstr "چورنىۋايدىن مۇقىملاش"
+
+#. module: account
+#: model:account.account.type,name:account.account_type_asset
+msgid "Asset"
+msgstr "مەبلەخ"
+
+#. module: account
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "ھەرىكەت بەلگىلەشتە قوللىنىلغان ئىسىم توغرا بولمىدى."
+
+#. module: account
+#: help:account.journal,currency:0
+msgid "The currency used to enter statement"
+msgstr ""
+
+#. module: account
+#: wizard_view:account_use_models,init_form:0
+msgid "Select Message"
+msgstr "ئۇچۇرنى تاللاڭ"
+
+#. module: account
+#: help:product.category,property_account_income_categ:0
+msgid ""
+"This account will be used to value incoming stock for the current product "
+"category"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,period_id:0
+msgid "Keep empty to use the period of the validation(invoice) date."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.automatic.reconcile,reconcile:0
+msgid "Reconciliation result"
+msgstr "ھېساباتنى توغىرىلاش نەتىجىسى"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
+msgid "Unreconciled entries"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,base_code_id:0
+#: field:account.tax,base_code_id:0
+#: field:account.tax.template,base_code_id:0
+msgid "Base Code"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Account Statistics"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_vat_declaration
+#: model:ir.ui.menu,name:account.menu_wizard_vat_declaration
+msgid "Print Taxes Report"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_id:0
+msgid "Parent"
+msgstr "يۇقارىقى دەرىجە"
+
+#. module: account
+#: selection:account.move,type:0
+msgid "Journal Voucher"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,residual:0
+msgid "Residual"
+msgstr "ئاشقىنى"
+
+#. module: account
+#: field:account.tax,base_sign:0
+#: field:account.tax,ref_base_sign:0
+#: field:account.tax.template,base_sign:0
+#: field:account.tax.template,ref_base_sign:0
+msgid "Base Code Sign"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_unreconcile_select
+#: model:ir.ui.menu,name:account.menu_unreconcile_select
+msgid "Unreconcile entries"
+msgstr ""
+
+#. module: account
+#: constraint:account.period:0
+msgid "Error ! The duration of the Period(s) is/are invalid. "
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement.reconcile:0
+#: field:account.bank.statement.reconcile,line_ids:0
+#: field:account.move,line_id:0
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open
+#: model:ir.actions.act_window,name:account.action_move_line_form
+#: model:ir.ui.menu,name:account.menu_action_move_line_form
+msgid "Entries"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Debit Centralisation"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
+msgid "Confirm draft invoices"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,days2:0
+msgid ""
+"Day of the month, set -1 for the last day of the current month. If it's "
+"positive, it gives the day of the next month. Set 0 for net days (otherwise "
+"it's based on the beginning of the month)."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Total Credit"
+msgstr ""
+
+#. module: account
+#: field:account.config.wizard,charts:0
+msgid "Charts of Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_move_line_select
+msgid "Move line select"
+msgstr ""
+
+#. module: account
+#: rml:account.journal.period.print:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+msgid "Entry label"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_model_line
+msgid "Account Model Entries"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sum_period:0
+msgid "Period Sum"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Compute Code (if type=code)"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Account Entry Line"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.aged.trial.balance,init:0
+msgid "Aged Trial Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
+msgid "Recurrent Entries"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,amount:0
+#: field:account.bank.statement.line,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.tax,amount:0
+#: field:account.move,amount:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
+msgid "Amount"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
+#: model:ir.actions.wizard,name:account.wizard_third_party_ledger
+#: model:ir.ui.menu,name:account.menu_third_party_ledger
+msgid "Partner Ledger"
+msgstr ""
+
+#. module: account
+#: field:product.template,supplier_taxes_id:0
+msgid "Supplier Taxes"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Total Debit"
+msgstr ""
+
+#. module: account
+#: rml:account.tax.code.entries:0
+msgid "Accounting Entries-"
+msgstr ""
+
+#. module: account
+#: help:account.journal,view_id:0
+msgid ""
+"Gives the view used when writing or browsing entries in this journal. The "
+"view tell Open ERP which fields should be visible, required or readonly and "
+"in which order. You can create your own view for a faster encoding in each "
+"journal."
+msgstr ""
+
+#. module: account
+#: help:account.invoice,date_due:0
+#: help:account.invoice,payment_term:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. If you keep the payment term and the due "
+"date empty, it means direct payment. The payment term may compute several "
+"due dates, for example 50% now, 50% in one month."
+msgstr ""
+
+#. module: account
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_overdue
+#: view:res.company:0
+msgid "Overdue Payments"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.account.balance.report,checktype:0
+#: wizard_view:account.analytic.account.analytic.check.report,init:0
+#: wizard_view:account.analytic.account.balance.report,init:0
+#: wizard_view:account.analytic.account.cost_ledger.report,init:0
+#: wizard_view:account.analytic.account.inverted.balance.report,init:0
+#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
+#: wizard_view:account.vat.declaration,init:0
+msgid "Select period"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,origin:0
+#: field:account.invoice.line,origin:0
+msgid "Origin"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+msgid "Move Name"
+msgstr ""
+
+#. module: account
+#: xsl:account.transfer:0
+msgid "Reference"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.subscription.generate,init:0
+msgid "Subscription Compute"
+msgstr ""
+
+#. module: account
+#: rml:account.central.journal:0
+msgid "Account Num."
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.analytic.check:0
+msgid "Delta Debit"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+#: field:account.invoice,amount_tax:0
+#: field:account.move.line,account_tax_id:0
+msgid "Tax"
+msgstr ""
+
+#. module: account
+#: rml:account.general.journal:0
+msgid "Debit Trans."
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,account_id:0
+#: field:account.invoice.line,account_analytic_id:0
+#: field:account.move.line,analytic_account_id:0
+#: field:report.hr.timesheet.invoice.journal,account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account
+#: field:account.tax,child_depend:0
+#: field:account.tax.template,child_depend:0
+msgid "Tax on Children"
+msgstr ""
+
+#. module: account
+#: rml:account.central.journal:0
+#: rml:account.general.journal:0
+#: field:account.journal,name:0
+msgid "Journal Name"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Description on invoices"
+msgstr ""
+
+#. module: account
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.reconcile,total_entry:0
+msgid "Total entries"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.account,account_src_id:0
+#: field:account.fiscal.position.account.template,account_src_id:0
+msgid "Account Source"
+msgstr ""
+
+#. module: account
+#: field:account.journal,update_posted:0
+msgid "Allow Cancelling Entries"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_paymentorderbank0
+#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
+msgid "Payment Reconcilation"
+msgstr ""
+
+#. module: account
+#: model:account.journal,name:account.expenses_journal
+msgid "Journal de frais"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
+msgid "All Analytic Entries"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Date:"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,sign:0
+msgid "Negative"
+msgstr ""
+
+#. module: account
+#: rml:account.partner.balance:0
+msgid "(Account/Partner) Name"
+msgstr ""
+
+#. module: account
+#: selection:account.move,type:0
+msgid "Contra"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,state:0
+#: field:account.bank.statement,state:0
+#: field:account.invoice,state:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.subscription:0
+msgid "State"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree13
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree13
+msgid "Unpaid Supplier Refunds"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Special Computation"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
+msgid "Confirm statement with/without reconciliation from draft statement"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.move.bank.reconcile,init:0
+#: model:ir.actions.wizard,name:account.action_account_bank_reconcile_tree
+#: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_check_tree
+msgid "Bank reconciliation"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: account
+#: rml:account.general.ledger:0
+#: field:account.model,ref:0
+#: field:account.move,ref:0
+#: rml:account.overdue:0
+#: field:account.subscription,ref:0
+msgid "Ref"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,type_tax_use:0
+msgid "Tax Use In"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,include_base_amount:0
+msgid ""
+"Set if the amount of tax must be included in the base amount before "
+"computing the next taxes."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodical Processing"
+msgstr ""
+
+#. module: account
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "Analytic Entries Stats"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
+msgid "Tax Code Templates"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Supplier invoice"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_reconcilepaid0
+#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+msgid "Reconcile Paid"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.chart,init,target_move:0
+msgid "Target Moves"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_tax_template_form
+msgid "Tax Templates"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reconciled:0
+msgid "Paid/Reconciled"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,close_method:0
+msgid "Deferral Method"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,include_base_amount:0
+msgid "Include in Base Amount"
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_base_code_id:0
+#: field:account.tax.template,ref_base_code_id:0
+msgid "Refund Base Code"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.line:0
+msgid "Line"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.cost_ledger:0
+msgid "J.C. or Move name"
+msgstr ""
+
+#. module: account
+#: selection:account.tax,applicable_type:0
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,days:0
+msgid ""
+"Number of days to add before computation of the day of month.If Date=15/01, "
+"Number of Days=22, Day of Month=-1, then the due date is 28/02."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax
+msgid "account.tax"
+msgstr ""
+
+#. module: account
+#: rml:account.central.journal:0
+msgid "Printing Date"
+msgstr ""
+
+#. module: account
+#: rml:account.general.ledger:0
+msgid "Mvt"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_aged_trial_balance
+#: model:ir.ui.menu,name:account.menu_aged_trial_balance
+msgid "Aged Partner Balance"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Entry Controls"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,sequence:0
+msgid ""
+"The sequence field is used to order the resources from lower sequences to "
+"higher ones"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.analytic.account.chart,init:0
+#: wizard_view:account.analytic.line,init:0
+msgid "(Keep empty to open the current situation)"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account
+msgid "Fiscal Position Accounts Mapping"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: account
+#: selection:account.model.line,date:0
+#: selection:account.model.line,date_maturity:0
+msgid "Partner Payment Term"
+msgstr ""
+
+#. module: account
+#: view:account.move.reconcile:0
+msgid "Account Entry Reconcile"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.move.bank.reconcile,init,open:0
+msgid "Open for bank reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.move.line.reconcile,init_full,writeoff:0
+#: wizard_field:account.move.line.reconcile,init_partial,writeoff:0
+msgid "Write-Off amount"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear,company_id:0
+msgid "Keep empty if the fiscal year belongs to several companies."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_analytic_accounting
+msgid "Analytic Accounting"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Sub-Total :"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,line_ids:0
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+#: model:ir.ui.menu,name:account.next_id_41
+msgid "Analytic Entries"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "month"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,partner_id:0
+msgid "Associated Partner"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,comment:0
+msgid "Additional Information"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,type:0
+msgid "Customer Refund"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.analytic.account.chart,init:0
+msgid "Select the Period for Analysis"
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_tax_sign:0
+#: field:account.tax,tax_sign:0
+#: field:account.tax.template,ref_tax_sign:0
+#: field:account.tax.template,tax_sign:0
+msgid "Tax Code Sign"
+msgstr ""
+
+#. module: account
+#: help:res.partner,credit:0
+msgid "Total amount this customer owes you."
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "St."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_tax_code_line_open
+msgid "account.move.line"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_supplieranalyticcost0
+msgid "Analytic Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,field:0
+msgid "Field Name"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sign:0
+#: field:account.tax.code.template,sign:0
+msgid "Sign for parent"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear,end_journal_period_id:0
+msgid "End of Year Entries Journal"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_paymententries0
+msgid "Can be draft or validated"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.invoice.pay,init,reconcile:0
+msgid "Partial Payment"
+msgstr ""
+
+#. module: account
+#: wizard_view:account_use_models,create:0
+msgid "Move Lines Created."
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear,state:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: field:account.subscription,state:0
+msgid "Status"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.cost_ledger:0
+#: rml:account.analytic.account.quantity_cost_ledger:0
+msgid "Period to"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,partner_account:0
+msgid "Partner account"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.subscription.generate,init:0
+msgid "Generate entries before:"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.cost_ledger:0
+#: rml:account.analytic.account.quantity_cost_ledger:0
+#: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
+#: model:ir.actions.wizard,name:account.account_analytic_account_cost_ledger_report
+msgid "Cost Ledger"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.account.balance.report,checktype:0
+#: wizard_view:account.general.ledger.report,checktype:0
+#: wizard_view:account.partner.balance.report,init:0
+#: wizard_view:account.third_party_ledger.report,init:0
+msgid "(Keep empty for all open fiscal years)"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,move_lines:0
+msgid "Move Lines"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_config_wizard
+msgid "account.config.wizard"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
+#: model:ir.ui.menu,name:account.report_account_analytic_journal_print
+msgid "Account cost and revenue by journal"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,user_type:0
+msgid ""
+"These types are defined according to your country. The type contain more "
+"information about the account and it's specificities."
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,init,power:0
+msgid "6"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.next_id_30
+msgid "Bank Reconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_account_template
+msgid "Templates for Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_form
+#: model:ir.model,name:account.model_account_analytic_account
+#: model:ir.ui.menu,name:account.account_analytic_def_account
+msgid "Analytic Accounts"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.print.journal.report,init:0
+#: model:ir.actions.wizard,name:account.wizard_print_journal
+#: model:ir.ui.menu,name:account.menu_print_journal
+msgid "Print Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_accounts_wizard
+msgid "account.bank.accounts.wizard"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date_created:0
+#: field:account.move.reconcile,create_date:0
+msgid "Creation date"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.invoice.refund,init,cancel_invoice:0
+msgid "Cancel Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,required:0
+msgid "Required"
+msgstr ""
+
+#. module: account
+#: field:product.category,property_account_expense_categ:0
+#: field:product.template,property_account_expense:0
+msgid "Expense Account"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.move.line.reconcile,addendum,journal_id:0
+msgid "Write-Off Journal"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,amount_currency:0
+#: field:account.move.line,amount_currency:0
+msgid "Amount Currency"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense_categ:0
+msgid "Expense Category Account"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.fiscalyear.close,init,fy2_id:0
+msgid "New Fiscal Year"
+msgstr ""
+
+#. module: account
+#: help:account.tax,tax_group:0
+msgid ""
+"If a default tax is given in the partner it only overrides taxes from "
+"accounts (or products) in the same group."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
+msgid "Fiscal Year to Open"
+msgstr ""
+
+#. module: account
+#: view:account.config.wizard:0
+msgid "Select Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,quantity:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.analytic.account.inverted.balance:0
+#: rml:account.analytic.account.quantity_cost_ledger:0
+#: field:account.analytic.line,unit_amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
+#: field:account.move.line,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.account.balance.report,checktype,date_to:0
+#: wizard_field:account.general.ledger.report,checktype,date_to:0
+#: wizard_field:account.partner.balance.report,init,date2:0
+#: wizard_field:account.third_party_ledger.report,init,date2:0
+msgid "End date"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,base_amount:0
+msgid "Base Code Amount"
+msgstr ""
+
+#. module: account
+#: help:account.journal,user_id:0
+msgid "The user responsible for this journal"
+msgstr ""
+
+#. module: account
+#: field:account.journal,default_debit_account_id:0
+msgid "Default Debit Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Entries by Statements"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_analyticinvoice0
+msgid "analytic Invoice"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.automatic.reconcile,init,period_id:0
+#: field:account.bank.statement,period_id:0
+#: wizard_field:account.central.journal.report,init,period_id:0
+#: view:account.fiscalyear:0
+#: rml:account.general.journal:0
+#: wizard_field:account.general.journal.report,init,period_id:0
+#: wizard_field:account.invoice.pay,init,period_id:0
+#: field:account.journal.period,period_id:0
+#: field:account.move,period_id:0
+#: wizard_field:account.move.journal,init,period_id:0
+#: field:account.move.line,period_id:0
+#: wizard_field:account.move.validate,init,period_id:0
+#: view:account.period:0
+#: wizard_field:account.print.journal.report,init,period_id:0
+#: field:account.subscription,period_nbr:0
+msgid "Period"
+msgstr ""
+
+#. module: account
+#: rml:account.partner.balance:0
+msgid "Grand total"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_accounting
+msgid "Financial Accounting"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Net Total:"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,name:0
+#: field:account.fiscal.position.account,position_id:0
+#: field:account.fiscal.position.account.template,position_id:0
+#: field:account.fiscal.position.tax,position_id:0
+#: field:account.fiscal.position.tax.template,position_id:0
+#: view:account.fiscal.position.template:0
+#: field:account.invoice,fiscal_position:0
+#: model:ir.model,name:account.model_account_fiscal_position
+#: field:res.partner,property_account_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,product_uom_id:0
+#: field:account.move.line,product_uom_id:0
+msgid "UoM"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.third_party_ledger.report,init,page_split:0
+msgid "One Partner Per Page"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_parent_ids:0
+#: field:account.account.template,child_parent_ids:0
+msgid "Children"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax
+msgid "Fiscal Position Taxes Mapping"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree2_new
+msgid "New Supplier Invoice"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.invoice.pay,init,amount:0
+msgid "Amount paid"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,type:0
+#: model:process.transition,name:account.process_transition_customerinvoice0
+#: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
+msgid "Customer Invoice"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.open_closed_fiscalyear,init:0
+msgid "Choose Fiscal Year"
+msgstr ""
+
+#. module: account
+#: field:account.sequence.fiscalyear,sequence_main_id:0
+msgid "Main Sequence"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
+#: model:ir.ui.menu,name:account.account_analytic_journal_print
+msgid "Print Analytic Journals"
+msgstr ""
+
+#. module: account
+#: rml:account.tax.code.entries:0
+msgid "Voucher Nb"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,sequence:0
+msgid ""
+"The sequence field is used to order the payment term lines from the lowest "
+"sequences to the higher ones"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.reconcile,total_new:0
+msgid "Total write-off"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.tax:0
+#: model:ir.actions.act_window,name:account.action_tax_code_list
+#: model:ir.ui.menu,name:account.menu_action_tax_code_list
+msgid "Tax codes"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.template,chart_template_id:0
+#: field:account.tax.template,chart_template_id:0
+#: field:wizard.multi.charts.accounts,chart_template_id:0
+msgid "Chart Template"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income_categ:0
+msgid "Income Category Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.analytic_account_form
+#: model:ir.ui.menu,name:account.account_analytic_form
+msgid "New Analytic Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
+msgid "Fiscal Position Templates"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+#: field:account.invoice.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+msgid "Period from :"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr ""
+
+#. module: account
+#: model:account.journal,name:account.sales_journal
+msgid "Journal de vente"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,amount_currency:0
+msgid "The amount expressed in an optional other currency."
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+#: field:account.fiscal.position.template,name:0
+msgid "Fiscal Position Template"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term,line_ids:0
+msgid "Terms"
+msgstr ""
+
+#. module: account
+#: rml:account.vat.declaration:0
+msgid "Tax Report"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.analytic.account.chart,init,open:0
+#: wizard_button:account.chart,init,open:0
+msgid "Open Charts"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.fiscalyear.close.state,init:0
+msgid "Are you sure you want to close the fiscal year ?"
+msgstr ""
+
+#. module: account
+#: selection:account.move,type:0
+msgid "Bank Receipt"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank account"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,tax_template_ids:0
+msgid "Tax Template List"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_invoiceimport0
+msgid "Invoice import"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.action_move_journal_line_form_select
+msgid "Standard entry"
+msgstr ""
+
+#. module: account
+#: help:account.account,currency_mode:0
+msgid ""
+"This will select how the current currency rate for outgoing transactions is "
+"computed. In most countries the legal method is \"average\" but only a few "
+"software systems are able to manage this. So if you import from another "
+"software system you may have to use the rate at date. Incoming transactions "
+"always use the rate at date."
+msgstr ""
+
+#. module: account
+#: field:account.account,company_currency_id:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account_template
+msgid "Fiscal Position Template Account Mapping"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.move.line.reconcile,init_partial,addendum:0
+msgid "Reconcile With Write-Off"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,tax_amount:0
+msgid "Tax/Base Amount"
+msgstr ""
+
+#. module: account
+#: help:wizard.multi.charts.accounts,code_digits:0
+msgid "No. of Digits to use for account code"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,balance_end_real:0
+msgid "Ending Balance"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+msgid "Purchase Taxes"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,name:0
+msgid "Line Name"
+msgstr ""
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+msgid "Fixed Amount"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.analytic.check:0
+msgid "Analytic Credit"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,reconcile_partial_id:0
+#: wizard_button:account.move.line.reconcile,init_partial,partial:0
+msgid "Partial Reconcile"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.automatic.reconcile,reconcile,unreconciled:0
+msgid "Not reconciled transactions"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,tax_ids:0
+#: field:account.fiscal.position.template,tax_ids:0
+msgid "Tax Mapping"
+msgstr ""
+
+#. module: account
+#: view:account.config.wizard:0
+msgid "Continue"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,value:0
+msgid "Value"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.invoice.pay,addendum,writeoff_acc_id:0
+#: wizard_field:account.move.line.reconcile,addendum,writeoff_acc_id:0
+msgid "Write-Off account"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,model_id:0
+#: field:account.subscription,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state
+#: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
+msgid "Close a Fiscal Year"
+msgstr ""
+
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralised counterpart"
+msgstr ""
+
+#. module: account
+#: view:wizard.company.setup:0
+msgid "Message"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Select invoices you want to pay and manages advances"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: model:account.account.type,name:account.account_type_root
+#: selection:account.analytic.account,type:0
+#: field:account.journal,view_id:0
+msgid "View"
+msgstr ""
+
+#. module: account
+#: selection:account.account.balance.report,checktype,display_account:0
+#: selection:account.general.ledger.report,checktype,display_account:0
+#: selection:account.tax,type_tax_use:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "All"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,analytic_lines:0
+#: model:ir.model,name:account.model_account_analytic_line
+msgid "Analytic lines"
+msgstr ""
+
+#. module: account
+#: help:account.tax,type:0
+msgid "The computation method for the tax amount."
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingentries0
+#: model:process.node,note:account.process_node_supplieraccountingentries0
+msgid "Validated accounting entries."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.move.line.unreconcile,init:0
+#: wizard_view:account.reconcile.unreconcile,init:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_electronicfile0
+msgid "Electronic File"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Customer Credit"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,tax_line:0
+msgid "Tax Lines"
+msgstr ""
+
+#. module: account
+#: field:ir.sequence,fiscal_ids:0
+msgid "Sequences"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_type_form
+#: model:ir.ui.menu,name:account.menu_action_account_type_form
+msgid "Account Types"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.automatic.reconcile,init,journal_id:0
+#: field:account.bank.statement,journal_id:0
+#: wizard_field:account.central.journal.report,init,journal_id:0
+#: wizard_field:account.general.journal.report,init,journal_id:0
+#: field:account.invoice,journal_id:0
+#: field:account.journal.period,journal_id:0
+#: field:account.model,journal_id:0
+#: field:account.move,journal_id:0
+#: wizard_field:account.move.bank.reconcile,init,journal_id:0
+#: wizard_field:account.move.journal,init,journal_id:0
+#: field:account.move.line,journal_id:0
+#: wizard_field:account.move.validate,init,journal_id:0
+#: wizard_field:account.print.journal.report,init,journal_id:0
+#: field:fiscalyear.seq,journal_id:0
+#: model:ir.actions.report.xml,name:account.account_journal
+#: model:ir.model,name:account.model_account_journal
+#: wizard_field:populate_statement_from_inv,init,journal_id:0
+#: field:report.hr.timesheet.invoice.journal,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_id:0
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.account,check_history:0
+msgid "Display History"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.third_party_ledger.report,init,date1:0
+msgid "        Start date"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.account.balance.report,checktype,display_account:0
+#: wizard_field:account.general.ledger.report,checktype,display_account:0
+msgid "Display accounts "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_statement_reconcile_line
+msgid "Statement reconcile line"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement.reconcile:0
+#: field:account.bank.statement.reconcile,line_new_ids:0
+#: wizard_view:account.move.line.reconcile,init_full:0
+#: wizard_view:account.move.line.reconcile,init_partial:0
+msgid "Write-Off"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,partner_bank:0
+msgid ""
+"The partner bank account to pay\n"
+"Keep empty to use the default"
+msgstr ""
+
+#. module: account
+#: field:res.partner,debit:0
+msgid "Total Payable"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.fiscalyear.close.state,init,close:0
+msgid "Close states"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_wizard_company_setup
+msgid "wizard.company.setup"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
+msgid "account.analytic.line.extended"
+msgstr ""
+
+#. module: account
+#: field:account.journal,refund_journal:0
+msgid "Refund Journal"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_income
+msgid "Income"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+msgid "Supplier"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,tax_amount:0
+msgid "Tax Code Amount"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,sign:0
+msgid "Positive"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.general.journal.report,init:0
+#: model:ir.actions.wizard,name:account.wizard_general_journal
+#: model:ir.ui.menu,name:account.menu_general_journal
+msgid "Print General Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_chart_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
+msgid "Chart of Accounts Templates"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,move_id:0
+msgid "Invoice Movement"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
+#: model:ir.ui.menu,name:account.menu_wizard
+#: view:wizard.multi.charts.accounts:0
+msgid "Generate Chart of Accounts from a Chart Template"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_legal_statement
+msgid "Legal Statements"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,parent_id:0
+#: field:account.tax.code.template,parent_id:0
+msgid "Parent Code"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.move.line.reconcile.select,init,open:0
+msgid "Open for reconciliation"
+msgstr ""
+
+#. module: account
+#: model:account.journal,name:account.bilan_journal
+msgid "Journal d'ouverture"
+msgstr ""
+
+#. module: account
+#: selection:account.tax,tax_group:0
+#: selection:account.tax.template,tax_group:0
+msgid "VAT"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+msgid "Account n°"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the expense account"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.automatic.reconcile,init,account_ids:0
+msgid "Account to reconcile"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+#: field:account.model.line,partner_id:0
+#: field:account.move.line,partner_id:0
+msgid "Partner Ref."
+msgstr ""
+
+#. module: account
+#: selection:account.partner.balance.report,init,result_selection:0
+#: selection:account.third_party_ledger.report,init,result_selection:0
+msgid "Receivable and Payable Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+#: field:account.subscription,lines_id:0
+msgid "Subscription Lines"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
+#: selection:account.tax,type_tax_use:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Purchase"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Total quantity"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,date_due:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.period.close,init:0
+#: wizard_button:account.period.close,init,close:0
+msgid "Close Period"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Due"
+msgstr ""
+
+#. module: account
+#: rml:account.journal.period.print:0
+msgid "Third party"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Type Allowed (empty for no control)"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,balance_start:0
+msgid "Starting Balance"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,journal:0
+#: view:account.journal.period:0
+#: model:ir.actions.act_window,name:account.action_account_journal_period_tree
+#: model:ir.ui.menu,name:account.menu_action_account_journal_period_tree
+msgid "Journals"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.quantity_cost_ledger:0
+msgid "Max Qty:"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.invoice.refund,init,refund:0
+msgid "Refund Invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_period_tree
+#: model:ir.actions.wizard,name:account.wizard_period_close
+#: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
+msgid "Close a Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal
+msgid "Costs & Revenues"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+msgid "Error ! You can not create recursive accounts."
+msgstr ""
+
+#. module: account
+#: rml:account.tax.code.entries:0
+msgid "Account Number"
+msgstr ""
+
+#. module: account
+#: view:account.config.wizard:0
+msgid "Skip"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,period_id:0
+msgid "Force Period"
+msgstr ""
+
+#. module: account
+#: help:account.account.type,sequence:0
+msgid "Gives the sequence order when displaying a list of account types."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Re-Open"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.fiscalyear.close,init:0
+msgid "Are you sure you want to create entries?"
+msgstr ""
+
+#. module: account
+#: field:account.tax,include_base_amount:0
+msgid "Include in base amount"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.analytic.check:0
+msgid "Delta Credit"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
+#: model:ir.actions.wizard,name:account.wizard_unreconcile
+msgid "Unreconcile Entries"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierdraftinvoices0
+msgid "Pre-generated invoice from control"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
+msgid "Cost Legder for period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree2
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree2
+msgid "New Statement"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.analytic.account.chart,init,from_date:0
+#: wizard_field:account.analytic.line,init,from_date:0
+msgid "From"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_reconciliation0
+#: model:process.node,note:account.process_node_supplierreconciliation0
+msgid "Reconciliation of entries from invoice(s) and payment(s)"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.central.journal.report,init:0
+#: model:ir.actions.wizard,name:account.wizard_central_journal
+#: model:ir.ui.menu,name:account.menu_central_journal
+msgid "Print Central Journal"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.aged.trial.balance,init,period_length:0
+msgid "Period length (days)"
+msgstr ""
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
+msgid "Percent"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_charts
+msgid "Charts"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
+#: selection:account.tax,type_tax_use:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Sale"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.account.balance.report,account_selection,checktype:0
+#: wizard_button:account.general.ledger.report,account_selection,checktype:0
+msgid "Next"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_position:0
+msgid ""
+"The fiscal position will determine taxes and the accounts used for the the "
+"partner."
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.cost_ledger:0
+msgid "Date or Code"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+msgid "to :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.move.line.reconcile,init_full,debit:0
+#: wizard_field:account.move.line.reconcile,init_partial,debit:0
+msgid "Debit amount"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "year"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.account.balance.report,checktype,report:0
+#: wizard_button:account.analytic.account.analytic.check.report,init,report:0
+#: wizard_button:account.analytic.account.balance.report,init,report:0
+#: wizard_button:account.analytic.account.cost_ledger.report,init,report:0
+#: wizard_button:account.analytic.account.inverted.balance.report,init,report:0
+#: wizard_button:account.analytic.account.journal.report,init,report:0
+#: wizard_button:account.analytic.account.quantity_cost_ledger.report,init,report:0
+#: wizard_button:account.central.journal.report,init,print:0
+#: wizard_button:account.general.journal.report,init,print:0
+#: wizard_button:account.general.ledger.report,checktype,checkreport:0
+#: wizard_button:account.partner.balance.report,init,report:0
+#: wizard_button:account.print.journal.report,init,print:0
+#: wizard_button:account.third_party_ledger.report,init,checkreport:0
+msgid "Print"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.account.balance.report,checktype,date_from:0
+msgid "Start date"
+msgstr ""
+
+#. module: account
+#: model:account.journal,name:account.refund_expenses_journal
+msgid "x Expenses Credit Notes Journal"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,type:0
+#: field:account.bank.statement.line,type:0
+#: field:account.invoice,type:0
+#: field:account.journal,type:0
+#: field:account.move,type:0
+#: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
+msgid "Type"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Allowed (empty for no control)"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Untaxed amount"
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_collected_id:0
+#: field:account.tax.template,account_collected_id:0
+msgid "Invoice Tax Account"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Analytic Lines"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.invoice.pay,init:0
+#: model:ir.actions.wizard,name:account.wizard_invoice_pay
+msgid "Pay invoice"
+msgstr ""
+
+#. module: account
+#: constraint:account.invoice:0
+msgid "Error: Invalid Bvr Number (wrong checksum)."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree5
+#: model:ir.ui.menu,name:account.menu_invoice_draft
+msgid "Draft Customer Invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription_line
+msgid "Account Subscription Line"
+msgstr ""
+
+#. module: account
+#: selection:account.account.balance.report,checktype,state:0
+#: selection:account.general.ledger.report,checktype,state:0
+#: selection:account.partner.balance.report,init,state:0
+#: selection:account.third_party_ledger.report,init,state:0
+msgid "No Filter"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,days:0
+msgid "Number of Days"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,reference:0
+msgid "The partner reference of this invoice."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.general.ledger.report,checktype,sortbydate:0
+msgid "Sort by:"
+msgstr ""
+
+#. module: account
+#: field:account.move,to_check:0
+msgid "To Be Verified"
+msgstr ""
+
+#. module: account
+#: help:res.partner,debit:0
+msgid "Total amount you have to pay to this supplier."
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,init,power:0
+msgid "7"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_transfers
+msgid "Transfers"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Li."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.chart,init:0
+msgid "Account charts"
+msgstr ""
+
+#. module: account
+#: help:account.tax,name:0
+msgid "This name will be displayed on reports"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.cost_ledger:0
+#: rml:account.analytic.account.quantity_cost_ledger:0
+msgid "Printing date"
+msgstr ""
+
+#. module: account
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.partner.balance.report,init,date1:0
+msgid "          Start date"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.analytic.account.journal.report,init:0
+msgid "Analytic Journal Report"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree3
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree3
+msgid "Customer Refunds"
+msgstr ""
+
+#. module: account
+#: rml:account.vat.declaration:0
+msgid "Tax Amount"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.quantity_cost_ledger:0
+msgid "J.C./Move name"
+msgstr ""
+
+#. module: account
+#: field:account.journal.period,name:0
+msgid "Journal-Period Name"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,name:0
+#: field:account.tax.code.template,name:0
+msgid "Tax Case Name"
+msgstr ""
+
+#. module: account
+#: help:account.journal,entry_posted:0
+msgid ""
+"Check this box if you don't want new account moves to pass through the "
+"'draft' state and instead goes directly to the 'posted state' without any "
+"manual validation."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,partner_id:0
+#: field:account.bank.statement.reconcile,partner_id:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,partner_id:0
+#: field:account.move,partner_id:0
+#: wizard_field:account.partner.balance.report,init,result_selection:0
+#: wizard_field:account.third_party_ledger.report,init,result_selection:0
+#: field:wizard.company.setup,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,number:0
+msgid ""
+"Unique number of the invoice, computed automatically when the invoice is "
+"created."
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_expense
+msgid "Expense"
+msgstr ""
+
+#. module: account
+#: field:account.journal,invoice_sequence_id:0
+msgid "Invoice Sequence"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.automatic.reconcile,init:0
+msgid "Options"
+msgstr ""
+
+#. module: account
+#: model:process.process,name:account.process_process_invoiceprocess0
+msgid "Customer Invoice Process"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Fiscal Position Remark :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.fiscalyear.close,init,period_id:0
+msgid "Opening Entries Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_validate_account_moves
+#: model:ir.actions.wizard,name:account.wizard_validate_account_moves_line
+#: model:ir.ui.menu,name:account.menu_validate_account_moves
+msgid "Validate Account Moves"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "days"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,init,direction_selection:0
+msgid "Past"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,company_currency_id:0
+#: field:account.bank.accounts.wizard,currency_id:0
+#: field:account.bank.statement,currency:0
+#: field:account.bank.statement.reconcile,total_currency:0
+#: field:account.bank.statement.reconcile,total_second_currency:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,currency_id:0
+#: field:account.journal,currency:0
+#: field:account.model.line,currency_id:0
+#: field:account.move.line,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
+msgid "Unpaid invoices"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_paymentreconcile0
+msgid "Payment Reconcile"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
+#: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_tree
+msgid "Statements reconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_new
+#: model:ir.ui.menu,name:account.menu_action_subscription_form_new
+msgid "New Subscription"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Computation"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Entry"
+msgstr ""
+
+#. module: account
+#: view:res.company:0 field:res.company,overdue_msg:0
+msgid "Overdue Payments Message"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_tax_code_tree
+#: model:ir.ui.menu,name:account.menu_action_tax_code_tree
+msgid "Chart of Taxes"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,value_amount:0
+msgid "Value Amount"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
+msgid "Reconciled entries"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,address_contact_id:0
+msgid "Contact Address"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create 3 Months Periods"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "(keep empty to use the current period)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree8
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree8
+msgid "Draft Supplier Invoices"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.invoice.refund,init,period:0
+msgid "Force period"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+msgid "Detail"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+msgid "Consolidation"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,account_root_id:0
+msgid "Root Account"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid ""
+"Exception made of a mistake of our side, it seems that the following bills "
+"stay unpaid. Please, take appropriate measures in order to carry out this "
+"payment in the next 8 days."
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "VAT :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.general.ledger.report,account_selection,Account_list:0
+#: model:ir.actions.act_window,name:account.action_account_tree
+#: model:ir.actions.wizard,name:account.wizard_account_chart
+#: model:ir.ui.menu,name:account.menu_action_account_tree
+#: model:ir.ui.menu,name:account.menu_action_account_tree2
+msgid "Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: model:account.journal,name:account.check_journal
+msgid "x Checks Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_generate_subscription
+#: model:ir.ui.menu,name:account.menu_generate_subscription
+msgid "Create subscription entries"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.fiscalyear.close,init,journal_id:0
+msgid "Opening Entries Journal"
+msgstr ""
+
+#. module: account
+#: view:account.config.wizard:0
+msgid "Create a Fiscal Year"
+msgstr ""
+
+#. module: account
+#: field:product.template,taxes_id:0
+msgid "Customer Taxes"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,date_invoice:0
+msgid "Date Invoiced"
+msgstr ""
+
+#. module: account
+#: help:account.account.balance.report,checktype,periods:0
+#: help:account.general.ledger.report,checktype,periods:0
+#: help:account.partner.balance.report,init,periods:0
+#: help:account.third_party_ledger.report,init,periods:0
+#: help:account.vat.declaration,init,periods:0
+msgid "All periods if empty"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Liability"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,init,power:0
+msgid "2"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.chart,init:0
+msgid "(If you do not select Fiscal year it will take all open fiscal years)"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,base_code_id:0
+msgid "The account basis of the tax declaration."
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+#: field:account.analytic.line,date:0
+#: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
+#: field:account.bank.statement.reconcile,name:0
+#: rml:account.general.ledger:0
+#: selection:account.general.ledger.report,checktype,sortbydate:0
+#: rml:account.journal.period.print:0
+#: field:account.move,date:0
+#: rml:account.overdue:0
+#: wizard_field:account.subscription.generate,init,date:0
+#: field:account.subscription.line,date:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
+msgid "Date"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference_type:0
+msgid "Reference Type"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.move.line.unreconcile,init,unrec:0
+#: wizard_button:account.reconcile.unreconcile,init,unrec:0
+msgid "Unreconcile"
+msgstr ""
+
+#. module: account
+#: field:account.tax,type:0
+#: field:account.tax.template,type:0
+msgid "Tax Type"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_statemententries0
+msgid "Statement Entries"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,user_id:0
+#: field:account.journal,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_template_form
+msgid "Account Templates"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Chart of Accounts Template"
+msgstr ""
+
+#. module: account
+#: model:account.journal,name:account.refund_sales_journal
+msgid "Journal d'extourne"
+msgstr ""
+
+#. module: account
+#: rml:account.journal.period.print:0
+msgid "Voucher No"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_automatic_reconcile
+#: model:ir.ui.menu,name:account.menu_automatic_reconcile
+msgid "Automatic reconciliation"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Import Invoice"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
+msgid "and Journals"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Account Tax"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,move_id:0
+msgid "Move Line"
+msgstr ""
+
+#. module: account
+#: field:account.bank.accounts.wizard,acc_no:0
+msgid "Account No."
+msgstr ""
+
+#. module: account
+#: help:account.tax,child_depend:0
+msgid ""
+"Set if the tax computation is based on the computation of child taxes rather "
+"than on the total amount."
+msgstr ""
+
+#. module: account
+#: rml:account.central.journal:0
+msgid "Journal Code"
+msgstr ""
+
+#. module: account
+#: help:account.tax,applicable_type:0
+msgid ""
+"If not applicable (computed through a Python code), the tax won't appear on "
+"the invoice."
+msgstr ""
+
+#. module: account
+#: field:account.model,lines_id:0
+msgid "Model Entries"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.move.reconcile,line_id:0
+#: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_tree1
+#: model:ir.ui.menu,name:account.menu_action_move_line_search
+msgid "Entry Lines"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Applicable Code (if type=code)"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.move.journal,init,open:0
+msgid "Open Journal"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+msgid "KI"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.action_account_analytic_line
+#: model:ir.actions.wizard,name:account.action_move_journal_line_form
+#: model:ir.ui.menu,name:account.account_entries_analytic_entries
+#: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
+msgid "Entries Encoding by Line"
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,tax_template_ids:0
+msgid "List of all the taxes that have to be installed by the wizard"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.cost_ledger:0
+#: rml:account.analytic.account.quantity_cost_ledger:0
+msgid "Period from"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_statement
+#: model:process.node,name:account.process_node_bankstatement0
+#: model:process.node,name:account.process_node_supplierbankstatement0
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.invoice.pay,addendum:0
+#: wizard_view:account.move.line.reconcile,addendum:0
+msgid "Information addendum"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_entriesreconcile0
+#: model:process.transition,name:account.process_transition_supplierentriesreconcile0
+msgid "Entries Reconcile"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement.reconcile,total_second_amount:0
+msgid "The amount in the currency of the journal"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.general.ledger.report,checktype,landscape:0
+msgid "Landscape Mode"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_analyticinvoice0
+#: model:process.transition,note:account.process_transition_supplieranalyticcost0
+msgid "From analytic accounts, Create invoice."
+msgstr ""
+
+#. module: account
+#: wizard_button:account.account.balance.report,account_selection,end:0
+#: wizard_button:account.account.balance.report,checktype,end:0
+#: wizard_button:account.aged.trial.balance,init,end:0
+#: wizard_button:account.analytic.account.analytic.check.report,init,end:0
+#: wizard_button:account.analytic.account.balance.report,init,end:0
+#: wizard_button:account.analytic.account.chart,init,end:0
+#: wizard_button:account.analytic.account.cost_ledger.report,init,end:0
+#: wizard_button:account.analytic.account.inverted.balance.report,init,end:0
+#: wizard_button:account.analytic.account.journal.report,init,end:0
+#: wizard_button:account.analytic.account.quantity_cost_ledger.report,init,end:0
+#: wizard_button:account.analytic.line,init,end:0
+#: wizard_button:account.automatic.reconcile,init,end:0
+#: view:account.bank.statement:0
+#: wizard_button:account.central.journal.report,init,end:0
+#: wizard_button:account.chart,init,end:0
+#: wizard_button:account.fiscalyear.close,init,end:0
+#: wizard_button:account.fiscalyear.close.state,init,end:0
+#: wizard_button:account.general.journal.report,init,end:0
+#: wizard_button:account.general.ledger.report,account_selection,end:0
+#: wizard_button:account.general.ledger.report,checktype,end:0
+#: view:account.invoice:0
+#: wizard_button:account.invoice.pay,addendum,end:0
+#: wizard_button:account.invoice.pay,init,end:0
+#: wizard_button:account.invoice.refund,init,end:0
+#: view:account.move:0
+#: wizard_button:account.move.bank.reconcile,init,end:0
+#: wizard_button:account.move.journal,init,end:0
+#: wizard_button:account.move.line.reconcile,addendum,end:0
+#: wizard_button:account.move.line.reconcile,init_full,end:0
+#: wizard_button:account.move.line.reconcile,init_partial,end:0
+#: wizard_button:account.move.line.reconcile.select,init,end:0
+#: wizard_button:account.move.line.unreconcile,init,end:0
+#: wizard_button:account.move.line.unreconcile.select,init,end:0
+#: wizard_button:account.move.validate,init,end:0
+#: wizard_button:account.open_closed_fiscalyear,init,end:0
+#: wizard_button:account.partner.balance.report,init,end:0
+#: wizard_button:account.period.close,init,end:0
+#: wizard_button:account.print.journal.report,init,end:0
+#: wizard_button:account.reconcile.unreconcile,init,end:0
+#: wizard_button:account.subscription.generate,init,end:0
+#: wizard_button:account.third_party_ledger.report,init,end:0
+#: wizard_button:account.vat.declaration,init,end:0
+#: wizard_button:account_use_models,init_form,end:0
+#: view:wizard.company.setup:0
+#: view:wizard.multi.charts.accounts:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,name:0
+msgid "Acc. Type Name"
+msgstr ""
+
+#. module: account
+#: help:account.tax,base_code_id:0
+#: help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0
+#: help:account.tax,tax_code_id:0
+#: help:account.tax.template,base_code_id:0
+#: help:account.tax.template,ref_base_code_id:0
+#: help:account.tax.template,ref_tax_code_id:0
+#: help:account.tax.template,tax_code_id:0
+msgid "Use this code for the VAT declaration."
+msgstr ""
+
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "Litigation"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+#: wizard_view:account.move.validate,init:0
+#: view:account.payment.term:0
+msgid "Information"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_tax_report
+msgid "Taxes Reports"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_account_payable:0
+msgid "Account Payable"
+msgstr ""
+
+#. module: account
+#: wizard_view:populate_statement_from_inv,init:0
+msgid "Import Invoices in Statement"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Other Info"
+msgstr ""
+
+#. module: account
+#: field:account.journal,default_credit_account_id:0
+msgid "Default Credit Account"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_supplierpaymentorder0
+msgid "Payment Order"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,reconcile:0
+msgid ""
+"Check this option if you want the user to reconcile entries in this account."
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+#: model:ir.ui.menu,name:account.next_id_40
+#: model:process.node,name:account.process_node_analytic0
+#: model:process.node,name:account.process_node_analyticcost0
+msgid "Analytic"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_invoiceinvoice0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_cash_equity
+msgid "Equity"
+msgstr ""
+
+#. module: account
+#: field:wizard.company.setup,overdue_msg:0
+msgid "Overdue Payment Message"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr ""
+
+#. module: account
+#: rml:account.partner.balance:0
+msgid "In dispute"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,type:0
+msgid ""
+"This type is used to differenciate types with special effects in Open ERP: "
+"view can not have entries, consolidation are accounts that can have children "
+"accounts for multi-company consolidations, payable/receivable are for "
+"partners accounts (for debit/credit computations), closed for deprecated "
+"accounts."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_end_year_treatments
+msgid "End of Year Treatments"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_generic_report
+msgid "Generic Reports"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.automatic.reconcile,init,power:0
+msgid "Power"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.analytic.line,init:0
+msgid "Account Analytic Lines Analysis"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Price"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+msgid "-"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+msgid "asgfas"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
+#: model:ir.actions.wizard,name:account.wizard_analytic_account_chart
+#: model:ir.ui.menu,name:account.account_analytic_chart_balance
+#: model:ir.ui.menu,name:account.account_analytic_def_chart
+#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
+msgid "Analytic Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.analytic.line,init:0
+msgid "View Account Analytic Lines"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.move.validate,init:0
+msgid "Select Period and Journal for Validation"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,number:0
+msgid "Invoice Number"
+msgstr ""
+
+#. module: account
+#: field:account.period,date_stop:0
+msgid "End of Period"
+msgstr ""
+
+#. module: account
+#: wizard_button:populate_statement_from_inv,go,finish:0
+msgid "O_k"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,amount_untaxed:0
+msgid "Untaxed"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
+#: model:ir.actions.wizard,name:account.account_analytic_account_inverted_balance_report
+msgid "Inverted Analytic Balance"
+msgstr ""
+
+#. module: account
+#: field:account.tax,applicable_type:0
+#: field:account.tax.template,applicable_type:0
+msgid "Applicable Type"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference:0
+msgid "Invoice Reference"
+msgstr ""
+
+#. module: account
+#: field:account.account,name:0
+#: field:account.account.template,name:0
+#: rml:account.analytic.account.inverted.balance:0
+#: field:account.bank.statement,name:0
+#: field:account.bank.statement.line,name:0
+#: field:account.chart.template,name:0
+#: field:account.config.wizard,name:0
+#: field:account.model.line,name:0
+#: field:account.move,name:0
+#: field:account.move.line,name:0
+#: field:account.move.reconcile,name:0
+#: field:account.subscription,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.move.line.reconcile,init_full:0
+#: wizard_view:account.move.line.reconcile,init_partial:0
+msgid "Reconciliation transactions"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.aged.trial.balance,init,direction_selection:0
+msgid "Analysis Direction"
+msgstr ""
+
+#. module: account
+#: wizard_button:populate_statement_from_inv,init,go:0
+msgid "_Go"
+msgstr ""
+
+#. module: account
+#: field:res.partner,ref_companies:0
+msgid "Companies that refers to partner"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date:0
+msgid "Effective date"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,sequence:0
+msgid ""
+"The sequence field is used to order the taxes lines from lower sequences to "
+"higher ones. The order is important if you have a tax that has several tax "
+"children. In this case, the evaluation order is important."
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,view_id:0
+#: view:account.journal.view:0
+#: field:account.journal.view,name:0
+#: model:ir.model,name:account.model_account_journal_view
+msgid "Journal View"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Credit Centralisation"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Customer Ref:"
+msgstr ""
+
+#. module: account
+#: xsl:account.transfer:0
+msgid "Partner ID"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.automatic.reconcile,init:0
+#: wizard_view:account.invoice.pay,addendum:0
+#: wizard_view:account.move.line.reconcile,addendum:0
+msgid "Write-Off Move"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree1_new
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree1_new
+msgid "New Customer Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.account,reconcile:0
+#: wizard_button:account.automatic.reconcile,init,reconcile:0
+#: field:account.bank.statement.line,reconcile_id:0
+#: view:account.bank.statement.reconcile:0
+#: field:account.bank.statement.reconcile.line,line_id:0
+#: field:account.move.line,reconcile_id:0
+#: wizard_button:account.move.line.reconcile,addendum,reconcile:0
+#: wizard_button:account.move.line.reconcile,init_full,reconcile:0
+msgid "Reconcile"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Best regards."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_hr_timesheet_invoice_journal
+msgid "Analytic account costs and revenues"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.invoice.refund,init:0
+msgid "Are you sure you want to refund this invoice ?"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_paid_open
+msgid "Open State"
+msgstr ""
+
+#. module: account
+#: field:account.journal,entry_posted:0
+msgid "Skip 'Draft' State for Created Entries"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,account_id:0
+#: field:account.move.line,tax_code_id:0
+msgid "Tax Account"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_statemententries0
+msgid "From statement, create entries"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+#: rml:account.vat.declaration:0
+msgid "1cm 27.7cm 20cm 27.7cm"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree12
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree12
+msgid "Draft Supplier Refunds"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_accountingstatemententries0
+msgid "Accounting Statement"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Document: Customer account statement"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+#: view:res.partner:0
+msgid "Accounting"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+msgid "Taxes Mapping"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.move.line.unreconcile,init:0
+#: wizard_view:account.reconcile.unreconcile,init:0
+msgid "Unreconciliation transactions"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentorderbank0
+#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
+msgid "Reconcilation of entries from payment order."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,move_line_ids:0
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
+#: model:ir.model,name:account.model_account_move_line
+msgid "Entry lines"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.automatic.reconcile,init:0
+#: wizard_view:account.move.line.reconcile,init_full:0
+#: wizard_view:account.move.line.reconcile,init_partial:0
+#: wizard_view:account.move.line.reconcile.select,init:0
+#: model:ir.ui.menu,name:account.next_id_20
+#: model:process.node,name:account.process_node_reconciliation0
+#: model:process.node,name:account.process_node_supplierreconciliation0
+msgid "Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,centralisation:0
+msgid "Centralisation"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,tax_code_id:0
+#: field:account.tax,description:0
+#: field:account.tax,tax_code_id:0
+#: field:account.tax.template,tax_code_id:0
+#: model:ir.model,name:account.model_account_tax_code
+msgid "Tax Code"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+msgid "Analytic Journal -"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.analytic.check:0
+msgid "Analytic Debit"
+msgstr ""
+
+#. module: account
+#: field:account.account,currency_mode:0
+msgid "Outgoing Currencies Rate"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree10
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree10
+msgid "Draft Customer Refunds"
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,readonly:0
+msgid "Readonly"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,date_maturity:0
+msgid ""
+"The maturity date of the generated entries for this model. You can chosse "
+"between the date of the creation action or the the date of the creation of "
+"the entries plus the partner payment terms."
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
+msgid "Situation"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+#: xsl:account.transfer:0
+msgid "Document"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,move_id:0
+msgid "The move of this entry line."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,uos_id:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr ""
+
+#. module: account
+#: help:account.journal,group_invoice_lines:0
+msgid ""
+"If this box is checked, the system will try to group the accounting lines "
+"when generating them from invoices."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0
+#: wizard_field:account.move.line.reconcile,init_partial,trans_nbr:0
+msgid "# of Transaction"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_invoice_state_cancel
+msgid "Cancel selected invoices"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.journal:0
+#: field:account.analytic.line,journal_id:0
+#: field:account.journal,analytic_journal_id:0
+#: model:ir.actions.report.xml,name:account.analytic_journal_print
+#: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: account
+#: rml:account.general.ledger:0
+msgid "Entry Label"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentreconcile0
+msgid "Reconcilate the entries from payment"
+msgstr ""
+
+#. module: account
+#: rml:account.tax.code.entries:0
+msgid "("
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.period:0
+#: view:account.subscription:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,origin:0
+#: help:account.invoice.line,origin:0
+msgid "Reference of the document that produced this invoice."
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.aged.trial.balance,init,result_selection:0
+msgid "Payable"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+#: field:account.invoice.tax,base:0
+msgid "Base"
+msgstr ""
+
+#. module: account
+#: field:account.model,name:0
+msgid "Model Name"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+msgid "Others"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,init,power:0
+msgid "8"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+#: wizard_button:account.move.validate,init,validate:0
+msgid "Validate"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+#: field:account.model,legend:0
+msgid "Legend"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_draftinvoices0
+msgid "Proposed invoice to be checked, validated and printed"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_move_line_select
+msgid "account.move.line.select"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: rml:account.account.balance:0
+#: wizard_field:account.account.balance.report,account_selection,Account_list:0
+#: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
+#: field:account.bank.statement.line,account_id:0
+#: field:account.bank.statement.reconcile.line,account_id:0
+#: field:account.invoice,account_id:0
+#: field:account.invoice.line,account_id:0
+#: field:account.journal,account_control_ids:0
+#: field:account.model.line,account_id:0
+#: field:account.move.line,account_id:0
+#: wizard_field:account.move.line.reconcile.select,init,account_id:0
+#: wizard_field:account.move.line.unreconcile.select,init,account_id:0
+#: model:ir.model,name:account.model_account_account
+msgid "Account"
+msgstr ""
+
+#. module: account
+#: model:account.journal,name:account.bank_journal
+msgid "Journal de Banque CHF"
+msgstr ""
+
+#. module: account
+#: selection:account.account.balance.report,checktype,state:0
+#: selection:account.general.ledger.report,checktype,state:0
+#: selection:account.partner.balance.report,init,state:0
+#: selection:account.third_party_ledger.report,init,state:0
+msgid "By Date and Period"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0
+#: view:account.invoice.line:0
+#: field:account.invoice.line,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,reconciled:0
+msgid ""
+"The account moves of the invoice have been reconciled with account moves of "
+"the payment(s)."
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+#: view:account.invoice:0
+#: field:account.invoice.line,invoice_line_tax_id:0
+#: model:ir.actions.act_window,name:account.action_tax_form
+#: model:ir.ui.menu,name:account.menu_action_tax_form
+#: model:ir.ui.menu,name:account.next_id_27
+msgid "Taxes"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.fiscalyear.close,init:0
+msgid "Close Fiscal Year with new entries"
+msgstr ""
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "Average Rate"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_bankstatement0
+#: model:process.node,note:account.process_node_supplierbankstatement0
+msgid "Statement encoding produces payment entries"
+msgstr ""
+
+#. module: account
+#: field:account.account,code:0
+#: rml:account.account.balance:0
+#: field:account.account.template,code:0
+#: field:account.account.type,code:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.analytic.account.inverted.balance:0
+#: rml:account.analytic.account.journal:0
+#: field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0
+#: field:account.fiscalyear,code:0
+#: rml:account.general.journal:0
+#: field:account.journal,code:0
+#: rml:account.partner.balance:0
+#: field:account.period,code:0
+msgid "Code"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance
+msgid "Financial Management"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
+msgid "None"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_fiscalyear_close
+#: model:ir.ui.menu,name:account.menu_wizard_fy_close
+msgid "Generate Fiscal Year Opening Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_reconcile
+msgid "Reconcile Entries"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.wizard_paid_open,init:0
+msgid "(Invoice should be unreconciled if you want to open it)"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Additionnal Information"
+msgstr ""
+
+#. module: account
+#: field:account.tax,name:0
+#: field:account.tax.template,name:0
+#: rml:account.vat.declaration:0
+msgid "Tax Name"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.fiscalyear.close.state,init:0
+msgid " Close states of Fiscal year and periods"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term
+msgid "30 Days End of Month"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,tax_code_root_id:0
+msgid "Root Tax Code"
+msgstr ""
+
+#. module: account
+#: constraint:account.invoice:0
+msgid "Error: BVR reference is required."
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,notprintable:0
+#: field:account.tax.code.template,notprintable:0
+msgid "Not Printable in Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,move_id:0
+msgid "Move"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.tax,tax_src_id:0
+#: field:account.fiscal.position.tax.template,tax_src_id:0
+msgid "Tax Source"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_analytic_account_balance
+#: model:ir.actions.wizard,name:account.account_analytic_account_balance_report
+msgid "Analytic Balance"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Bank Information"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: account
+#: rml:account.partner.balance:0
+#: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
+#: model:ir.actions.wizard,name:account.wizard_partner_balance_report
+#: model:ir.ui.menu,name:account.menu_partner_balance
+msgid "Partner Balance"
+msgstr ""
+
+#. module: account
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+msgid "Third Party Ledger"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_receivable:0
+msgid ""
+"This account will be used instead of the default one as the receivable "
+"account for the current partner"
+msgstr ""
+
+#. module: account
+#: selection:account.tax,applicable_type:0
+#: field:account.tax,python_applicable:0
+#: field:account.tax,python_compute:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,applicable_type:0
+#: field:account.tax.template,python_applicable:0
+#: field:account.tax.template,python_compute:0
+#: selection:account.tax.template,type:0
+msgid "Python Code"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
+msgid "Bank statements"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.next_id_22
+msgid "Partner Accounts"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,tax_group:0
+msgid ""
+"If a default tax if given in the partner it only override taxes from account "
+"(or product) of the same group."
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Real Entries"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_importinvoice0
+msgid "Import invoice"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:wizard.company.setup:0
+#: view:wizard.multi.charts.accounts:0
+msgid "Create"
+msgstr ""
+
+#. module: account
+#: model:process.transition.action,name:account.process_transition_action_createentries0
+msgid "Create entry"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_line
+msgid "Invoice line"
+msgstr ""
+
+#. module: account
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
+msgid "Shortcut"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.move.validate,init:0
+msgid ""
+"All draft account entries in this journal and period will be validated. It "
+"means you won't be able to modify their accouting fields."
+msgstr ""
+
+#. module: account
+#: selection:account.model.line,date:0
+#: selection:account.model.line,date_maturity:0
+msgid "Date of the day"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_currency:0
+msgid ""
+"The amount expressed in an optional other currency if it is a multi-currency "
+"entry."
+msgstr ""
+
+#. module: account
+#: field:account.tax,parent_id:0
+#: field:account.tax.template,parent_id:0
+msgid "Parent Tax Account"
+msgstr ""
+
+#. module: account
+#: field:account.account,user_type:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
+#: field:account.analytic.account,type:0
+#: model:ir.model,name:account.model_account_account_type
+msgid "Account Type"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank account owner"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.account.balance.report,checktype:0
+#: wizard_view:account.general.ledger.report,checktype:0
+#: wizard_view:account.partner.balance.report,init:0
+#: wizard_view:account.third_party_ledger.report,init:0
+msgid "Filter on Periods"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_account_receivable:0
+msgid "Account Receivable"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.invoice.pay,addendum,reconcile:0
+msgid "Pay and reconcile"
+msgstr ""
+
+#. module: account
+#: rml:account.central.journal:0
+#: model:ir.actions.report.xml,name:account.account_central_journal
+msgid "Central Journal"
+msgstr ""
+
+#. module: account
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+msgid "Balance brought forward"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_consol_ids:0
+msgid "Consolidated Children"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.account.balance.report,checktype,fiscalyear:0
+#: wizard_field:account.chart,init,fiscalyear:0
+#: wizard_field:account.general.ledger.report,checktype,fiscalyear:0
+#: wizard_field:account.partner.balance.report,init,fiscalyear:0
+#: wizard_field:account.third_party_ledger.report,init,fiscalyear:0
+msgid "Fiscal year"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Balance :"
+msgstr ""
+
+#. module: account
+#: selection:account.account.balance.report,checktype,display_account:0
+#: selection:account.general.ledger.report,checktype,display_account:0
+msgid "With balance is not equal to 0"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,init,power:0
+msgid "3"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_vat_declaration
+msgid "Taxes Report"
+msgstr ""
+
+#. module: account
+#: selection:account.journal.period,state:0
+msgid "Printed"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree4_new
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree4_new
+msgid "New Supplier Refund"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+msgid "Entry Model"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.general.ledger.report,checktype,amount_currency:0
+msgid "With Currency"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Chart of accounts"
+msgstr ""
+
+#. module: account
+#: field:account.subscription.line,subscription_id:0
+msgid "Subscription"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,code:0
+msgid "Journal code"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.fiscalyear.close,init,close:0
+#: view:account.model:0
+msgid "Create entries"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Project line"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.automatic.reconcile,init,max_amount:0
+msgid "Maximum write-off amount"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,manual:0
+msgid "Manual"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Compute Taxes"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,code_digits:0
+msgid "# of Digits"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for the current "
+"partner"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.invoice.pay,addendum,comment:0
+#: wizard_field:account.invoice.pay,init,name:0
+msgid "Entry Name"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,account_id:0
+msgid "The partner account used for this invoice."
+msgstr ""
+
+#. module: account
+#: help:account.tax.code,notprintable:0
+#: help:account.tax.code.template,notprintable:0
+msgid ""
+"Check this box if you don't want any VAT related to this Tax Code to appear "
+"on invoices"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,sequence:0
+#: field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0
+#: field:account.model.line,sequence:0
+#: field:account.payment.term.line,sequence:0
+#: field:account.sequence.fiscalyear,sequence_id:0
+#: field:account.tax,sequence:0
+#: field:account.tax.template,sequence:0
+#: field:fiscalyear.seq,sequence_id:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_template
+msgid "Template for Fiscal Position"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Entry encoding"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.invoice.refund,init:0
+#: model:ir.actions.wizard,name:account.wizard_invoice_refund
+msgid "Credit Note"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.todo,note:account.config_fiscalyear
+msgid "Define Fiscal Years and Select Charts of Account"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.move.line.reconcile,addendum,period_id:0
+msgid "Write-Off Period"
+msgstr ""
+
+#. module: account
+#: selection:account.config.wizard,period:0
+msgid "3 Months"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.move.journal,init:0
+msgid "Standard entries"
+msgstr ""
+
+#. module: account
+#: help:account.account,check_history:0
+msgid ""
+"Check this box if you want to print all entries when printing the General "
+"Ledger, otherwise it will only print its balance."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_payment_term_line
+msgid "Payment Term Line"
+msgstr ""
+
+#. module: account
+#: selection:account.config.wizard,period:0
+#: field:report.hr.timesheet.invoice.journal,name:0
+msgid "Month"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription
+msgid "Account Subscription"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,date_maturity:0
+#: field:account.move.line,date_maturity:0
+#: rml:account.overdue:0
+msgid "Maturity date"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Entry Subscription"
+msgstr ""
+
+#. module: account
+#: selection:account.print.journal.report,init,sort_selection:0
+msgid "By date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_config_wizard_form
+msgid "Account Configure Wizard "
+msgstr ""
+
+#. module: account
+#: field:account.config.wizard,date1:0
+#: field:account.fiscalyear,date_start:0
+#: field:account.subscription,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.general.ledger.report,account_selection:0
+msgid "Select Chart"
+msgstr ""
+
+#. module: account
+#: selection:account.chart,init,target_move:0
+#: model:ir.actions.report.xml,name:account.account_move_line_list
+msgid "All Entries"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_draftinvoices0
+#: model:process.node,name:account.process_node_supplierdraftinvoices0
+msgid "Draft Invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax_template
+msgid "Fiscal Position Template Tax Mapping"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+msgid "Unreconciled"
+msgstr ""
+
+#. module: account
+#: field:account.account,note:0
+#: field:account.account.template,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Financial and accounting module that covers:\n"
+"    General accounting\n"
+"    Cost / Analytic accounting\n"
+"    Third party accounting\n"
+"    Taxes management\n"
+"    Budgets\n"
+"    Customer and Supplier Invoices\n"
+"    Bank statements\n"
+"    "
+msgstr ""
+
+#. module: account
+#: field:account.journal,sequence_id:0
+msgid "Entry Sequence"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+msgid "Closed"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_paymententries0
+msgid "Payment Entries"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,tax_code_id:0
+msgid "The Account can either be a base tax code or tax code account."
+msgstr ""
+
+#. module: account
+#: help:account.automatic.reconcile,init,account_ids:0
+msgid ""
+"If no account is specified, the reconciliation will be made using every "
+"accounts that can be reconcilied"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_wizard_company_setup_form
+#: view:wizard.company.setup:0
+msgid "Overdue Payment Report Message"
+msgstr ""
+
+#. module: account
+#: selection:account.tax,tax_group:0
+#: selection:account.tax.template,tax_group:0
+msgid "Other"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.wizard,name:account.wizard_general_ledger
+#: model:ir.actions.wizard,name:account.wizard_general_ledger_report
+#: model:ir.ui.menu,name:account.menu_general_ledger
+msgid "General Ledger"
+msgstr ""
+
+#. module: account
+#: field:account.journal.view,columns_id:0
+msgid "Columns"
+msgstr ""
+
+#. module: account
+#: selection:account.general.ledger.report,checktype,sortbydate:0
+msgid "Movement"
+msgstr ""
+
+#. module: account
+#: help:account.period,special:0
+msgid "These periods can overlap."
+msgstr ""
+
+#. module: account
+#: help:product.template,property_account_expense:0
+msgid ""
+"This account will be used instead of the default one to value outgoing stock "
+"for the current product"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_manually0
+msgid "Encode manually the statement"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_journal_form
+#: model:ir.ui.menu,name:account.menu_action_account_journal_form
+msgid "Financial Journals"
+msgstr ""
+
+#. module: account
+#: selection:account.account.balance.report,checktype,state:0
+#: selection:account.general.ledger.report,checktype,state:0
+#: selection:account.partner.balance.report,init,state:0
+#: selection:account.third_party_ledger.report,init,state:0
+msgid "By Period"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,date_invoice:0
+msgid "Keep empty to use the current date"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "."
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr ""
+
+#. module: account
+#: field:account.period,name:0
+msgid "Period Name"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.journal,type:0
+msgid ""
+"Gives the type of the analytic journal. When a document (eg: an invoice) "
+"needs to create analytic entries, Open ERP will look for a matching journal "
+"of the same type."
+msgstr ""
+
+#. module: account
+#: field:account.journal,groups_id:0
+msgid "Groups"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.quantity_cost_ledger:0
+msgid "Code/Date"
+msgstr ""
+
+#. module: account
+#: field:account.account,active:0
+#: field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.journal,active:0
+#: field:account.journal.period,active:0
+#: field:account.payment.term,active:0
+#: field:account.tax,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_electronicfile0
+msgid "Import from your bank statements"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Properties"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Customer Accounting Properties"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Select entries"
+msgstr ""
+
+#. module: account
+#: selection:account.chart,init,target_move:0
+msgid "All Posted Entries"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.vat.declaration,init,based_on:0
+msgid "Base on"
+msgstr ""
+
+#. module: account
+#: selection:account.move,type:0
+msgid "Cash Payment"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_payable:0
+msgid "Payable Account"
+msgstr ""
+
+#. module: account
+#: field:account.account,currency_id:0
+#: field:account.account.template,currency_id:0
+msgid "Secondary Currency"
+msgstr ""
+
+#. module: account
+#: field:account.account,credit:0
+#: rml:account.account.balance:0
+#: field:account.analytic.account,credit:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.analytic.account.cost_ledger:0
+#: rml:account.analytic.account.inverted.balance:0
+#: rml:account.central.journal:0
+#: rml:account.journal.period.print:0
+#: field:account.model.line,credit:0
+#: field:account.move.line,credit:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+#: rml:account.vat.declaration:0
+#: field:report.hr.timesheet.invoice.journal,cost:0
+msgid "Credit"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,child_depend:0
+msgid ""
+"Indicate if the tax computation is based on the value computed for the "
+"computation of child taxes or based on the total amount."
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_paid_id:0
+#: field:account.tax.template,account_paid_id:0
+msgid "Refund Tax Account"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,child_ids:0
+#: field:account.tax.code.template,child_ids:0
+msgid "Child Codes"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,move_name:0
+msgid "Account Move"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,line_ids:0
+msgid "Statement lines"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,amount_taxed:0
+msgid "Taxed Amount"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,price_subtotal:0
+msgid "Subtotal w/o tax"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Ref"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,quantity:0
+msgid ""
+"The optional quantity expressed by this line, eg: number of product sold. "
+"The quantity is not a legal requirement but is very usefull for some reports."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.third_party_ledger.report,init,reconcil:0
+msgid "       Include Reconciled Entries"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,blocked:0
+msgid ""
+"You can check this box to mark the entry line as a litigation with the "
+"associated partner"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree1
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: account
+#: field:res.partner,debit_limit:0
+msgid "Payable Limit"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.account.balance.report,checktype,state:0
+#: wizard_field:account.general.ledger.report,checktype,state:0
+#: wizard_field:account.partner.balance.report,init,state:0
+#: wizard_field:account.third_party_ledger.report,init,state:0
+msgid "Date/Period Filter"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.bank.statement.line,type:0
+#: selection:account.journal,type:0
+msgid "General"
+msgstr ""
+
+#. module: account
+#: rml:account.general.journal:0
+msgid "Credit Trans."
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,seq_journal:0
+msgid "Separated Journal Sequences"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement.reconcile,total_second_currency:0
+msgid "The currency of the journal"
+msgstr ""
+
+#. module: account
+#: view:account.journal.column:0
+#: model:ir.model,name:account.model_account_journal_column
+msgid "Journal Column"
+msgstr ""
+
+#. module: account
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.period,state:0
+#: selection:account.subscription,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.account.balance.report,checktype,periods:0
+#: field:account.config.wizard,period:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,period_ids:0
+#: wizard_field:account.general.ledger.report,checktype,periods:0
+#: wizard_field:account.partner.balance.report,init,periods:0
+#: wizard_field:account.third_party_ledger.report,init,periods:0
+#: wizard_field:account.vat.declaration,init,periods:0
+#: model:ir.actions.act_window,name:account.action_account_period_form
+#: model:ir.ui.menu,name:account.menu_action_account_period_form
+#: model:ir.ui.menu,name:account.next_id_23
+msgid "Periods"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+#: view:account.invoice:0
+#: field:account.move.line,invoice:0
+#: model:ir.model,name:account.model_account_invoice
+#: model:res.request.link,name:account.req_link_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.account,state:0
+#: selection:account.invoice,state:0
+#: wizard_button:account.open_closed_fiscalyear,init,open:0
+#: wizard_button:account_use_models,create,open_move:0
+msgid "Open"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.next_id_29
+msgid "Search Entries"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_analytic0
+#: model:process.node,note:account.process_node_analyticcost0
+msgid "Analytic costs to reinvoice purchases, timesheets, ..."
+msgstr ""
+
+#. module: account
+#: field:account.account,tax_ids:0
+#: field:account.account.template,tax_ids:0
+msgid "Default Taxes"
+msgstr ""
+
+#. module: account
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: account
+#: help:account.account.type,sign:0
+msgid ""
+"Allows you to change the sign of the balance amount displayed in the "
+"reports, so that you can see positive figures instead of negative ones in "
+"expenses accounts."
+msgstr ""
+
+#. module: account
+#: help:account.config.wizard,code:0
+msgid "Name of the fiscal year as displayed in reports."
+msgstr ""
+
+#. module: account
+#: help:account.move.line,date_maturity:0
+msgid ""
+"This field is used for payable and receivable entries. You can put the limit "
+"date for the payment of this entry line."
+msgstr ""
+
+#. module: account
+#: rml:account.tax.code.entries:0
+msgid "Third party (Country)"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_left:0
+msgid "Parent Left"
+msgstr ""
+
+#. module: account
+#: help:account.journal,sequence_id:0
+msgid "The sequence gives the display order for a list of journals"
+msgstr ""
+
+#. module: account
+#: field:account.journal,type_control_ids:0
+msgid "Type Controls"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,name:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.central.journal:0
+msgid "Account Name"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.invoice.pay,init,date:0
+msgid "Payment date"
+msgstr ""
+
+#. module: account
+#: wizard_button:account_use_models,create,end:0
+msgid "Ok"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Taxes:"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree7
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree7
+msgid "Unpaid Customer Invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree2
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree2
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,product_id:0
+#: field:account.invoice.line,product_id:0
+#: field:account.move.line,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: account
+#: rml:account.tax.code.entries:0
+msgid ")"
+msgstr ""
+
+#. module: account
+#: field:res.partner,credit:0
+msgid "Total Receivable"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_period
+msgid "Account period"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.invoice.pay,init,journal_id:0
+msgid "Journal/Payment Mode"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Canceled Invoice"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Remove Lines"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.general.ledger.report,checktype,soldeinit:0
+#: wizard_field:account.partner.balance.report,init,soldeinit:0
+#: wizard_field:account.third_party_ledger.report,init,soldeinit:0
+msgid "Include initial balances"
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Account Template"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sum:0
+msgid "Year Sum"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_filestatement0
+msgid "Import file from your bank statement"
+msgstr ""
+
+#. module: account
+#: field:account.account,type:0
+#: field:account.account.template,type:0
+msgid "Internal Type"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,init,power:0
+msgid "9"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_running
+#: model:ir.ui.menu,name:account.menu_action_subscription_form_running
+msgid "Running Subscriptions"
+msgstr ""
+
+#. module: account
+#: selection:account.move,type:0
+msgid "Bank Payment"
+msgstr ""
+
+#. module: account
+#: selection:account.move,state:0
+msgid "Posted"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Credit Notes"
+msgstr ""
+
+#. module: account
+#: field:account.config.wizard,date2:0
+#: field:account.fiscalyear,date_stop:0
+msgid "End Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_open_closed_fiscalyear
+#: model:ir.ui.menu,name:account.menu_wizard_open_closed_fy
+msgid "Cancel Opening Entries"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_invoicemanually0
+msgid "Manually statement"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,days2:0
+msgid "Day of the Month"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,line_ids:0
+#: field:account.tax.code,line_ids:0
+msgid "Lines"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Dear Sir/Madam,"
+msgstr ""
+
+#. module: account
+#: help:account.tax,sequence:0
+msgid ""
+"The sequence field is used to order the tax lines from the lowest sequences "
+"to the higher ones. The order is important if you have a tax with several "
+"tax children. In this case, the evaluation order is important."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Tax Declaration"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_filestatement0
+msgid "File statement"
+msgstr ""
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequences"
+msgstr ""
+
+#. module: account
+#: view:account.model.line:0
+msgid "Entry Model Line"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Account Tax Template"
+msgstr ""
+
+#. module: account
+#: help:account.model,name:0
+msgid "This is a model for recurring accounting entries"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.wizard_paid_open,init:0
+msgid "Open Invoice"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_draftstatement0
+msgid "Set starting and ending balance for control"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.wizard_paid_open,init:0
+msgid "Are you sure you want to open this invoice ?"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
+msgid "Partner Other Ledger"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Supplier Debit"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,quantity:0
+msgid "The optional quantity on entries"
+msgstr ""
+
+#. module: account
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+msgid "JNRL"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+#: view:account.period:0
+msgid "States"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: model:process.node,name:account.process_node_accountingentries0
+#: model:process.node,name:account.process_node_supplieraccountingentries0
+msgid "Accounting Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled
+msgid "Receivables & Payables"
+msgstr ""
+
+#. module: account
+#: rml:account.general.ledger:0
+msgid "General Ledger -"
+msgstr ""
+
+#. module: account
+#: field:report.hr.timesheet.invoice.journal,quantity:0
+msgid "Quantities"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.analytic.account.inverted.balance:0
+#: rml:account.analytic.account.quantity_cost_ledger:0
+#: field:account.invoice,amount_total:0
+#: field:account.invoice,check_total:0
+msgid "Total"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_customerinvoice0
+#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
+msgid "Number of entries are generated"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_suppliervalidentries0
+#: model:process.transition,name:account.process_transition_validentries0
+msgid "Valid Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_use_model
+#: model:ir.actions.wizard,name:account.wizard_line_account_use_model
+#: model:ir.ui.menu,name:account.menu_account_use_model
+msgid "Create Entries From Models"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,reconcile:0
+msgid "Allow Reconciliation"
+msgstr ""
+
+#. module: account
+#: selection:account.account.balance.report,checktype,state:0
+#: selection:account.general.ledger.report,checktype,state:0
+#: selection:account.partner.balance.report,init,state:0
+#: selection:account.third_party_ledger.report,init,state:0
+msgid "By Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree4
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree4
+msgid "Supplier Refunds"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,date:0
+msgid "The date of the generated entries"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.invoice.refund,init,modify_invoice:0
+msgid "Modify Invoice"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Supplier Accounting Properties"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic Account Statistics"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid ""
+"This will automatically configure your chart of accounts, bank accounts, "
+"taxes and journals according to the selected template"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,statement_id:0
+#: field:account.move.line,statement_id:0
+msgid "Statement"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_move_line_form_encode_by_move
+#: model:ir.ui.menu,name:account.menu_encode_entries_by_move
+msgid "Entries Encoding by Move"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.analytic.account.chart,init:0
+msgid "Analytic Account Charts"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.aged.trial.balance,init,result_selection:0
+msgid "Filter on Partners"
+msgstr ""
+
+#. module: account
+#: field:account.tax,price_include:0
+msgid "Tax Included in Price"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree2
+#: model:ir.ui.menu,name:account.account_analytic_journal_entries
+msgid "Analytic Entries by Journal"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliervalidentries0
+#: model:process.transition,note:account.process_transition_validentries0
+msgid "Valid entries from invoice"
+msgstr ""
+
+#. module: account
+#: field:account.account,company_id:0
+#: wizard_field:account.account.balance.report,checktype,company_id:0
+#: wizard_field:account.aged.trial.balance,init,company_id:0
+#: field:account.analytic.account,company_id:0
+#: field:account.fiscal.position,company_id:0
+#: field:account.fiscalyear,company_id:0
+#: wizard_field:account.general.ledger.report,checktype,company_id:0
+#: field:account.invoice,company_id:0
+#: field:account.journal,company_id:0
+#: wizard_field:account.partner.balance.report,init,company_id:0
+#: field:account.tax,company_id:0
+#: field:account.tax.code,company_id:0
+#: wizard_field:account.third_party_ledger.report,init,company_id:0
+#: wizard_field:account.vat.declaration,init,company_id:0
+#: field:wizard.company.setup,company_id:0
+#: field:wizard.multi.charts.accounts,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account
+#: rml:account.general.ledger:0
+msgid "Crebit"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,state:0
+msgid "Running"
+msgstr ""
+
+#. module: account
+#: help:account.tax,include_base_amount:0
+msgid ""
+"Indicate if the amount of tax must be included in the base amount for the "
+"computation of the next taxes"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_draftstatement0
+msgid "Draft statement"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,name:0
+msgid "Journal name"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_invoiceimport0
+msgid "Import invoice from statement"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,init,power:0
+msgid "4"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
+#: view:ir.sequence:0
+#: model:ir.ui.menu,name:account.menu_action_account_fiscalyear_form
+msgid "Fiscal Years"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_importinvoice0
+msgid "Import from invoices or payments"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_reconcile_select
+#: model:ir.ui.menu,name:account.menu_reconcile_select
+msgid "Reconcile entries"
+msgstr ""
+
+#. module: account
+#: xsl:account.transfer:0
+msgid "Change"
+msgstr ""
+
+#. module: account
+#: field:account.journal.period,icon:0
+msgid "Icon"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_period
+msgid "Journal - Period"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.move.line.reconcile,init_full,credit:0
+#: wizard_field:account.move.line.reconcile,init_partial,credit:0
+msgid "Credit amount"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create Monthly Periods"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.aged.trial.balance,init,print:0
+msgid "Print Aged Trial Balance"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,ref:0
+#: field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0
+#: field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+msgid "Ref."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,address_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.analytic.check:0
+msgid "General Credit"
+msgstr ""
+
+#. module: account
+#: help:account.journal,centralisation:0
+msgid ""
+"Check this box to determine that each entry of this journal won't create a "
+"new counterpart but will share the same counterpart. This is used in fiscal "
+"year closing."
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_draft_tree
+msgid "Draft statements"
+msgstr ""
+
+#. module: account
+#: wizard_field:populate_statement_from_inv,init,date:0
+msgid "Date payment"
+msgstr ""
+
+#. module: account
+#: rml:account.journal.period.print:0
+msgid "A/c No."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree_month
+#: model:ir.ui.menu,name:account.report_account_analytic_journal_print_month
+msgid "Account cost and revenue by journal (This Month)"
+msgstr ""
+
+#. module: account
+#: selection:account.partner.balance.report,init,result_selection:0
+#: selection:account.third_party_ledger.report,init,result_selection:0
+msgid "Receivable Accounts"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.move.line.unreconcile.select,init,open:0
+msgid "Open for unreconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.reconcile,statement_line:0
+#: model:ir.model,name:account.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.automatic.reconcile,reconcile,end:0
+msgid "OK"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_supplierinvoiceinvoice0
+msgid "Control Invoice"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.aged.trial.balance,init,result_selection:0
+msgid "Receivable"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+#: model:ir.actions.wizard,name:account.wizard_balance_report
+#: model:ir.ui.menu,name:account.menu_account_balance_report
+msgid "Account Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_analytic_account_analytic_check
+#: model:ir.actions.wizard,name:account.account_analytic_account_analytic_check_report
+msgid "Analytic Check"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.cost_ledger:0
+#: rml:account.analytic.account.quantity_cost_ledger:0
+#: rml:account.central.journal:0
+#: rml:account.general.journal:0
+#: rml:account.invoice:0
+msgid "Total:"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_journal
+msgid "account.analytic.journal"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,account_ids:0
+#: field:account.fiscal.position.template,account_ids:0
+msgid "Account Mapping"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+msgid "Sale Taxes"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_reconcile
+msgid "Account Reconciliation"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+msgid "Confirm"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.account.balance.report,account_selection:0
+msgid "Select parent account"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,parent_id:0
+msgid "Parent Account Template"
+msgstr ""
+
+#. module: account
+#: help:account.tax,domain:0
+#: help:account.tax.template,domain:0
+msgid ""
+"This field is only used if you develop your own module allowing developers "
+"to create specific taxes in a custom domain."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.reconcile,total_amount:0
+#: field:account.bank.statement.reconcile,total_second_amount:0
+msgid "Payment amount"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+#: selection:account.invoice,type:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,state:0
+msgid "Valid"
+msgstr ""
+
+#. module: account
+#: field:account.account,debit:0
+#: rml:account.account.balance:0
+#: field:account.analytic.account,debit:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.analytic.account.cost_ledger:0
+#: rml:account.analytic.account.inverted.balance:0
+#: rml:account.central.journal:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: field:account.model.line,debit:0
+#: field:account.move.line,debit:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+#: rml:account.vat.declaration:0
+#: field:report.hr.timesheet.invoice.journal,revenue:0
+msgid "Debit"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.next_id_42
+msgid "All Months"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.invoice.refund,init,date:0
+msgid "Operation date"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,invoice_line:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: account
+#: field:account.period,date_start:0
+msgid "Start of Period"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.fiscalyear.close,init,report_name:0
+msgid "Name of new entries"
+msgstr ""
+
+#. module: account
+#: wizard_button:account_use_models,init_form,create:0
+msgid "Create Entries"
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_tax_code_id:0
+#: field:account.tax.template,ref_tax_code_id:0
+msgid "Refund Tax Code"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,name:0
+msgid "Tax Description"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,move_id:0
+msgid "Link to the automatically generated account moves."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.automatic.reconcile,reconcile,reconciled:0
+msgid "Reconciled transactions"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reporting
+msgid "Reporting"
+msgstr ""
+
+#. module: account
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+msgid "/"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_invoiceinvoice0
+#: model:process.node,note:account.process_node_supplierinvoiceinvoice0
+msgid "Have a number and entries are generated"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.analytic.check:0
+msgid "Analytic Check -"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance:0
+msgid "Account Balance -"
+msgstr ""
+
+#. module: account
+#: field:account.journal,group_invoice_lines:0
+msgid "Group invoice lines"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: view:account.invoice:0
+msgid "Total amount"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Account Journal"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.line:0
+msgid "Subscription lines"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income:0
+msgid "Income Account on Product Template"
+msgstr ""
+
+#. module: account
+#: help:account.account,currency_id:0
+#: help:account.account.template,currency_id:0
+msgid "Force all moves for this account to have this secondary currency."
+msgstr ""
+
+#. module: account
+#: wizard_button:populate_statement_from_inv,go,end:0
+#: wizard_button:populate_statement_from_inv,init,end:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.general.ledger.report,checktype:0
+#: wizard_view:account.partner.balance.report,init:0
+#: wizard_view:account.third_party_ledger.report,init:0
+msgid "Select Date-Period"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.inverted.balance:0
+msgid "Inverted Analytic Balance -"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_paidinvoice0
+#: model:process.node,name:account.process_node_supplierpaidinvoice0
+msgid "Paid invoice"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Tax Definition"
+msgstr ""
+
+#. module: account
+#: field:account.tax,tax_group:0
+#: field:account.tax.template,tax_group:0
+msgid "Tax Group"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree3_new
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree3_new
+msgid "New Customer Refund"
+msgstr ""
+
+#. module: account
+#: help:wizard.multi.charts.accounts,seq_journal:0
+msgid ""
+"Check this box if you want to use a different sequence for each created "
+"journal. Otherwise, all will use the same sequence."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_populate_statement_from_inv
+msgid "Import invoices"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.move.line.unreconcile,init:0
+#: wizard_view:account.move.line.unreconcile.select,init:0
+#: wizard_view:account.reconcile.unreconcile,init:0
+msgid "Unreconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_fiscalyear_seq
+msgid "Maintains Invoice sequences with Fiscal Year"
+msgstr ""
+
+#. module: account
+#: selection:account.account.balance.report,checktype,display_account:0
+#: selection:account.general.ledger.report,checktype,display_account:0
+msgid "With movements"
+msgstr ""
+
+#. module: account
+#: field:account.tax,domain:0
+#: field:account.tax.template,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Account Data"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code.template:0
+msgid "Account Tax Code Template"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Subscription Periods"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_manually0
+msgid "Manually"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.tax:0
+#: view:account.tax.template:0
+#: selection:account.vat.declaration,init,based_on:0
+#: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
+#: model:ir.actions.act_window,name:account.action_invoice_tree
+#: model:ir.actions.report.xml,name:account.account_invoices
+#: model:ir.ui.menu,name:account.menu_finance_invoice
+#: wizard_field:populate_statement_from_inv,go,lines:0
+msgid "Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.partner.balance.report,init,result_selection:0
+#: selection:account.third_party_ledger.report,init,result_selection:0
+msgid "Payable Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.line:0
+#: field:account.invoice.tax,invoice_id:0
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.invoice.pay,addendum,writeoff_journal_id:0
+msgid "Write-Off journal"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.invoice.pay,init,writeoff_check:0
+msgid "Full Payment"
+msgstr ""
+
+#. module: account
+#: selection:account.move,type:0
+msgid "Journal Purchase"
+msgstr ""
+
+#. module: account
+#: selection:account.move,type:0
+msgid "Cash Receipt"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.tax,tax_dest_id:0
+#: field:account.fiscal.position.tax.template,tax_dest_id:0
+msgid "Replacement Tax"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_invoicemanually0
+msgid "Encode manually statement comes into the draft statement"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.next_id_43
+msgid "This Month"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,sign:0
+msgid "Sign on Reports"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,currency_id:0
+msgid "The optional other currency if it is a multi-currency entry."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,payment_ids:0
+#: selection:account.vat.declaration,init,based_on:0
+msgid "Payments"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingstatemententries0
+msgid "Accounting entries at statement's confirmation"
+msgstr ""
+
+#. module: account
+#: wizard_view:account_use_models,create:0
+msgid "Use Model"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.wizard_paid_open,init,end:0
+msgid "No"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move
+msgid "All account entries"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,tax_code_id:0
+msgid "The tax basis of the tax declaration."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.account.balance.report,checktype:0
+#: wizard_view:account.general.ledger.report,checktype:0
+#: wizard_view:account.partner.balance.report,init:0
+#: wizard_view:account.third_party_ledger.report,init:0
+msgid "Date Filter"
+msgstr ""
+
+#. module: account
+#: wizard_view:populate_statement_from_inv,init:0
+msgid "Choose Journal and Payment Date"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.account,state:0
+#: selection:account.bank.statement,state:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.move,state:0
+#: selection:account.move.line,state:0
+#: selection:account.period,state:0
+#: selection:account.subscription,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Paid"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree11
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree11
+msgid "Unpaid Customer Refunds"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,residual:0
+msgid "Remaining amount due."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.period.close,init:0
+msgid "Are you sure ?"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+#: view:account.invoice:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: account
+#: field:account.move.reconcile,line_partial_ids:0
+msgid "Partial Entry lines"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,statement_id:0
+msgid "The bank statement used for bank reconciliation"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Fiscalyear"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.analytic.line,init,open:0
+msgid "Open Entries"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.account,type:0
+#: selection:account.move.line,centralisation:0
+msgid "Normal"
+msgstr ""
+
+#. module: account
+#: model:process.process,name:account.process_process_supplierinvoiceprocess0
+msgid "Supplier Invoice Process"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+#: rml:account.vat.declaration:0
+msgid "Page"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Optional Information"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_payment_term_form
+#: model:ir.ui.menu,name:account.menu_action_payment_term_form
+msgid "Payment Terms"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,init,result_selection:0
+msgid "Receivable and Payable"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance:0
+#: rml:account.general.journal:0
+msgid ":"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,reconcile_amount:0
+msgid "Amount reconciled"
+msgstr ""
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "At Date"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,tax_amount:0
+msgid ""
+"If the Tax account is tax code account, this field will contain the taxed "
+"amount.If the tax account is base tax code,                    this field "
+"will contain the basic amount(without tax)."
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.bank.statement.reconcile:0
+#: view:account.subscription:0
+msgid "Compute"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.line,account_id:0
+msgid "The income or expense account related to the selected product."
+msgstr ""
+
+#. module: account
+#: field:account.tax,type_tax_use:0
+msgid "Tax Application"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form
+#: model:ir.ui.menu,name:account.menu_action_subscription_form
+msgid "Subscription Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree6
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree6
+msgid "PRO-FORMA Customer Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.subscription,period_total:0
+msgid "Number of Periods"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
+#: wizard_field:account.analytic.account.balance.report,init,date2:0
+#: wizard_field:account.analytic.account.cost_ledger.report,init,date2:0
+#: wizard_field:account.analytic.account.inverted.balance.report,init,date2:0
+#: wizard_field:account.analytic.account.journal.report,init,date2:0
+#: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date2:0
+#: wizard_field:account.automatic.reconcile,init,date2:0
+msgid "End of period"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: model:ir.model,name:account.model_account_move
+msgid "Account Entry"
+msgstr ""
+
+#. module: account
+#: rml:account.general.journal:0
+#: model:ir.actions.report.xml,name:account.account_general_journal
+msgid "General Journal"
+msgstr ""
+
+#. module: account
+#: field:account.account,balance:0
+#: rml:account.account.balance:0
+#: selection:account.account.type,close_method:0
+#: field:account.analytic.account,balance:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.analytic.account.cost_ledger:0
+#: rml:account.analytic.account.inverted.balance:0
+#: field:account.bank.statement,balance_end:0
+#: field:account.bank.statement.reconcile,total_balance:0
+#: rml:account.general.ledger:0
+#: field:account.move.line,balance:0
+#: rml:account.partner.balance:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+msgid "Balance"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Refund"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_tax
+msgid "Invoice Tax"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
+#: model:ir.ui.menu,name:account.account_def_analytic_journal
+msgid "Analytic Journal Definition"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "account.tax.template"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,bank_accounts_id:0
+msgid "Bank Accounts"
+msgstr ""
+
+#. module: account
+#: constraint:account.period:0
+msgid ""
+"Invalid period ! Some periods overlap or the date period is not in the scope "
+"of the fiscal year. "
+msgstr ""
+
+#. module: account
+#: help:account.journal,invoice_sequence_id:0
+msgid "The sequence used for invoice numbers in this journal."
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.journal:0
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: account
+#: help:populate_statement_from_inv,init,journal_id:0
+msgid ""
+"This field allow you to choose the accounting journals you want for "
+"filtering the invoices. If you left this field empty, it will search on all "
+"sale, purchase and cash journals."
+msgstr ""
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid "Error ! The duration of the Fiscal Year is invalid. "
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.account,state:0
+msgid "Close"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,move_ids:0
+msgid "Moves"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+msgid "Pro-forma"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_form
+#: model:ir.ui.menu,name:account.menu_action_account_form
+msgid "List of Accounts"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+msgid "Sales Properties"
+msgstr ""
+
+#. module: account
+#: rml:account.general.journal:0
+msgid "Printing Date :"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
+#: model:ir.actions.wizard,name:account.account_analytic_account_quantity_cost_ledger_report
+msgid "Cost Ledger (Only quantities)"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.move.validate,init:0
+msgid "Validate Account Entries"
+msgstr ""
+
+#. module: account
+#: selection:account.print.journal.report,init,sort_selection:0
+msgid "Reference Number"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Total amount due:"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.analytic.account.chart,init,to_date:0
+#: wizard_field:account.analytic.line,init,to_date:0
+msgid "To"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
+msgid "Entries of Open Analytic Journals"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.tax:0
+msgid "Manual Invoice Taxes"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,date:0
+msgid "Current Date"
+msgstr ""
+
+#. module: account
+#: selection:account.move,type:0
+msgid "Journal Sale"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.fiscalyear.close,init,fy_id:0
+#: wizard_field:account.fiscalyear.close.state,init,fy_id:0
+msgid "Fiscal Year to close"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.aged.trial.balance,init,date1:0
+#: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
+#: wizard_field:account.analytic.account.balance.report,init,date1:0
+#: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0
+#: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0
+#: wizard_field:account.analytic.account.journal.report,init,date1:0
+#: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date1:0
+#: wizard_field:account.automatic.reconcile,init,date1:0
+msgid "Start of period"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.account_template_folder
+msgid "Templates"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.vat.declaration,init,report:0
+msgid "Print VAT Decl."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_intracom
+msgid "IntraCom"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0
+#: rml:account.invoice:0
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
+#: wizard_field:account.invoice.refund,init,description:0
+#: rml:account.overdue:0
+#: field:account.payment.term,note:0
+#: field:account.tax.code,info:0
+#: field:account.tax.code.template,info:0
+msgid "Description"
+msgstr ""
+
+#. module: account
+#: help:product.template,property_account_income:0
+msgid ""
+"This account will be used instead of the default one to value incoming stock "
+"for the current product"
+msgstr ""
+
+#. module: account
+#: field:account.tax,child_ids:0
+msgid "Child Tax Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.account_account_menu
+msgid "Financial Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr ""
+
+#. module: account
+#: view:account.config.wizard:0
+msgid "Account Configure"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_payable:0
+msgid ""
+"This account will be used instead of the default one as the payable account "
+"for the current partner"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,init,power:0
+msgid "5"
+msgstr ""
+
+#. module: account
+#: field:product.category,property_account_income_categ:0
+#: field:product.template,property_account_income:0
+msgid "Income Account"
+msgstr ""
+
+#. module: account
+#: field:account.period,special:0
+msgid "Opening/Closing Period"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.balance:0
+msgid "Analytic Balance -"
+msgstr ""
+
+#. module: account
+#: wizard_field:account_use_models,init_form,model:0
+#: model:ir.model,name:account.model_account_model
+msgid "Account Model"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: model:ir.actions.act_window,name:account.act_account_analytic_account_2_account_invoice_line
+msgid "Invoice lines"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+msgid "Customer"
+msgstr ""
+
+#. module: account
+#: field:account.subscription,period_type:0
+msgid "Period Type"
+msgstr ""
+
+#. module: account
+#: view:product.category:0
+msgid "Accounting Properties"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_sequence_fiscalyear
+msgid "account.sequence.fiscalyear"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.print.journal.report,init,sort_selection:0
+msgid "Entries Sorted By"
+msgstr ""
+
+#. module: account
+#: rml:account.journal.period.print:0
+msgid "Print Journal -"
+msgstr ""
+
+#. module: account
+#: field:account.bank.accounts.wizard,bank_account_id:0
+#: field:account.chart.template,bank_account_view_id:0
+#: field:account.invoice,partner_bank:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_model_form
+#: model:ir.ui.menu,name:account.menu_action_model_form
+msgid "Models Definition"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_cash_moves
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
+msgid "Cash"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.account,account_dest_id:0
+#: field:account.fiscal.position.account.template,account_dest_id:0
+msgid "Account Destination"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Maturity"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear,name:0
+#: field:account.journal.period,fiscalyear_id:0
+#: field:account.period,fiscalyear_id:0
+#: field:account.sequence.fiscalyear,fiscalyear_id:0
+#: field:fiscalyear.seq,fiscalyear_id:0
+#: model:ir.model,name:account.model_account_fiscalyear
+msgid "Fiscal Year"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,init,direction_selection:0
+msgid "Future"
+msgstr ""
+
+#. module: account
+#: help:account.account.balance.report,checktype,fiscalyear:0
+#: help:account.chart,init,fiscalyear:0
+#: help:account.general.ledger.report,checktype,fiscalyear:0
+#: help:account.partner.balance.report,init,fiscalyear:0
+#: help:account.third_party_ledger.report,init,fiscalyear:0
+msgid "Keep empty for all open fiscal year"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+#: selection:account.invoice,type:0
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_entriesreconcile0
+#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
+msgid "Reconcile Entries."
+msgstr ""
+
+#. module: account
+#: field:account.subscription.line,move_id:0
+msgid "Entry"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_paidinvoice0
+#: model:process.node,note:account.process_node_supplierpaidinvoice0
+#: model:process.transition,note:account.process_transition_reconcilepaid0
+#: model:process.transition,note:account.process_transition_supplierreconcilepaid0
+msgid "Paid invoice when reconciled."
+msgstr ""
+
+#. module: account
+#: field:account.tax,python_compute_inv:0
+#: field:account.tax.template,python_compute_inv:0
+msgid "Python Code (reverse)"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+msgid "Accounts Mapping"
+msgstr ""
+
+#. module: account
+#: help:product.category,property_account_expense_categ:0
+msgid ""
+"This account will be used to value outgoing stock for the current product "
+"category"
+msgstr ""
+
+#. module: account
+#: help:account.tax,base_sign:0
+#: help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0
+#: help:account.tax,tax_sign:0
+#: help:account.tax.template,base_sign:0
+#: help:account.tax.template,ref_base_sign:0
+#: help:account.tax.template,ref_tax_sign:0
+#: help:account.tax.template,tax_sign:0
+msgid "Usually 1 or -1."
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense:0
+msgid "Expense Account on Product Template"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.analytic.check:0
+msgid "General Debit"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr ""
+
+#. module: account
+#: help:account.config.wizard,name:0
+msgid "Name of the fiscal year as displayed on screens."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,payment_term:0
+#: view:account.payment.term:0
+#: field:account.payment.term,name:0
+#: view:account.payment.term.line:0
+#: field:account.payment.term.line,payment_id:0
+#: model:ir.model,name:account.model_account_payment_term
+#: field:res.partner,property_payment_term:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
+#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
+msgid "Fiscal Positions"
+msgstr ""
+
+#. module: account
+#: model:process.process,name:account.process_process_statementprocess0
+msgid "Statement Process"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_statement_reconcile
+msgid "Statement reconcile"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.fiscalyear.close,init,sure:0
+#: wizard_field:account.fiscalyear.close.state,init,sure:0
+#: wizard_field:account.period.close,init,sure:0
+msgid "Check this box"
+msgstr ""
+
+#. module: account
+#: help:account.tax,price_include:0
+msgid ""
+"Check this if the price you use on the product and invoices includes this "
+"tax."
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.account.balance.report,checktype:0
+#: wizard_view:account.general.ledger.report,checktype:0
+#: wizard_view:account.partner.balance.report,init:0
+#: wizard_view:account.third_party_ledger.report,init:0
+msgid "Filters"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.wizard_paid_open,init,yes:0
+msgid "Yes"
+msgstr ""
+
+#. module: account
+#: help:account.account,reconcile:0
+msgid ""
+"Check this if the user is allowed to reconcile entries in this account."
+msgstr ""
+
+#. module: account
+#: wizard_button:account.subscription.generate,init,generate:0
+msgid "Compute Entry Dates"
+msgstr ""
diff --git a/addons/account_payment/i18n/sl.po b/addons/account_payment/i18n/sl.po
index 3f634880e39..4638727dec2 100644
--- a/addons/account_payment/i18n/sl.po
+++ b/addons/account_payment/i18n/sl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 09:28+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-11 10:20+0000\n"
+"Last-Translator: Simon Vidmar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-05-12 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
@@ -46,7 +46,7 @@ msgstr "Napačno ime modela v definiciji dejanja."
 #: field:payment.line,info_owner:0
 #: view:payment.order:0
 msgid "Owner Account"
-msgstr ""
+msgstr "Konto lastnika"
 
 #. module: account_payment
 #: help:account.invoice,amount_to_pay:0
@@ -54,6 +54,8 @@ msgid ""
 "The amount which should be paid at the current date\n"
 "minus the amount which is already in payment order"
 msgstr ""
+"Znesek, ki ga je potrebno plačati na trenutni datum\n"
+"zmanjšan za znesek že posredovanih plačilnih nalogov."
 
 #. module: account_payment
 #: help:payment.line,date:0
@@ -61,6 +63,8 @@ msgid ""
 "If no payment date is specified, the bank will treat this payment line "
 "directly"
 msgstr ""
+"Če datum plačilnega naloga ni podan, ga bo banka takoj posredovala v "
+"plačilni sistem"
 
 #. module: account_payment
 #: field:payment.order,date_prefered:0
@@ -147,7 +151,7 @@ msgstr "Vrstica plačila"
 #. module: account_payment
 #: field:payment.type,suitable_bank_types:0
 msgid "Suitable bank types"
-msgstr ""
+msgstr "Primerne vrste bank"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -182,7 +186,7 @@ msgstr ""
 #. module: account_payment
 #: field:payment.order,state:0
 msgid "State"
-msgstr ""
+msgstr "Država"
 
 #. module: account_payment
 #: view:payment.line:0
diff --git a/addons/smtpclient/i18n/de.po b/addons/smtpclient/i18n/de.po
new file mode 100644
index 00000000000..4c97548e515
--- /dev/null
+++ b/addons/smtpclient/i18n/de.po
@@ -0,0 +1,840 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 06:00+0000\n"
+"PO-Revision-Date: 2010-05-11 11:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-12 04:20+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,bcc:0
+msgid "BCC to"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__number__ for Invoice / Sales Number"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,ssl:0
+msgid "Use SSL?"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Start Server"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_verifycode
+msgid "Verify Server"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,priority:0
+msgid "Server Priority"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.sendcode,init,emailto:0
+msgid "Enter the address Email where you want to get the Verification Code"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,auth_type:0
+msgid "Other Mail Servers"
+msgstr ""
+
+#. module: smtpclient
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,to:0
+msgid "Mail to"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Message Error!"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,name:0
+msgid "Server Name"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,header_ids:0
+msgid "Default Headers"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_button:email.testemail,init,send:0
+msgid "Send Email"
+msgstr ""
+
+#. module: smtpclient
+#: field:res.company.address,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#, python-format
+msgid "Server already verified!"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#: code:addons/smtpclient/wizard/testemail.py:0
+#, python-format
+msgid "Verification Failed. Please check the Server Configuration!"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "SMTP Server Error!"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,auth_type:0
+#: field:email.smtpclient,type:0
+msgid "Server Type"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,from_email:0
+msgid "Email From"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "User Information"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "OpenERP SMTP server Email Registration Code!"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_report_smtp_server
+#: view:report.smtp.server:0
+msgid "Server Statistics"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Messages"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+#: selection:res.company.address,name:0
+msgid "Sale"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.headers,value:0
+msgid "Value"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Access Permission"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_headers
+msgid "Email Headers"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,delete_queue:0
+msgid "Queue Option"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Please configure Email Server Messages [Verification / Test]"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#, python-format
+msgid "Verification failed. Invalid Verification Code!"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.act_mail_server_2_mail_history
+msgid "Email History"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.history:0
+msgid "Server History"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,auth_type:0
+msgid "Yahoo!!! Server"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+#: field:email.smtpclient,test_email:0
+msgid "Test Message"
+msgstr ""
+
+#. module: smtpclient
+#: field:report.smtp.server,server_id:0
+msgid "Server ID"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.smtpclient,delete_queue_period:0
+msgid "delete emails/contents from email queue after specified no of days"
+msgstr ""
+
+#. module: smtpclient
+#: field:report.smtp.server,no:0
+msgid "Total No."
+msgstr ""
+
+#. module: smtpclient
+#: help:email.smtpclient,process_id:0
+msgid "Mail Transport Agent Process"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__user__ for User Name"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,date_create:0
+msgid "Date Create"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,state:0
+msgid "Server Status"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,error:0
+msgid "Last Error"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_view:email.sendcode,init:0
+#: wizard_button:email.sendcode,init,send:0
+msgid "Send Code"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,name:0
+msgid "Subject"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Read Error!"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Unable to read Server Settings"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,server_statistics:0
+msgid "Statistics"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_view:email.testemail,init:0
+msgid "Test Email"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,server_id:0
+msgid "Smtp Server"
+msgstr ""
+
+#. module: smtpclient
+#: field:res.company,addresses:0
+msgid "Email Addresses"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_history_tree
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_server_history
+msgid "Email Server History"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient.queue,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.testemail,init,emailto:0
+msgid "Enter the address Email where you want to get the Test Email"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Not Verified"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,email:0
+msgid "Email"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient.queue,state:0
+msgid "Sent"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,user_id:0
+msgid "Username"
+msgstr ""
+
+#. module: smtpclient
+#: field:res.company.address,name:0
+msgid "Address Type"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Permission"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+msgid "Message with All Headers"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Message Headers"
+msgstr ""
+
+#. module: smtpclient
+#: field:ir.actions.server,report_id:0
+msgid "Report"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Other Information"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Configuration"
+msgstr ""
+
+#. module: smtpclient
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: smtpclient
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+#: field:email.smtpclient,disclaimers:0
+msgid "Disclaimers"
+msgstr ""
+
+#. module: smtpclient
+#: field:report.smtp.server,name:0
+msgid "Server"
+msgstr ""
+
+#. module: smtpclient
+#: view:res.company:0
+msgid "SMTP Settings"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.smtpclient,body:0
+msgid ""
+"The message text that will be send along with the email which is send "
+"through this server"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_testemail
+msgid "Send Test Email"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient_queue
+msgid "Email Queue"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Server Information"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.verifycode,init,code:0
+msgid "Enter the verification code thay you get in your verification Email"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient_history
+msgid "Email Client History"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Never Delete Message"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "OpenERP Test Email!"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+#: field:email.smtpclient,body:0
+#: view:email.smtpclient.queue:0
+#: field:email.smtpclient.queue,serialized_message:0
+msgid "Message"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,process_id:0
+msgid "MTA Process"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.headers,server_id:0
+#: view:email.smtpclient:0
+#: field:email.smtpclient,server:0
+#: field:email.smtpclient.queue,server_id:0
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_smtp_server
+msgid "SMTP Server"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,auth_type:0
+msgid "Google Server"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Verified"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.smtpclient,priority:0
+msgid ""
+"Priority between 0 to 10, will be used to define the MTA process priotiry"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,port:0
+msgid "SMTP Port"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Email TO Address not Defined !"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "SMTP Server Error !"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,auth:0
+msgid "Use Auth"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,pstate:0
+msgid "Server Statue"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,user:0
+msgid "User Name"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,verify_email:0
+msgid "Verify Message"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient
+#: model:ir.module.module,shortdesc:smtpclient.module_meta_information
+msgid "Email Client"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Disclaimers Message"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__code__ for Verification Code"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient.queue,state:0
+msgid "Queued"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,date_create:0
+#: field:email.smtpclient.queue,date_create:0
+msgid "Date"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,cc:0
+msgid "CC to"
+msgstr ""
+
+#. module: smtpclient
+#: model:email.smtpclient,verify_email:smtpclient.email_smtpclient_sendmailserver0
+msgid ""
+"Verification Message. This is the code\n"
+"__code__ \n"
+"you must copy in the OpenERP Email Server (Verify Server wizard).\n"
+"Created by user __user__"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_queue_tree
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_smtp_server_queue
+msgid "Message Queue"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+#: selection:res.company.address,name:0
+msgid "Default"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Delete Content After"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "You have no permission to access SMTP Server : %s "
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,active:0
+msgid "Active"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.act_mail_server_2_mail_queue
+msgid "Message Queus"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#: code:addons/smtpclient/wizard/testemail.py:0
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#: view:email.smtpclient.queue:0
+#: selection:email.smtpclient.queue,state:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Server Error!"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Clear All After"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid ""
+"Please verify Email Server, without verification you can not send Email(s)."
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,history_line:0
+#: field:report.smtp.server,history:0
+msgid "History"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,priority:0
+msgid "Message Priority"
+msgstr ""
+
+#. module: smtpclient
+#: field:ir.actions.server,file_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__name__ for Customer Name"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+msgid "General"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.headers,key:0
+msgid "Header"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid ""
+"Verification Message. This is the code\n"
+"\n"
+"__code__\n"
+"\n"
+"you must copy in the OpenERP Email Server (Verify Server wizard).\n"
+"\n"
+"Created by user __user__"
+msgstr ""
+
+#. module: smtpclient
+#: selection:res.company.address,name:0
+msgid "Invoice"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_view:email.verifycode,init:0
+#: wizard_button:email.verifycode,init,check:0
+msgid "Verify Code"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_button:email.sendcode,init,end:0
+#: wizard_button:email.testemail,init,end:0
+#: wizard_button:email.verifycode,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,delete_queue_period:0
+msgid "Delete after"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Server is not Verified, Please Verify the Server !"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,resource_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "SMTP Data Error !"
+msgstr ""
+
+#. module: smtpclient
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Delete when Email Sent"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+msgid "Account"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.module.module,description:smtpclient.module_meta_information
+msgid ""
+"Email Client module that provides:\n"
+"    Sending Email\n"
+"    Use Multiple Server\n"
+"    Multi Threading\n"
+"    Multi Attachment\n"
+"    "
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+msgid "Stock"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,name:0
+msgid "Description"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,code:0
+#: wizard_field:email.verifycode,init,code:0
+msgid "Verification Code"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,pstate:0
+msgid "Stop"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,body:0
+msgid "Email Text"
+msgstr ""
+
+#. module: smtpclient
+#: selection:res.company.address,name:0
+msgid "Delivery"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,pstate:0
+msgid "Running"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+msgid "Last Error occured"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Waiting for Verification"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,password:0
+msgid "Password"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,users_id:0
+msgid "Users Allowed"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#, python-format
+msgid "Verification Code Already Generated !"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_field:email.sendcode,init,emailto:0
+#: field:email.smtpclient,email:0
+#: wizard_field:email.testemail,init,emailto:0
+#: view:res.company:0
+#: field:res.company.address,email:0
+msgid "Email Address"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Verification Message"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Stop Server"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_server
+msgid "Email Servers"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_sendcode
+msgid "Send Verification Code"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,model:0
+msgid "Model"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_tree
+#: field:ir.actions.server,email_server:0
+msgid "Email Server"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Permission Error!"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_res_company_address
+msgid "res.company.address"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,state:0
+msgid "Message Status"
+msgstr ""

From ce10539ffb5bd18fa2578689f152c88be6966d89 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 12 May 2010 11:04:06 +0530
Subject: [PATCH 81/84] [IMP]:document_ftp config

bzr revid: nch@tinyerp.com-20100512053406-nofnqd2j9lgfzsva
---
 addons/document_ftp/document_ftp_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/document_ftp/document_ftp_view.xml b/addons/document_ftp/document_ftp_view.xml
index 1ea96bab73a..d3f4c09498c 100644
--- a/addons/document_ftp/document_ftp_view.xml
+++ b/addons/document_ftp/document_ftp_view.xml
@@ -31,7 +31,7 @@
             <attribute name="string">Choose the address for the Document Management System's FTP server.</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
-  				<attribute name='rowspan'>6</attribute>
+  				<attribute name='rowspan'>12</attribute>
       			<attribute name='string'></attribute>
 	      	</xpath>
             <group string="res_config_contents" position="replace">

From f9df01d08ac6187dc3fac0d2758a7f75b0049904 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 12 May 2010 11:25:21 +0530
Subject: [PATCH 82/84] [IMP]:improve height for group

bzr revid: nch@tinyerp.com-20100512055521-0r37d5n531tee8uk
---
 bin/addons/base/res/res_config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index e8d4d1df167..d084a9ac6fc 100644
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -61,7 +61,7 @@
       <field name="arch" type="xml">
         <form>
         	<group colspan="4" col="8">
-              	<group colspan="3" width="200" height="300">
+              	<group colspan="3" width="200" height="250">
                 	<field name="config_logo" widget="image" width="150" height="100" nolabel="1" colspan="1"/>
                 	<newline/>
                 	<label align="0.0" string="description" width="200" colspan="2"/>

From eebfdc9e077788b58c811718a4d796be5f68b65e Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 12 May 2010 12:37:15 +0530
Subject: [PATCH 83/84] [IMP]:account,sale config

bzr revid: nch@tinyerp.com-20100512070715-fxefialx7sddrpcx
---
 addons/account/account_installer.xml | 1 -
 addons/sale/sale_view.xml            | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index f67946ff7a2..d3a6ce979a6 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -18,7 +18,6 @@
           <xpath expr="//label[@string='description']"
                  position="attributes">
             <attribute name="string">You can enhance OpenERP's basic accounting support with a few additional OpenERP applications.</attribute>
-            <attribute name="width">150</attribute>
           </xpath>
 		  <xpath expr="//button[@string='Install Modules']" position="attributes">
                 <attribute name="string">Configure</attribute>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index d9edb989b1f..894ff6b2e6c 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -510,7 +510,7 @@
             		<attribute name="string">Setup your sales workflow and default values.</attribute>
           		</xpath>
                 <xpath expr='//separator[@string="vsep"]' position='attributes'>
-          			<attribute name='rowspan'>6</attribute>
+          			<attribute name='rowspan'>15</attribute>
           			<attribute name='string'></attribute>
 	      		</xpath>
                 <group string="res_config_contents" position="replace">

From e9befe88c7cc212b65a86e8ca83da779b4210974 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 12 May 2010 13:57:25 +0530
Subject: [PATCH 84/84] [IMP]:change skip button icon

bzr revid: nch@tinyerp.com-20100512082725-nypz6gzl5kvtnafz
---
 bin/addons/base/res/res_config.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index d084a9ac6fc..6d22a0a6a8b 100644
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -23,7 +23,7 @@
             		<group colspan="4" width="220">
             			<field name="progress" widget="progressbar" nolabel="1" colspan="2"/>
             		</group>
-		 	 		<button name="action_skip" icon="gtk-goto-last" special="cancel"
+		 	 		<button name="action_skip" icon="gtk-jump-to" special="cancel"
 	                    	type="object" string="Skip" colspan="1"/>
 	                <button name="action_next" icon="gtk-go-forward"
 	                	 type="object" string="Next" colspan="1"/>
@@ -77,7 +77,7 @@
             		<group colspan="4" width="220">
             			<field name="progress" widget="progressbar" nolabel="1" colspan="2"/>
             		</group>
-		 	 		<button name="action_skip" icon="gtk-goto-last" special="cancel"
+		 	 		<button name="action_skip" icon="gtk-jump-to" special="cancel"
 	                    	type="object" string="Skip" colspan="1"/>
 	                <button name="action_next" icon="gtk-go-forward"
 	                	 type="object" string="Install Modules" colspan="1"/>