From dae3f0f3491aa6cd91ecd880ed808e5a6faafcbe Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 24 May 2010 14:49:56 +0530
Subject: [PATCH 1/5] [IMP] mrp: Task id_583: Set bom_lines visible/invisible
 according to multi_level_bom field.

bzr revid: uco@tinyerp.com-20100524091956-t617a5yb1o0bz3fi
---
 addons/mrp/mrp.py       | 18 +++++++++++++++++
 addons/mrp/mrp_view.xml | 44 +++++++++++++++++++++--------------------
 2 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 966572f772c..b3ced960cbe 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -248,6 +248,24 @@ class mrp_bom(osv.osv):
             return {'value': v}
         return {}
     
+    def onchange_multi_level_bom(self, cr, uid, ids, multi_level_bom, context={}):
+        """ Changes UoM and name if product_id changes.
+        @param name: Name of the field
+        @param product_id: Changed product_id
+        @return:  Dictionary of changed values
+        """
+        value = {}
+        bom_ids = ids and ids[0]
+        bom = self.browse(cr, uid, bom_ids)
+        line_ids = bom and map(lambda x:x.id, bom.bom_lines)
+        value['bom_lines'] = line_ids
+        if multi_level_bom:
+            self.write(cr, uid, line_ids, {'multi_level_bom': multi_level_bom})
+            return {'value': value}
+        else:
+            self.write(cr, uid, line_ids, {'multi_level_bom': multi_level_bom})
+            return {'value': {}}
+    
     def _bom_find(self, cr, uid, product_id, product_uom, properties=[]):
         """ Finds BoM for particular product and product uom.
         @param product_id: Selected product.
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 02841b64b03..581330ae655 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -254,30 +254,32 @@
                         <field name="product_uos" groups="product.group_uos"/>
                         <field name="product_uos_qty" groups="product.group_uos"/>
                         <newline/>
-                        <field name="multi_level_bom" />
+                        <field name="multi_level_bom" on_change="onchange_multi_level_bom(multi_level_bom)"/>
                         <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" 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" 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" attrs="{'invisible': [('bom_id','!=',False),('multi_level_bom','=',False)]}">
-                            <field name="position"/>
-                            <field name="active"/>
-                            <field name="sequence"/>
-                            <field name="bom_id"/>
-
-                            <field name="date_start"/>
-                            <field name="date_stop"/>
-                            <field name="product_rounding"/>
-                            <field name="product_efficiency"/>
-                            <field colspan="4" name="property_ids" nolabel="2" groups="base.group_extended"/>
-                        </page>
-                    </notebook>
+                    <group attrs="{'invisible': [('bom_id','!=',False),('multi_level_bom','=',False)]}" colspan="4">
+	                    <notebook colspan="4" >
+	                        <page string="General Information">
+	                            <field colspan="4" name="bom_lines" nolabel="1" widget="one2many_list" />
+	                        </page>
+	                        <page string="Revisions" groups="base.group_extended">
+	                            <field colspan="4" name="revision_ids" nolabel="1" widget="one2many_list"/>
+	                        </page>
+	                        <page string="Properties" groups="base.group_extended">
+	                            <field name="position"/>
+	                            <field name="active"/>
+	                            <field name="sequence"/>
+	                            <field name="bom_id"/>
+	
+	                            <field name="date_start"/>
+	                            <field name="date_stop"/>
+	                            <field name="product_rounding"/>
+	                            <field name="product_efficiency"/>
+	                            <field colspan="4" name="property_ids" nolabel="2" groups="base.group_extended"/>
+	                        </page>
+	                    </notebook>
+	                </group>
                 </form>
             </field>
         </record>

From f9625c9cf3ff1d24d71017c9ee6f0c1dd992e98d Mon Sep 17 00:00:00 2001
From: "mso (Open ERP)" <>
Date: Mon, 24 May 2010 15:02:50 +0530
Subject: [PATCH 2/5] [FIX] stock: Sequence name corrected for Picking.

bzr revid: uco@tinyerp.com-20100524093250-llauvx4e78pbq5te
---
 addons/stock/stock.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 27930c8a3e7..65115cf646f 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -470,7 +470,8 @@ class stock_picking(osv.osv):
 
     def create(self, cr, user, vals, context=None):
         if ('name' not in vals) or (vals.get('name')=='/'):
-            vals['name'] = self.pool.get('ir.sequence').get(cr, user, 'stock.picking')
+            seq_obj_name =  'stock.picking.' + vals['type']
+            vals['name'] = self.pool.get('ir.sequence').get(cr, user, seq_obj_name)
         type_list = {
             'out':_('Packing List'),
             'in':_('Reception'),

From 5874fe8f3e3e039c754be6de88848ff093b62f1d Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 24 May 2010 15:33:39 +0530
Subject: [PATCH 3/5] [IMP] mrp: Task id_583: Code optimization.

bzr revid: uco@tinyerp.com-20100524100339-pt75qnz9lbtianfd
---
 addons/mrp/mrp.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index b3ced960cbe..b62331481a4 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -254,14 +254,12 @@ class mrp_bom(osv.osv):
         @param product_id: Changed product_id
         @return:  Dictionary of changed values
         """
-        value = {}
         bom_ids = ids and ids[0]
         bom = self.browse(cr, uid, bom_ids)
         line_ids = bom and map(lambda x:x.id, bom.bom_lines)
-        value['bom_lines'] = line_ids
         if multi_level_bom:
             self.write(cr, uid, line_ids, {'multi_level_bom': multi_level_bom})
-            return {'value': value}
+            return {'value': {'bom_lines': line_ids}}
         else:
             self.write(cr, uid, line_ids, {'multi_level_bom': multi_level_bom})
             return {'value': {}}

From af6cba75655a4040b9d32e29cded2cee09c1c65f Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 24 May 2010 15:46:03 +0530
Subject: [PATCH 4/5] [IMP] mrp: Task id_583: Change docstring for method.

bzr revid: uco@tinyerp.com-20100524101603-kg8k9hvrcvydz5oa
---
 addons/mrp/mrp.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index b62331481a4..0234ee1c651 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -249,9 +249,8 @@ class mrp_bom(osv.osv):
         return {}
     
     def onchange_multi_level_bom(self, cr, uid, ids, multi_level_bom, context={}):
-        """ Changes UoM and name if product_id changes.
-        @param name: Name of the field
-        @param product_id: Changed product_id
+        """ Changes multi_level_bom.
+        @param multi_level_bom: Changed multi_level_bom
         @return:  Dictionary of changed values
         """
         bom_ids = ids and ids[0]

From f6cf33d423cab991b69d30b7443c7602a55749bc Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 24 May 2010 16:00:10 +0530
Subject: [PATCH 5/5] [IMP] stock: 'type' needed for generating Picking
 sequence.

bzr revid: uco@tinyerp.com-20100524103010-txwn3zbhi1hv14cb
---
 addons/stock/stock_view.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 5cb543b748e..753f3e17433 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -762,6 +762,7 @@
                         <field name="backorder_id" groups="base.group_extended" readonly="1"/>
                         <field name="date" />
                         <field name="min_date"/>
+                        <field name="type" invisible="1"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                         <notebook colspan="4">
@@ -942,6 +943,7 @@
                         <field name="invoice_state"/>
                         <field name="backorder_id" readonly="1"/>
                         <field name="origin" readonly="1"/>
+                        <field name="type" invisible="1"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">