From 6f28fde4ae74f368b9017b41d49c89f309a63021 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 21 Aug 2012 12:07:18 +0530
Subject: [PATCH 01/12] [IMP]Renamed EAN13,supply method visible only when mrp
 is installed and suppliers tab comes when purchase is installed

bzr revid: dhr@tinyerp.com-20120821063718-uobafa8ij65an5b0
---
 addons/mrp/mrp_view.xml           |  3 +++
 addons/product/product.py         |  2 +-
 addons/product/product_view.xml   |  4 ----
 addons/purchase/purchase_view.xml | 15 +++++++++++++++
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index c394544574d..30480901b29 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -987,6 +987,9 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
+            	<xpath expr="//field[@name='procure_method']" position="after">
+            		<field name="supply_method" groups="base.group_user"/>
+            	</xpath>
                 <page string="Procurement &amp; Locations" position="inside">
                     <separator string="Bill of Materials"/>
                     <field name="bom_ids" widget="one2many_list" mode="tree" context="{'default_product_id': active_id}">
diff --git a/addons/product/product.py b/addons/product/product.py
index ae99711a5ec..586d241d998 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -526,7 +526,7 @@ class product_product(osv.osv):
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the product without removing it."),
         'variants': fields.char('Variants', size=64),
         'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade"),
-        'ean13': fields.char('EAN13', size=13, help="The numbers encoded in EAN-13 bar codes are product identification numbers."),
+        'ean13': fields.char('EAN13/Code', size=13, help="The numbers encoded in EAN-13 bar codes are product identification numbers."),
         'packaging' : fields.one2many('product.packaging', 'product_id', 'Logistical Units', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
         'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Product Price')),
         'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Product Price')),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 70651a0a795..871283791ef 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -87,7 +87,6 @@
                                     <group string="Procurement">
                                         <field name="type"/>
                                         <field name="procure_method" groups="base.group_user"/>
-                                        <field name="supply_method" groups="base.group_user"/>
                                     </group>
                                     <group string="Prices">
                                         <field name="list_price"/>
@@ -137,9 +136,6 @@
                                 </group>
 
                             </page>
-                            <page string="Suppliers" groups="base.group_user">
-                                <field name="seller_ids" context="{'uom_id': uom_id}"/>
-                            </page>
                             <page string="Descriptions" groups="base.group_user">
                                 <separator string="Description"/>
                                 <field name="description"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index aec55bf93c2..f513e2a60e8 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -554,5 +554,20 @@
                 </xpath>
             </field>
         </record>
+        
+        <!-- Product Suppliers-->
+        
+        <record id="view_product_supplier_inherit" model="ir.ui.view">
+            <field name="name">product.normal.supplier.form.inherit</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//page[@string='Descriptions']" position="before">
+                    <page string="Suppliers" groups="base.group_user">
+                         <field name="seller_ids" context="{'uom_id': uom_id}"/>
+                    </page>
+                </xpath>
+            </field>
+        </record>
     </data>
 </openerp>

From 95517df97cddd164a80ebe3d0836a45d60a04c74 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 21 Aug 2012 14:13:50 +0530
Subject: [PATCH 02/12] [IMP]Changes in event_sale_view and
 purchase_requisition as per changes in supply_method

bzr revid: dhr@tinyerp.com-20120821084350-487odxa5rk2k9nze
---
 addons/event_sale/event_sale_view.xml                     | 2 +-
 addons/purchase_requisition/purchase_requisition_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 82c1c05b714..53e8a4cc18f 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -9,7 +9,7 @@
                 <field name="purchase_ok" position="after">
                     <field name="event_ok" on_change="onchange_event_ok(event_ok, context)"/>
                 </field>
-                <field name='supply_method' position='after'>
+                <field name='procure_method' position='before'>
                     <field name="event_type_id" attrs="{'readonly': [('event_ok', '=', False)]}"/>
                 </field>
              </field>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 188f81b6cbe..a1b270934e2 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -182,7 +182,7 @@
         <field name="model">product.product</field>
         <field name="inherit_id" ref="product.product_normal_form_view"/>
         <field name="arch" type="xml">
-            <field name="supply_method" position="after">
+            <field name="procure_method" position="before">
                 <group colspan="2" col="2" attrs="{'invisible': [('supply_method','&lt;&gt;','buy')]}">
                 <field name="purchase_requisition"/>
                 </group>

From d1ef48537c2959b115a3133b7ed09c546b1c9b85 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 21 Aug 2012 15:46:37 +0530
Subject: [PATCH 03/12] [IMP]Change made for procurement method and stock and
 expected variations section to appear only for stockable product

bzr revid: dhr@tinyerp.com-20120821101637-o83hcputt5y3d9n9
---
 addons/product/product_view.xml | 2 +-
 addons/stock/product_view.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 871283791ef..2559b127dda 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -86,7 +86,7 @@
                                     </group>
                                     <group string="Procurement">
                                         <field name="type"/>
-                                        <field name="procure_method" groups="base.group_user"/>
+                                        <field name="procure_method" groups="base.group_user" attrs="{'invisible':[('type','in', ('service', 'consu'))]}"/>
                                     </group>
                                     <group string="Prices">
                                         <field name="list_price"/>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 1efc552bfa6..abad5b9ec21 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -98,7 +98,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <group name="status" position="before" version="7.0">
-                    <group string="Stock and Expected Variations" attrs="{'invisible': [('type', '=', 'service')]}">
+                    <group string="Stock and Expected Variations" attrs="{'invisible':[('type','in', ('service', 'consu'))]}">
                         <label for="qty_available"/>
                         <div>
                             <field name="qty_available" class="oe_inline"/>

From 4655aebff83ceb76f1921c36eb920b3e4346933a Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 21 Aug 2012 17:08:14 +0530
Subject: [PATCH 04/12] [IMP]Fixed for procurement and locations tab  come from
 module stock

bzr revid: dhr@tinyerp.com-20120821113814-v2ymtmi80kukrzch
---
 addons/mrp/mrp_view.xml                 | 11 ++++-
 addons/procurement/procurement_view.xml |  2 +-
 addons/product/product_view.xml         | 19 ---------
 addons/stock/product_view.xml           | 54 +++++++++++++++++--------
 4 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 30480901b29..9cb3d8dbfa2 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -981,8 +981,7 @@
                </data>
             </field>
         </record>
-
-        <record id="product_normal_form_view" model="ir.ui.view">
+		<record id="product_normal_form_supply_view" model="ir.ui.view">
             <field name="name">product.normal.form.mrp.inherit</field>
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
@@ -990,6 +989,14 @@
             	<xpath expr="//field[@name='procure_method']" position="after">
             		<field name="supply_method" groups="base.group_user"/>
             	</xpath>
+            </field>
+        </record>
+
+        <record id="product_normal_form_view" model="ir.ui.view">
+            <field name="name">product.normal.form.mrp.inherit</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
+            <field name="arch" type="xml">
                 <page string="Procurement &amp; Locations" position="inside">
                     <separator string="Bill of Materials"/>
                     <field name="bom_ids" widget="one2many_list" mode="tree" context="{'default_product_id': active_id}">
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index dbdc65c6763..f2a8dc98cb0 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -286,7 +286,7 @@
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.orderpoint.inherit</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
             <field name="arch" type="xml">
                 <page string="Procurement &amp; Locations" position="inside">
                     <separator string="Minimum Stock Rules"/>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 2559b127dda..2998897e3ca 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -117,25 +117,6 @@
 
                                 </group>
                             </page>
-                            <page string="Procurement &amp; Locations" groups="base.group_user">
-                                <group>
-                                    <group name="delay" string="Delays">
-                                        <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                                        <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
-                                        <field name="warranty"/>
-                                    </group>
-                                    <group name="store" string="Storage Localisation">
-                                        <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}"/>
-                                        <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
-                                        <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
-                                    </group>
-                                    <group name="misc" string="Miscellaneous">
-                                        <field name="active"/>
-                                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                    </group>
-                                </group>
-
-                            </page>
                             <page string="Descriptions" groups="base.group_user">
                                 <separator string="Description"/>
                                 <field name="description"/>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index abad5b9ec21..43647ee88c4 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -2,6 +2,8 @@
 <openerp>
     <data>
 
+
+
         <record id="product_search_form_view_stock" model="ir.ui.view">
             <field name="name">product.search.stock.form</field>
             <field name="model">product.product</field>
@@ -50,6 +52,40 @@
                 </page>
             </field>
         </record>
+        
+        <record id="view_normal_procurement_locations_form" model="ir.ui.view">
+            <field name="name">product.normal.procurement.locations.inherit</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Procurement &amp; Locations" groups="base.group_user">
+                                <group>
+                                    <group name="delay" string="Delays">
+                                        <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
+                                        <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
+                                        <field name="warranty"/>
+                                    </group>
+                                    <group name="store" string="Storage Localisation">
+                                        <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}"/>
+                                        <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
+                                        <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
+                                    </group>
+                                    <group name="store" groups="stock.group_locations">
+				                        <separator string="Counter-Part Locations Properties" colspan="2"/>
+				                        <field name="property_stock_procurement" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','procurement')]"/>
+				                        <field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>
+				                        <field name="property_stock_inventory"  attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','inventory')]"/>
+				                    </group>
+                                    <group name="misc" string="Miscellaneous">
+                                        <field name="active"/>
+                                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                    </group>
+                                </group>
+                            </page>
+                </notebook>
+            </field>
+        </record>
 
         <record id="view_product_standard_price_form" model="ir.ui.view">
             <field name="name">product.product.standard.price.form.inherit</field>
@@ -91,6 +127,8 @@
                 </xpath>
             </field>
         </record>
+        
+        
 
         <record id="view_normal_stock_property_form" model="ir.ui.view">
             <field name="name">product.normal.stock.form.inherit</field>
@@ -210,21 +248,5 @@
             </field>
         </record>
 
-        <record id="view_normal_property_form" model="ir.ui.view">
-            <field name="name">product.normal.stock.property.form.inherit</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
-            <field name="arch" type="xml">
-                <group name="store" position="after">
-                    <group name="store" groups="stock.group_locations">
-                        <separator string="Counter-Part Locations Properties" colspan="2"/>
-                        <field name="property_stock_procurement" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','procurement')]"/>
-                        <field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>
-                        <field name="property_stock_inventory"  attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','inventory')]"/>
-                    </group>
-                </group>
-            </field>
-        </record>
-
     </data>
 </openerp>

From 3ecb0798a3d45461c9949657d5d292bd14e67567 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 21 Aug 2012 18:12:41 +0530
Subject: [PATCH 05/12] [IMP]Fixing inherit id issues related to procurement
 and location changes

bzr revid: dhr@tinyerp.com-20120821124241-mibvnmuxby5xuzsv
---
 addons/point_of_sale/point_of_sale_view.xml | 2 +-
 addons/project_mrp/project_mrp_view.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 47a41260378..000b68e3495 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -621,7 +621,7 @@
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.inherit</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
             <field name="arch" type="xml">
                 <group name="misc" position="after">
                     <group name="pos" colspan="2" col="2">
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index ffceb33a611..841a61e6c31 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -14,7 +14,7 @@
         <record id="view_product_task_form" model="ir.ui.view">
             <field name="name">product.form.view.inherit</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
             <field name="arch" type="xml">
                 <field name="active" position="after">
                     <field name="project_id" attrs="{'readonly':[('type','!=','service')]}" />

From abf966ceb5fc912cbba745a7b8537de344d61bb0 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Wed, 22 Aug 2012 17:45:15 +0530
Subject: [PATCH 06/12] [IMP]Adding an option in purchase wizard to hide
 costing method

bzr revid: dhr@tinyerp.com-20120822121515-1r7e8ufv6ojm5cdm
---
 addons/product/product_view.xml              | 2 +-
 addons/product/security/product_security.xml | 7 ++++++-
 addons/purchase/res_config.py                | 3 +++
 addons/purchase/res_config_view.xml          | 4 ++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 2998897e3ca..49c4d5d1083 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -90,7 +90,7 @@
                                     </group>
                                     <group string="Prices">
                                         <field name="list_price"/>
-                                        <field name="cost_method" groups="base.group_user"/>
+                                        <field name="cost_method" groups="product.group_costing_method"/>
                                         <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                                         <field name="price_margin" groups="product.group_product_variant"/>
                                         <field name="price_extra" groups="product.group_product_variant"/>
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 1d2c795083a..73ab6f8a3d5 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -23,7 +23,12 @@
         <field name="name">Purchase Pricelists</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
-
+	
+	<record id="group_costing_method" model="res.groups">
+        <field name="name">Costing Method</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+	
     <record id="group_uom" model="res.groups">
         <field name="name">Manage Multiple Units of Measure</field>
         <field name="category_id" ref="base.module_category_hidden"/>
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 6beac5a4cd0..3d9c858cec5 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -40,6 +40,9 @@ class purchase_config_settings(osv.osv_memory):
         'group_uom':fields.boolean("manage different units of measure for products",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
+        'group_costing_method':fields.boolean("compute product cost price based on average cost",
+            implied_group='product.group_costing_method',
+            help="""Allows you to compute product cost price based on average cost."""),
         'group_purchase_delivery_address': fields.boolean("allow a different address for incoming products and invoicings",
             implied_group='purchase.group_delivery_invoice_address',
             help="Allows you to specify different delivery and invoice addresses on a purchase order."),
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 23d89f1a7f1..00e0b6108e8 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -59,6 +59,10 @@
                                 <field name="group_purchase_delivery_address" class="oe_inline"/>
                                 <label for="group_purchase_delivery_address"/>
                             </div>
+                            <div>
+                                <field name="group_costing_method" class="oe_inline"/>
+                                <label for="group_costing_method"/>
+                            </div>
                             <div name="module_purchase_double_validation">
                                 <field name="module_purchase_double_validation" class="oe_inline"/>
                                 <label for="module_purchase_double_validation"/>

From b4ed7eb4eaf4d2abedb0103ec5444523c04741de Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Wed, 22 Aug 2012 18:17:10 +0530
Subject: [PATCH 07/12] [IMP]Adding taxes to product category

bzr revid: dhr@tinyerp.com-20120822124710-loo8pjj33g1dgzp5
---
 addons/account/product.py       | 6 ++++++
 addons/account/product_view.xml | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/addons/account/product.py b/addons/account/product.py
index 9be49b4c56a..365518e4c01 100644
--- a/addons/account/product.py
+++ b/addons/account/product.py
@@ -24,6 +24,12 @@ from osv import fields, osv
 class product_category(osv.osv):
     _inherit = "product.category"
     _columns = {
+        'taxes_id': fields.many2many('account.tax', 'product_taxes_categ_rel',
+            'prod_id', 'tax_id', 'Customer Taxes',
+            domain=[('parent_id','=',False),('type_tax_use','in',['sale','all'])]),
+        'supplier_taxes_id': fields.many2many('account.tax',
+            'product_supplier_taxes_categ_rel', 'prod_id', 'tax_id',
+            'Supplier Taxes', domain=[('parent_id', '=', False),('type_tax_use','in',['purchase','all'])]),
         'property_account_income_categ': fields.property(
             'account.account',
             type='many2one',
diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index 659a4f6ac36..610cfb12e4a 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -52,6 +52,8 @@
                     <xpath expr="/form/sheet//group[@name='account_property']" position="inside">
                         <field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        <field name="taxes_id" widget="many2many_tags"/>
+                        <field name="supplier_taxes_id"  widget="many2many_tags"/>
                     </xpath>
                 </data>
             </field>

From 75befda5e82a4f2f9c26549e8efd53fa7bc65371 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Wed, 22 Aug 2012 18:48:16 +0530
Subject: [PATCH 08/12] [IMP]Tax related fixes in account_invoice,delivery sale
 and stock ,purchase requistion

bzr revid: dhr@tinyerp.com-20120822131816-g4o83w2ot084wyeo
---
 addons/account/account_invoice.py                   | 10 ++++++++--
 addons/delivery/sale.py                             |  5 ++++-
 addons/delivery/stock.py                            |  5 ++++-
 addons/purchase_requisition/purchase_requisition.py |  5 ++++-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 012bde42eff..e32dda862e4 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1416,9 +1416,15 @@ class account_invoice_line(osv.osv):
             result['account_id'] = a
 
         if type in ('out_invoice', 'out_refund'):
-            taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
+             if res.taxes_id:
+                taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
+             else:
+                taxes = res.categ_id.taxes_id and res.categ_id.taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
         else:
-            taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
+             if res.supplier_taxes_id:
+                taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
+             else:
+                taxes = res.categ_id.supplier_taxes_id and res.categ_id.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
         tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
 
         if type in ('in_invoice', 'in_refund'):
diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py
index 3ed3756a733..5f56ed366ac 100644
--- a/addons/delivery/sale.py
+++ b/addons/delivery/sale.py
@@ -59,7 +59,10 @@ class sale_order(osv.osv):
 
             grid = grid_obj.browse(cr, uid, grid_id, context=context)
 
-            taxes = grid.carrier_id.product_id.taxes_id
+            if grid.carrier_id.product_id.taxes_id:
+                taxes = grid.carrier_id.product_id.taxes_id
+            else:
+                taxes = grid.carrier_id.product_id.categ_id.taxes_id
             fpos = order.fiscal_position or False
             taxes_ids = acc_fp_obj.map_tax(cr, uid, fpos, taxes)
             #create the sale order line
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index f4d133e967a..5351d59c077 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -98,7 +98,10 @@ class stock_picking(osv.osv):
             account_id = picking.carrier_id.product_id.categ_id\
                     .property_account_income_categ.id
 
-        taxes = picking.carrier_id.product_id.taxes_id
+        if picking.carrier_id.product_id.taxes_id:
+            taxes = picking.carrier_id.product_id.taxes_id
+        else:
+            taxes = picking.carrier_id.product_id.categ_id.taxes_id
         partner = picking.partner_id or False
         if partner:
             account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, partner.property_account_position, account_id)
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index cf0294730a7..7ecbca5c57c 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -167,7 +167,10 @@ class purchase_requisition(osv.osv):
             for line in requisition.line_ids:
                 product = line.product_id
                 seller_price, qty, default_uom_po_id, date_planned = self._seller_details(cr, uid, line, supplier, context=context)
-                taxes_ids = product.supplier_taxes_id
+                if product.supplier_taxes_id:
+                    taxes_ids = product.supplier_taxes_id
+                else:
+                    taxes_ids = product.categ_id.supplier_taxes_id
                 taxes = fiscal_position.map_tax(cr, uid, supplier.property_account_position, taxes_ids)
                 purchase_order_line.create(cr, uid, {
                     'order_id': purchase_id,

From 1dd5177e11ca6effd4d38fb4fb16326a33bbdbb8 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Wed, 22 Aug 2012 19:04:28 +0530
Subject: [PATCH 09/12] [IMP]

bzr revid: dhr@tinyerp.com-20120822133428-24wti3kz7lh469jh
---
 .../wizard/hr_timesheet_invoice_create.py             |  5 ++++-
 addons/point_of_sale/point_of_sale.py                 |  5 ++++-
 addons/sale/sale.py                                   |  5 ++++-
 addons/stock/stock.py                                 | 11 +++++++++--
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 76314e1986a..f8c1c3d3149 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -115,7 +115,10 @@ class account_analytic_line(osv.osv):
                 else:
                     price = 0.0
 
-                taxes = product.taxes_id
+                if product.taxes_id:
+                    taxes = product.taxes_id
+                else:
+                    taxes = product.categ_id.taxes_id
                 tax = fiscal_pos_obj.map_tax(cr, uid, account.partner_id.property_account_position, taxes)
                 account_id = product.product_tmpl_id.property_account_income.id or product.categ_id.property_account_income_categ.id
                 if not account_id:
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 690d371e9db..6871f072cfd 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -1108,7 +1108,10 @@ class pos_order_line(osv.osv):
         account_tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
         for line in self.browse(cr, uid, ids, context=context):
-            taxes = line.product_id.taxes_id
+            if line.product_id.taxes_id:
+                taxes = line.product_id.taxes_id
+            else:
+                taxes = line.product_id.categ_id.taxes_id
             price = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
             taxes = account_tax_obj.compute_all(cr, uid, line.product_id.taxes_id, price, line.qty, product=line.product_id, partner=line.order_id.partner_id or False)
 
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index c525ba04df1..ed5ac3d43f6 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1382,7 +1382,10 @@ class sale_order_line(osv.osv):
         fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position) or False
         if update_tax: #The quantity only have changed
             result['delay'] = (product_obj.sale_delay or 0.0)
-            result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, product_obj.taxes_id)
+            if product_obj.taxes_id:
+                result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, product_obj.taxes_id)
+            else:
+                result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, product_obj.categ_id.taxes_id)
             result.update({'type': product_obj.procure_method})
 
         if not flag:
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index b770712429c..7b65cc99847 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -915,9 +915,16 @@ class stock_picking(osv.osv):
         @return: Taxes Ids for the move line
         """
         if type in ('in_invoice', 'in_refund'):
-            taxes = move_line.product_id.supplier_taxes_id
+            if product_id.supplier_taxes_id:
+                taxes = move_line.product_id.supplier_taxes_id
+            else:
+                taxes = move_line.product_id.categ_id.supplier_taxes_id
         else:
-            taxes = move_line.product_id.taxes_id
+             if product_id.taxes_id:
+                taxes = move_line.product_id.taxes_id
+             else:
+                taxes = move_line.product_id.categ_id.taxes_id
+ 
 
         if move_line.picking_id and move_line.picking_id.partner_id and move_line.picking_id.partner_id.id:
             return self.pool.get('account.fiscal.position').map_tax(

From 73025425f065cb82bb171d5dd09f2569577727a0 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Thu, 23 Aug 2012 10:41:20 +0530
Subject: [PATCH 10/12] [IMP]Tax related changes in mrp and pos

bzr revid: dhr@tinyerp.com-20120823051120-en7wvauuwgop2w26
---
 addons/mrp_repair/mrp_repair.py       | 5 ++++-
 addons/point_of_sale/point_of_sale.py | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index f41abb58c08..c099679b87a 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -634,7 +634,10 @@ class ProductChangeMixin(object):
             product_obj = self.pool.get('product.product').browse(cr, uid, product)
             if partner_id:
                 partner = self.pool.get('res.partner').browse(cr, uid, partner_id)
-                result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, partner.property_account_position, product_obj.taxes_id)
+                if product_obj.taxes_id:
+                    result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, partner.property_account_position, product_obj.taxes_id)
+                else:
+                    result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, partner.property_account_position, product_obj.categ_id.taxes_id)
 
             result['name'] = product_obj.partner_ref
             result['product_uom'] = product_obj.uom_id and product_obj.uom_id.id or False
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 6871f072cfd..302c3a2cb71 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -967,7 +967,10 @@ class pos_order(osv.osv):
 
             for line in order.lines:
                 tax_amount = 0
-                taxes = [t for t in line.product_id.taxes_id]
+                if line.product_id.taxes_id:
+                    taxes = [t for t in line.product_id.taxes_id]
+                else:
+                    taxes = [t for t in line.product_id.categ_id.taxes_id]
                 computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit * (100.0-line.discount) / 100.0, line.qty)['taxes']
 
                 for tax in computed_taxes:

From 39ac8404ffa3ae437c6544247af8916e8c8d8af3 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Thu, 23 Aug 2012 12:40:44 +0530
Subject: [PATCH 11/12] [IMP]Tax fix related to stock and pos

bzr revid: dhr@tinyerp.com-20120823071044-aonyui4dq2li8xnj
---
 addons/point_of_sale/point_of_sale.py | 11 +++++------
 addons/stock/stock.py                 |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 302c3a2cb71..fd9ce12251a 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -967,10 +967,7 @@ class pos_order(osv.osv):
 
             for line in order.lines:
                 tax_amount = 0
-                if line.product_id.taxes_id:
-                    taxes = [t for t in line.product_id.taxes_id]
-                else:
-                    taxes = [t for t in line.product_id.categ_id.taxes_id]
+                taxes = [t for t in line.product_id.taxes_id]
                 computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit * (100.0-line.discount) / 100.0, line.qty)['taxes']
 
                 for tax in computed_taxes:
@@ -1147,8 +1144,10 @@ class pos_order_line(osv.osv):
         cur_obj = self.pool.get('res.currency')
 
         prod = self.pool.get('product.product').browse(cr, uid, product, context=context)
-
-        taxes = prod.taxes_id
+        if prod.taxes_id:
+            taxes = prod.taxes_id
+        else:
+            taxes = prod.categ_id.taxes_id
         price = price_unit * (1 - (discount or 0.0) / 100.0)
         taxes = account_tax_obj.compute_all(cr, uid, prod.taxes_id, price, qty, product=prod, partner=False)
 
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 7b65cc99847..36538175e27 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -915,12 +915,12 @@ class stock_picking(osv.osv):
         @return: Taxes Ids for the move line
         """
         if type in ('in_invoice', 'in_refund'):
-            if product_id.supplier_taxes_id:
+            if move_line.product_id.supplier_taxes_id:
                 taxes = move_line.product_id.supplier_taxes_id
             else:
                 taxes = move_line.product_id.categ_id.supplier_taxes_id
         else:
-             if product_id.taxes_id:
+             if move_line.product_id.taxes_id:
                 taxes = move_line.product_id.taxes_id
              else:
                 taxes = move_line.product_id.categ_id.taxes_id

From d67d8ebdd16fcbc22609f5443d20b47f9bad48cf Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Fri, 24 Aug 2012 18:08:26 +0530
Subject: [PATCH 12/12] [FIX]Fixed for  'Procurement Method' and  'Stock and
 Expected Variations' section should be hide for none type product

bzr revid: dhr@tinyerp.com-20120824123826-57g7ieosoyrjvpeo
---
 addons/product/product_view.xml | 2 +-
 addons/stock/product_view.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 49c4d5d1083..21206992044 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -86,7 +86,7 @@
                                     </group>
                                     <group string="Procurement">
                                         <field name="type"/>
-                                        <field name="procure_method" groups="base.group_user" attrs="{'invisible':[('type','in', ('service', 'consu'))]}"/>
+                                        <field name="procure_method" groups="base.group_user" attrs="{'invisible':[('type','!=', 'product')]}"/>
                                     </group>
                                     <group string="Prices">
                                         <field name="list_price"/>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 43647ee88c4..da46c345a4a 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -136,7 +136,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <group name="status" position="before" version="7.0">
-                    <group string="Stock and Expected Variations" attrs="{'invisible':[('type','in', ('service', 'consu'))]}">
+                    <group string="Stock and Expected Variations" attrs="{'invisible':[('type','!=', 'product')]}">
                         <label for="qty_available"/>
                         <div>
                             <field name="qty_available" class="oe_inline"/>