From cd64e33d16b067847662e8f4c95221a9ec62bc15 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Mon, 1 Oct 2012 14:26:03 +0530
Subject: [PATCH] [IMP] make changes into product,procurement module

bzr revid: rma@tinyerp.com-20121001085603-1s2kt6ufg8fcom8e
---
 addons/mrp/mrp_view.xml                       |  6 ++----
 addons/procurement/procurement.py             | 19 +++++++++++++------
 addons/procurement/procurement_demo.xml       | 10 ++++++++++
 addons/procurement/procurement_view.xml       | 17 ++++++++++++++---
 addons/product/product.py                     |  2 --
 addons/product/product_demo.xml               | 10 ----------
 addons/product/product_view.xml               |  2 --
 .../purchase_requisition_view.xml             |  2 +-
 8 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index c003711ceb1..9d73705d567 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -966,7 +966,7 @@
         <record id="product.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"/>
+            <field name="inherit_id" ref="procurement.product_template_form_view_procurement"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='supply_method']" position="attributes">
                     <attribute name="invisible">False</attribute>
@@ -977,7 +977,7 @@
                         order</b> using the bill of materials assigned to this product.
                         The delivery order will be ready once the production is done.
                     </p>
-</group>
+                </group>
             </field>
         </record>
 
@@ -1052,7 +1052,5 @@
                 </xpath>
             </field>
         </record>
-
-
     </data>
 </openerp>
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index d19e792243f..1c2decb4cdd 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -32,6 +32,19 @@ import decimal_precision as dp
 #     then wizard for picking lists & move
 #
 
+class product_template(osv.osv):
+    _inherit="product.template"
+    _columns = {
+        'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."),
+        'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
+        'supply_method': fields.selection([('produce','Manufacture'),('buy','Buy')], 'Supply Method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."),
+    }
+    _defaults = {
+        'procure_method': lambda *a: 'make_to_stock',
+        'supply_method': lambda *a: 'buy',
+    }
+product_template()
+
 class mrp_property_group(osv.osv):
     """
     Group of mrp properties.
@@ -627,14 +640,8 @@ class product_product(osv.osv):
     _inherit="product.product"
     _columns = {
         'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rules'),
-        'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."),
-        'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
-    }
-    _defaults = {
-        'procure_method': lambda *a: 'make_to_stock',
     }
 
 
 product_product()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/procurement/procurement_demo.xml b/addons/procurement/procurement_demo.xml
index e4cf500007d..e28927815e3 100644
--- a/addons/procurement/procurement_demo.xml
+++ b/addons/procurement/procurement_demo.xml
@@ -3,23 +3,28 @@
     <data noupdate="1">
         <record id="product.product_product_1" model="product.product">
             <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
         </record>
         <record id="product.product_product_2" model="product.product">
             <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
         </record>
         <record id="product.product_product_3" model="product.product">
             <field name="type">product</field>
             <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
         </record>
         
         <record id="product.product_product_4" model="product.product">
             <field name="type">product</field>
             <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
 
         </record>
         <record id="product.product_product_5" model="product.product">
             <field name="type">product</field>
             <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
         </record>
         
         <record id="product.product_product_6" model="product.product">
@@ -67,6 +72,7 @@
         <record id="product.product_product_16" model="product.product">
             <field name="type">product</field>
             <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
         </record>
 
         <record id="product.product_product_17" model="product.product">
@@ -76,11 +82,13 @@
         <record id="product.product_product_18" model="product.product">
             <field name="type">product</field>
             <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
         </record>
 
         <record id="product.product_product_19" model="product.product">
             <field name="type">product</field>
             <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
         </record>
 
         <record id="product.product_product_20" model="product.product">
@@ -114,6 +122,7 @@
         <record id="product.product_product_27" model="product.product">
             <field name="type">product</field>
             <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
         </record>
         
         <record id="product.product_product_28" model="product.product">
@@ -168,6 +177,7 @@
         
         <record id="product.product_product_44" model="product.product">
             <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
         </record>
         
         <record id="product.product_product_45" model="product.product">
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index debbe03c961..8c3ae9a2336 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -303,8 +303,9 @@
                     <button string="Request Procurement" name="%(act_make_procurement)d" type="action"/>
                     <button string="Orderpoints" name="%(product_open_orderpoint)d" type="action"/>
                 </xpath>
-                <xpath expr="//field[@name='supply_method']" position="before">
-                    <field name="procure_method" groups="base.group_user"/> 
+                <xpath expr="//field[@name='cost_method']" position="before">
+                    <field name="procure_method" groups="base.group_user"/>
+                    <field name="supply_method" groups="base.group_user"/> 
                 </xpath>
                 <xpath expr="//group[@name='procurement_help']" position="inside">
                 <group name="procurement_help" class="oe_grey" col="1" groups="base.group_user">
@@ -331,6 +332,16 @@
                 </xpath>
             </field>
         </record>
-
+        <record model="ir.ui.view" id="product_template_form_view_procurement">
+            <field name="name">product.template.procurement</field>
+            <field name="model">product.template</field>
+            <field name="inherit_id" ref="product.product_template_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='type']" position="after">
+                    <field name="procure_method"/>
+                    <field name="supply_method"/>
+                </xpath>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/product/product.py b/addons/product/product.py
index e3afc4dbd7d..f42aaba9e26 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -281,7 +281,6 @@ class product_template(osv.osv):
         'description_purchase': fields.text('Purchase Description',translate=True),
         'description_sale': fields.text('Sale Description',translate=True),
         'type': fields.selection([('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."),
-        'supply_method': fields.selection([('produce','Manufacture'),('buy','Buy')], 'Supply Method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."),
         'sale_delay': fields.float('Customer Lead Time', help="This is the average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."),
         'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders."),
         'rental': fields.boolean('Can be Rent'),
@@ -352,7 +351,6 @@ class product_template(osv.osv):
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'product.template', context=c),
         'list_price': lambda *a: 1,
         'cost_method': lambda *a: 'standard',
-        'supply_method': lambda *a: 'buy',
         'standard_price': lambda *a: 0.0,
         'sale_ok': lambda *a: 1,
         'sale_delay': lambda *a: 7,
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 76cbd6a5c5d..14477d2401a 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -70,7 +70,6 @@
             <field name="standard_price">20.5</field>
             <field name="list_price">30.75</field>
             <field name="type">service</field>
-            <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_hour"/>
             <field name="uom_po_id" ref="product_uom_hour"/>
             <field name="description">This type of service include basic monitoring of products.</field>
@@ -83,7 +82,6 @@
             <field name="standard_price">25.5</field>
             <field name="list_price">38.25</field>
             <field name="type">service</field>
-            <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_hour"/>
             <field name="uom_po_id" ref="product_uom_hour"/>
             <field name="description">This type of service include assistance for security questions, system configuration requirements, implementation or special needs.</field>
@@ -96,7 +94,6 @@
             <field name="list_price">450.0</field>
             <field name="standard_price">300.0</field>
             <field name="type">consu</field>
-            <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="sale_delay">4.0</field>
@@ -113,7 +110,6 @@ HDD SH-1</field>
             <field name="standard_price">500.0</field>
             <field name="list_price">750.0</field>
             <field name="type">consu</field>
-            <field name="supply_method">produce</field>
 
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
@@ -131,7 +127,6 @@ HDD SH-1</field>
             <field name="standard_price">600.0</field>
             <field name="list_price">900.0</field>
             <field name="type">consu</field>
-            <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="sale_delay">7.0</field>
@@ -245,7 +240,6 @@ HDD SH-1</field>
             <field name="standard_price">20.0</field>
             <field name="list_price">25.0</field>
             <field name="type">consu</field>
-            <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -266,7 +260,6 @@ HDD SH-1</field>
             <field name="standard_price">1020.0</field>
             <field name="list_price">1150.0</field>
             <field name="type">consu</field>
-            <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -277,7 +270,6 @@ HDD SH-1</field>
             <field name="standard_price">1100.0</field>
             <field name="list_price">1250.0</field>
             <field name="type">consu</field>
-            <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">On demand hard-disk having capacity based on requirement.</field>
@@ -367,7 +359,6 @@ QWERTY keyboard</field>
             <field name="standard_price">3300.0</field>
             <field name="list_price">3645.0</field>
             <field name="type">consu</field>
-            <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">Custom Laptop based on customer's requirement.</field>
@@ -557,7 +548,6 @@ QWERTY keyboard</field>
             <field name="standard_price">155.0</field>
             <field name="list_price">173.0</field>
             <field name="type">consu</field>
-            <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description_sale">Full featured image editing software.</field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index de0c7dcdc7a..cc2b2b9fb63 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -105,7 +105,6 @@
                             <page string="Procurements" groups="base.group_user">
                                 <group name="procurement">
                                     <group>
-                                        <field name="supply_method" groups="base.group_user" invisible="1"/>
                                         <field name="cost_method" groups="product.group_costing_method"/>
                                         <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                                     </group>
@@ -718,7 +717,6 @@
                             </group>
                             <group string="Procurement">
                                 <field name="type"/>
-                                <field name="supply_method"/>
                             </group>
 
                             <group string="Base Prices">
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 1fafec92bc7..a342f54edfd 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -180,7 +180,7 @@
     <record model="ir.ui.view" id="product_normal_form_view_inherit">
         <field name="name">product.form.inherit</field>
         <field name="model">product.product</field>
-        <field name="inherit_id" ref="product.product_normal_form_view"/>
+        <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
         <field name="arch" type="xml">
             <field name="procure_method" position="before">
                 <field name="purchase_requisition"/>