From 3b7bb7599607dbf5772014fcc8c9e837cb64565b Mon Sep 17 00:00:00 2001
From: "Nimesh Contractor (OpenERP)" <nco@tinyerp.com>
Date: Fri, 28 Jun 2013 17:02:02 +0530
Subject: [PATCH 01/16] [IMP] remove icon of update button.

bzr revid: nco@tinyerp.com-20130628113202-yy2f6qilc2cbs177
---
 addons/mrp/mrp_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 992ff4be602..e0b66bcb260 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -640,7 +640,6 @@
                                 <field name="product_qty" class="oe_inline"/>
                                 <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
                                 <button type="action"
-                                    icon="terp-accessories-archiver+"
                                     name="%(mrp.action_change_production_qty)d"
                                     string="(Update)" states="confirmed" class="oe_edit_only oe_link"/>
                             </div>

From a880a5240c52e2bdd0dbaebb908a2024d75b1633 Mon Sep 17 00:00:00 2001
From: "Chandni Machchhar (OpenERP Trainee)" <chandni.machchhar3@gmail.com>
Date: Fri, 28 Jun 2013 17:21:49 +0530
Subject: [PATCH 02/16] [IMP] set uos onchage of product on bom.

bzr revid: nco@tinyerp.com-20130628115149-owpzixvb9eqd8vtb
---
 addons/mrp/mrp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 7fb40ce12af..e5d86a15368 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -268,7 +268,7 @@ class mrp_bom(osv.osv):
         """
         if product_id:
             prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-            return {'value': {'name': prod.name, 'product_uom': prod.uom_id.id}}
+            return {'value': {'name': prod.name, 'product_uom': prod.uom_id.id, 'product_uos_qty': prod.uos_coeff, 'product_uos': prod.uos_id.id}}
         return {}
 
     def onchange_uom(self, cr, uid, ids, product_id, product_uom, context=None):

From f24766b79365b576a0982178239193e23ae08f5d Mon Sep 17 00:00:00 2001
From: "Nimesh Contractor (OpenERP)" <nco@tinyerp.com>
Date: Fri, 28 Jun 2013 17:23:33 +0530
Subject: [PATCH 03/16] [IMP] name filed is on visible when
 group_mrp_properties is true.

bzr revid: nco@tinyerp.com-20130628115333-20gs0tmoc94fbjei
---
 addons/mrp/mrp_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index e0b66bcb260..0b787565fa8 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -366,7 +366,7 @@
                             </div>
                         </group>
                         <group>
-                            <field name="name" groups="base.group_no_one"/>
+                            <field name="name" groups="product.group_mrp_properties"/>
                             <field name="code" string="Reference"/>
                             <field name="type"/>
                             <p colspan="2" class="oe_grey" attrs="{'invisible': [('type','=','normal')]}">

From 07e1dccfd3b939e66a56d6e4d53abbb209b1b0fc Mon Sep 17 00:00:00 2001
From: "Nimesh Contractor (Open ERP)" <nco@tinyerp.com>
Date: Mon, 1 Jul 2013 16:37:25 +0530
Subject: [PATCH 04/16] [IMP]: get uos value in Mo when selecting product.

bzr revid: atp@tinyerp.com-20130701110725-c5670phlgrvt67rq
---
 addons/mrp/mrp.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index e5d86a15368..4a6bdcf3d10 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -551,7 +551,9 @@ class mrp_production(osv.osv):
             return {'value': {
                 'product_uom': False,
                 'bom_id': False,
-                'routing_id': False
+                'routing_id': False,
+                'product_uos_qty': False, 
+                'product_uos': False
             }}
         bom_obj = self.pool.get('mrp.bom')
         product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
@@ -566,6 +568,8 @@ class mrp_production(osv.osv):
             'product_uom': product_uom_id,
             'bom_id': bom_id,
             'routing_id': routing_id,
+            'product_uos_qty': product.uos_coeff, 
+            'product_uos': product.uos_id.id
         }
         return {'value': result}
 

From 4ec2e4c5cfb4483c21aa77b746e8e10597607f9a Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Tue, 2 Jul 2013 12:28:30 +0530
Subject: [PATCH 05/16] [IMP]MRP: Improve string of update like in product form

bzr revid: atp@tinyerp.com-20130702065830-0ok7mf9n0waxkbt8
---
 addons/mrp/mrp_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 0b787565fa8..f41c81c807d 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -641,7 +641,7 @@
                                 <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
                                 <button type="action"
                                     name="%(mrp.action_change_production_qty)d"
-                                    string="(Update)" states="confirmed" class="oe_edit_only oe_link"/>
+                                    string="⇒ Update" states="confirmed" class="oe_edit_only oe_link"/>
                             </div>
                             <label for="product_uos_qty" groups="product.group_uos"/>
                             <div groups="product.group_uos">

From ccbc003a221cba8bbc23f5615beb56f0b2d022e2 Mon Sep 17 00:00:00 2001
From: "Nimesh Contractor (OpenERP)" <nco@tinyerp.com>
Date: Tue, 2 Jul 2013 13:01:06 +0530
Subject: [PATCH 06/16] [IMP] if we not set the uos then also it sets 1.00 in
 mo/bom now if we not set the uos then it will set 0.00.

bzr revid: nco@tinyerp.com-20130702073106-bx3gw2fp1xqn1x9b
---
 addons/mrp/mrp.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 4a6bdcf3d10..182a04c969d 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -267,8 +267,11 @@ class mrp_bom(osv.osv):
         @return:  Dictionary of changed values
         """
         if product_id:
+            uos_coeff = False 
             prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-            return {'value': {'name': prod.name, 'product_uom': prod.uom_id.id, 'product_uos_qty': prod.uos_coeff, 'product_uos': prod.uos_id.id}}
+            if prod.uos_id.id:
+                uos_coeff = prod.uos_coeff
+            return {'value': {'name': prod.name, 'product_uom': prod.uom_id.id, 'product_uos_qty': uos_coeff, 'product_uos': prod.uos_id.id}}
         return {}
 
     def onchange_uom(self, cr, uid, ids, product_id, product_uom, context=None):
@@ -564,12 +567,16 @@ class mrp_production(osv.osv):
             routing_id = bom_point.routing_id.id or False
 
         product_uom_id = product.uom_id and product.uom_id.id or False
+        uos_coeff = False
+        product_uos_id = product.uos_id and product.uos_id.id or False
+        if product_uos_id:
+            uos_coeff = product.uos_coeff
         result = {
             'product_uom': product_uom_id,
             'bom_id': bom_id,
             'routing_id': routing_id,
-            'product_uos_qty': product.uos_coeff, 
-            'product_uos': product.uos_id.id
+            'product_uos_qty': uos_coeff, 
+            'product_uos': product_uos_id
         }
         return {'value': result}
 

From 59a1efef9ff955633217b8fdc9732872b673d276 Mon Sep 17 00:00:00 2001
From: "Nimesh Contractor (OpenERP)" <nco@tinyerp.com>
Date: Tue, 2 Jul 2013 14:53:11 +0530
Subject: [PATCH 07/16] [IMP] improve code.

bzr revid: nco@tinyerp.com-20130702092311-fit169e60lmqi221
---
 addons/mrp/mrp.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 182a04c969d..fc163db1d9c 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -267,11 +267,8 @@ class mrp_bom(osv.osv):
         @return:  Dictionary of changed values
         """
         if product_id:
-            uos_coeff = False 
             prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-            if prod.uos_id.id:
-                uos_coeff = prod.uos_coeff
-            return {'value': {'name': prod.name, 'product_uom': prod.uom_id.id, 'product_uos_qty': uos_coeff, 'product_uos': prod.uos_id.id}}
+            return {'value': {'name': prod.name, 'product_uom': prod.uom_id.id, 'product_uos_qty': prod.uos_id.id and prod.uos_coeff or False, 'product_uos': prod.uos_id.id}}
         return {}
 
     def onchange_uom(self, cr, uid, ids, product_id, product_uom, context=None):
@@ -567,15 +564,12 @@ class mrp_production(osv.osv):
             routing_id = bom_point.routing_id.id or False
 
         product_uom_id = product.uom_id and product.uom_id.id or False
-        uos_coeff = False
         product_uos_id = product.uos_id and product.uos_id.id or False
-        if product_uos_id:
-            uos_coeff = product.uos_coeff
         result = {
             'product_uom': product_uom_id,
             'bom_id': bom_id,
             'routing_id': routing_id,
-            'product_uos_qty': uos_coeff, 
+            'product_uos_qty': product_uos_id and product.uos_coeff or False, 
             'product_uos': product_uos_id
         }
         return {'value': result}

From 934243d7b96962e997219cb1d437197aa3592e9c Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 21 Aug 2013 19:26:35 +0530
Subject: [PATCH 08/16] [Fix]: Add onchange on product qty

bzr revid: atp@tinyerp.com-20130821135635-9b2qw6xu7l0s4w52
---
 addons/mrp/mrp.py       | 14 ++++++++++++++
 addons/mrp/mrp_view.xml |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index da023deb597..184bfe31e43 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -272,6 +272,13 @@ class mrp_bom(osv.osv):
             return {'value': {'name': prod.name, 'product_uom': prod.uom_id.id, 'product_uos_qty': prod.uos_id.id and prod.uos_coeff or False, 'product_uos': prod.uos_id.id}}
         return {}
 
+    def onchange_product_qty_change(self, cr, uid, ids, product_id, qty=0, context=None):
+        if product_id:
+            prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+            if prod.uos_id:
+                return {'value': {'product_uos': prod.uos_id.id, 'product_uos_qty': qty * prod.uos_coeff}}
+        return {}
+
     def onchange_uom(self, cr, uid, ids, product_id, product_uom, context=None):
         res = {'value':{}}
         if not product_uom or not product_id:
@@ -583,6 +590,13 @@ class mrp_production(osv.osv):
         }
         return {'value': result}
 
+    def onchange_product_qty_change(self, cr, uid, ids, product_id, qty=0, context=None):
+        if product_id:
+            prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+            if prod.uos_id:
+                return {'value': {'product_uos': prod.uos_id.id, 'product_uos_qty': qty * prod.uos_coeff}}
+        return {}
+
     def bom_id_change(self, cr, uid, ids, bom_id, context=None):
         """ Finds routing for changed BoM.
         @param product: Id of product.
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 5c225b1fcb2..b13896136a6 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -350,7 +350,7 @@
                             <field name="product_id" on_change="onchange_product_id(product_id, name, context)" context="{'default_supply_method':'produce'}" class="oe_inline"/>
                             <label for="product_qty" string="Quantity"/>
                             <div>
-                                <field name="product_qty" class="oe_inline"/>
+                                <field name="product_qty" class="oe_inline" on_change="onchange_product_qty_change(product_id, product_qty, context)"/>
                                 <field name="product_uom" class="oe_inline" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/>
                             </div>
                             <label for="product_uos_qty" groups="product.group_uos"/>
@@ -637,7 +637,7 @@
                             <field name="product_id" on_change="product_id_change(product_id)" domain="[('bom_ids','!=',False),('bom_ids.bom_id','=',False)]" class="oe_inline" context='{"default_supply_method":"produce", "default_type": "product"}'/>
                             <label for="product_qty"/>
                             <div>
-                                <field name="product_qty" class="oe_inline"/>
+                                <field name="product_qty" class="oe_inline" on_change="onchange_product_qty_change(product_id, product_qty, context)"/>
                                 <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
                                 <button type="action"
                                     name="%(mrp.action_change_production_qty)d"

From d37e78973992c3a6244c603f94b58b5963897ab6 Mon Sep 17 00:00:00 2001
From: "Amit Vora (OpenERP Trainee)" <voraamitr@gmail.com>
Date: Thu, 22 Aug 2013 14:31:55 +0530
Subject: [PATCH 09/16] [IMP] improve code in mrp.py and mrp_view.xml

bzr revid: voraamitr@gmail.com-20130822090155-6kkd0qm9ahnmhtlf
---
 addons/mrp/mrp.py       | 35 +++++++++++++++++++++++------------
 addons/mrp/mrp_view.xml |  8 ++++----
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 184bfe31e43..4c3b205062d 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -261,16 +261,23 @@ class mrp_bom(osv.osv):
         (_check_product, 'BoM line product should not be same as BoM product.', ['product_id']),
     ]
 
-    def onchange_product_id(self, cr, uid, ids, product_id, name, context=None):
+    def onchange_product_id(self, cr, uid, ids, product_id, name, product_qty=0, context=None):
         """ 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
         """
+        res={'value':{}}
         if product_id:
             prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-            return {'value': {'name': prod.name, 'product_uom': prod.uom_id.id, 'product_uos_qty': prod.uos_id.id and prod.uos_coeff or False, 'product_uos': prod.uos_id.id}}
-        return {}
+            res['value']['name'] = prod.name
+            res['value']['product_uom'] = prod.uom_id.id
+            if prod.uos_id.id:
+                #res['value']['product_uos_qty'] = product_qty * prod.uos_coeff
+                res['value']['product_uos'] = prod.uos_id.id
+            else:
+                res['value']['product_uos_qty'] = 0
+        return res
 
     def onchange_product_qty_change(self, cr, uid, ids, product_id, qty=0, context=None):
         if product_id:
@@ -558,7 +565,8 @@ class mrp_production(osv.osv):
             return {'value': {'location_dest_id': src}}
         return {}
 
-    def product_id_change(self, cr, uid, ids, product_id, context=None):
+    def product_id_change(self, cr, uid, ids, product_id, product_qty=0, context=None):
+        print 'product_id_change>>>>>>>>>>\n\n\n'
         """ Finds UoM of changed product.
         @param product_id: Id of changed product.
         @return: Dictionary of values.
@@ -581,14 +589,17 @@ class mrp_production(osv.osv):
 
         product_uom_id = product.uom_id and product.uom_id.id or False
         product_uos_id = product.uos_id and product.uos_id.id or False
-        result = {
-            'product_uom': product_uom_id,
-            'bom_id': bom_id,
-            'routing_id': routing_id,
-            'product_uos_qty': product_uos_id and product.uos_coeff or False, 
-            'product_uos': product_uos_id
-        }
-        return {'value': result}
+        result={'value': {}}
+        if product.uos_id.id:
+            result['value']['product_uos_qty'] = product_qty * product.uos_coeff
+            result['value']['product_uos'] = product.uos_id.id
+        else:
+            result['value']['product_uos_qty'] = 0
+        
+        result['value']['product_uom'] = product_uom_id
+        result['value']['bom_id'] = bom_id
+        result['value']['routing_id'] = routing_id
+        return result
 
     def onchange_product_qty_change(self, cr, uid, ids, product_id, qty=0, context=None):
         if product_id:
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index b13896136a6..a1a04085819 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -347,10 +347,10 @@
                 <form string="Bill of Material" version="7.0">
                     <group>
                         <group>
-                            <field name="product_id" on_change="onchange_product_id(product_id, name, context)" context="{'default_supply_method':'produce'}" class="oe_inline"/>
+                            <field name="product_id" on_change="onchange_product_id(product_id, name, product_qty, context)" context="{'default_supply_method':'produce'}" class="oe_inline"/>
                             <label for="product_qty" string="Quantity"/>
                             <div>
-                                <field name="product_qty" class="oe_inline" on_change="onchange_product_qty_change(product_id, product_qty, context)"/>
+                                <field name="product_qty" class="oe_inline" on_change="onchange_product_id(product_id, name, product_qty, context)"/>
                                 <field name="product_uom" class="oe_inline" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/>
                             </div>
                             <label for="product_uos_qty" groups="product.group_uos"/>
@@ -634,10 +634,10 @@
                     </div>
                     <group>
                         <group>
-                            <field name="product_id" on_change="product_id_change(product_id)" domain="[('bom_ids','!=',False),('bom_ids.bom_id','=',False)]" class="oe_inline" context='{"default_supply_method":"produce", "default_type": "product"}'/>
+                            <field name="product_id" on_change="product_id_change(product_id, product_qty)" domain="[('bom_ids','!=',False),('bom_ids.bom_id','=',False)]" class="oe_inline" context='{"default_supply_method":"produce", "default_type": "product"}'/>
                             <label for="product_qty"/>
                             <div>
-                                <field name="product_qty" class="oe_inline" on_change="onchange_product_qty_change(product_id, product_qty, context)"/>
+                                <field name="product_qty" class="oe_inline" on_change="product_id_change(product_id, product_qty)"/>
                                 <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
                                 <button type="action"
                                     name="%(mrp.action_change_production_qty)d"

From 8601ccc037d04459ea093af3df160d3b93ff0a04 Mon Sep 17 00:00:00 2001
From: "Amit Vora (OpenERP Trainee)" <voraamitr@gmail.com>
Date: Thu, 22 Aug 2013 14:38:59 +0530
Subject: [PATCH 10/16] [IMP] improve code in mrp.py and mrp_view.xml

bzr revid: voraamitr@gmail.com-20130822090859-4lb29jlbi96mei0p
---
 addons/mrp/mrp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 4c3b205062d..62ddf63d7e9 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -273,7 +273,7 @@ class mrp_bom(osv.osv):
             res['value']['name'] = prod.name
             res['value']['product_uom'] = prod.uom_id.id
             if prod.uos_id.id:
-                #res['value']['product_uos_qty'] = product_qty * prod.uos_coeff
+                res['value']['product_uos_qty'] = product_qty * prod.uos_coeff
                 res['value']['product_uos'] = prod.uos_id.id
             else:
                 res['value']['product_uos_qty'] = 0

From 94d4bff64a0049e1ba79e8d3498758ee08732107 Mon Sep 17 00:00:00 2001
From: "Amit Vora (OpenERP Trainee)" <voraamitr@gmail.com>
Date: Thu, 22 Aug 2013 14:45:55 +0530
Subject: [PATCH 11/16] [IMP] remove the space in the code

bzr revid: voraamitr@gmail.com-20130822091555-reokuvvanhpo60u1
---
 addons/mrp/mrp.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 62ddf63d7e9..6335c6fd97b 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -566,7 +566,6 @@ class mrp_production(osv.osv):
         return {}
 
     def product_id_change(self, cr, uid, ids, product_id, product_qty=0, context=None):
-        print 'product_id_change>>>>>>>>>>\n\n\n'
         """ Finds UoM of changed product.
         @param product_id: Id of changed product.
         @return: Dictionary of values.
@@ -586,7 +585,6 @@ class mrp_production(osv.osv):
         if bom_id:
             bom_point = bom_obj.browse(cr, uid, bom_id, context=context)
             routing_id = bom_point.routing_id.id or False
-
         product_uom_id = product.uom_id and product.uom_id.id or False
         product_uos_id = product.uos_id and product.uos_id.id or False
         result={'value': {}}
@@ -595,7 +593,6 @@ class mrp_production(osv.osv):
             result['value']['product_uos'] = product.uos_id.id
         else:
             result['value']['product_uos_qty'] = 0
-        
         result['value']['product_uom'] = product_uom_id
         result['value']['bom_id'] = bom_id
         result['value']['routing_id'] = routing_id

From 39956450204e6ccb60bae94355b27ccb7de3372a Mon Sep 17 00:00:00 2001
From: "Amit Vora (OpenERP Trainee)" <voraamitr@gmail.com>
Date: Thu, 22 Aug 2013 16:27:06 +0530
Subject: [PATCH 12/16] [IMP] remove method onchange_product_qty_change and add
 condition

bzr revid: voraamitr@gmail.com-20130822105706-d6hjfw4i86vkzgs2
---
 addons/mrp/mrp.py | 39 ++++++++++++++++-----------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 6335c6fd97b..ddb04e57d30 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -268,24 +268,23 @@ class mrp_bom(osv.osv):
         @return:  Dictionary of changed values
         """
         res={'value':{}}
-        if product_id:
-            prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-            res['value']['name'] = prod.name
-            res['value']['product_uom'] = prod.uom_id.id
-            if prod.uos_id.id:
-                res['value']['product_uos_qty'] = product_qty * prod.uos_coeff
-                res['value']['product_uos'] = prod.uos_id.id
-            else:
-                res['value']['product_uos_qty'] = 0
+        if not product_id:
+            return {'value': {
+                'product_uom': False,
+                'name': False,
+                'product_uos_qty': False, 
+                'product_uos': False
+            }}
+        prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+        res['value']['name'] = prod.name
+        res['value']['product_uom'] = prod.uom_id.id
+        if prod.uos_id.id:
+            res['value']['product_uos_qty'] = product_qty * prod.uos_coeff
+            res['value']['product_uos'] = prod.uos_id.id
+        else:
+            res['value']['product_uos_qty'] = 0
         return res
 
-    def onchange_product_qty_change(self, cr, uid, ids, product_id, qty=0, context=None):
-        if product_id:
-            prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-            if prod.uos_id:
-                return {'value': {'product_uos': prod.uos_id.id, 'product_uos_qty': qty * prod.uos_coeff}}
-        return {}
-
     def onchange_uom(self, cr, uid, ids, product_id, product_uom, context=None):
         res = {'value':{}}
         if not product_uom or not product_id:
@@ -598,13 +597,7 @@ class mrp_production(osv.osv):
         result['value']['routing_id'] = routing_id
         return result
 
-    def onchange_product_qty_change(self, cr, uid, ids, product_id, qty=0, context=None):
-        if product_id:
-            prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-            if prod.uos_id:
-                return {'value': {'product_uos': prod.uos_id.id, 'product_uos_qty': qty * prod.uos_coeff}}
-        return {}
-
+    
     def bom_id_change(self, cr, uid, ids, bom_id, context=None):
         """ Finds routing for changed BoM.
         @param product: Id of product.

From 5ffddbdcf0e44e5343236836348ccd3f58230c03 Mon Sep 17 00:00:00 2001
From: "Amit Vora (OpenERP Trainee)" <voraamitr@gmail.com>
Date: Thu, 22 Aug 2013 17:11:44 +0530
Subject: [PATCH 13/16] [IMP] improve code in mrp.py file

bzr revid: voraamitr@gmail.com-20130822114144-q6ltm3w6hz9776ra
---
 addons/mrp/mrp.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index ddb04e57d30..2f340a5ea56 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -283,6 +283,7 @@ class mrp_bom(osv.osv):
             res['value']['product_uos'] = prod.uos_id.id
         else:
             res['value']['product_uos_qty'] = 0
+            res['value']['product_uos'] = False
         return res
 
     def onchange_uom(self, cr, uid, ids, product_id, product_uom, context=None):
@@ -592,6 +593,7 @@ class mrp_production(osv.osv):
             result['value']['product_uos'] = product.uos_id.id
         else:
             result['value']['product_uos_qty'] = 0
+            result['value']['product_uos'] = False
         result['value']['product_uom'] = product_uom_id
         result['value']['bom_id'] = bom_id
         result['value']['routing_id'] = routing_id

From 1dd351e4ba3079c53e8daf0fdec232d70df80587 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 22 Aug 2013 18:50:36 +0530
Subject: [PATCH 14/16] [IMP]: Improve onchange in bom and mrp production

bzr revid: atp@tinyerp.com-20130822132036-i3qx903o0ut34f4s
---
 addons/mrp/mrp.py | 38 ++++++++++----------------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 2f340a5ea56..1d4d7cf5aa7 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -71,8 +71,6 @@ class mrp_workcenter(osv.osv):
             value = {'costs_hour': cost.standard_price}
         return {'value': value}
 
-
-
 class mrp_routing(osv.osv):
     """
     For specifying the routings of Work Centers.
@@ -267,23 +265,13 @@ class mrp_bom(osv.osv):
         @param product_id: Changed product_id
         @return:  Dictionary of changed values
         """
-        res={'value':{}}
-        if not product_id:
-            return {'value': {
-                'product_uom': False,
-                'name': False,
-                'product_uos_qty': False, 
-                'product_uos': False
-            }}
-        prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-        res['value']['name'] = prod.name
-        res['value']['product_uom'] = prod.uom_id.id
-        if prod.uos_id.id:
-            res['value']['product_uos_qty'] = product_qty * prod.uos_coeff
-            res['value']['product_uos'] = prod.uos_id.id
-        else:
-            res['value']['product_uos_qty'] = 0
-            res['value']['product_uos'] = False
+        res={}
+        if product_id:
+            prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+            res['value'] = {'name': prod.name, 'product_uom': prod.uom_id.id, 'product_uos_qty': 0, 'product_uos': False}
+            if prod.uos_id.id:
+                res['value']['product_uos_qty'] = product_qty * prod.uos_coeff
+                res['value']['product_uos'] = prod.uos_id.id
         return res
 
     def onchange_uom(self, cr, uid, ids, product_id, product_uom, context=None):
@@ -570,12 +558,13 @@ class mrp_production(osv.osv):
         @param product_id: Id of changed product.
         @return: Dictionary of values.
         """
+        result={}
         if not product_id:
             return {'value': {
                 'product_uom': False,
                 'bom_id': False,
                 'routing_id': False,
-                'product_uos_qty': False, 
+                'product_uos_qty': 0, 
                 'product_uos': False
             }}
         bom_obj = self.pool.get('mrp.bom')
@@ -587,19 +576,12 @@ class mrp_production(osv.osv):
             routing_id = bom_point.routing_id.id or False
         product_uom_id = product.uom_id and product.uom_id.id or False
         product_uos_id = product.uos_id and product.uos_id.id or False
-        result={'value': {}}
+        result['value'] = {'product_uos_qty': 0, 'product_uos': False, 'product_uom': product_uom_id, 'bom_id': bom_id, 'routing_id': routing_id}
         if product.uos_id.id:
             result['value']['product_uos_qty'] = product_qty * product.uos_coeff
             result['value']['product_uos'] = product.uos_id.id
-        else:
-            result['value']['product_uos_qty'] = 0
-            result['value']['product_uos'] = False
-        result['value']['product_uom'] = product_uom_id
-        result['value']['bom_id'] = bom_id
-        result['value']['routing_id'] = routing_id
         return result
 
-    
     def bom_id_change(self, cr, uid, ids, bom_id, context=None):
         """ Finds routing for changed BoM.
         @param product: Id of product.

From cb886c6c90aa69fb853e802ab268815f0bc4c741 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 26 Aug 2013 17:12:19 +0530
Subject: [PATCH 15/16] [ADD]: Add tooltips in product_uos_qty

bzr revid: atp@tinyerp.com-20130826114219-n604qhbv7k0xpnmt
---
 addons/mrp/mrp.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 1d4d7cf5aa7..ee6d78d5017 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -201,7 +201,8 @@ class mrp_bom(osv.osv):
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of bills of material."),
         'position': fields.char('Internal Reference', size=64, help="Reference to a position in an external plan."),
         'product_id': fields.many2one('product.product', 'Product', required=True),
-        'product_uos_qty': fields.float('Product UOS Qty'),
+        'product_uos_qty': fields.float('Product UOS Qty', help='If set UOS on product, convert default Unit of Measure to Unit of Sale\n'
+            'uos_qty = product_qty * product.uos_coeff'),
         'product_uos': fields.many2one('product.uom', 'Product UOS', help="Product UOS (Unit of Sale) is the unit of measurement for the invoicing and promotion of stock."),
         'product_qty': fields.float('Product Quantity', required=True, digits_compute=dp.get_precision('Product Unit of Measure')),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, help="Unit of Measure (Unit of Measure) is the unit of measurement for the inventory control"),
@@ -445,7 +446,8 @@ class mrp_production(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'product_qty': fields.float('Product Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, readonly=True, states={'draft': [('readonly', False)]}),
-        'product_uos_qty': fields.float('Product UoS Quantity', readonly=True, states={'draft': [('readonly', False)]}),
+        'product_uos_qty': fields.float('Product UoS Quantity', readonly=True, states={'draft': [('readonly', False)]}, help='If set UOS on product, convert default Unit of Measure to Unit of Sale\n'
+            'uos_qty = product_qty * product.uos_coeff'),
         'product_uos': fields.many2one('product.uom', 'Product UoS', readonly=True, states={'draft': [('readonly', False)]}),
         'progress': fields.function(_get_progress, type='float',
             string='Production progress'),

From 8089d2c3a6314647541ed82089e957fc24c58b68 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 13 Sep 2013 14:48:10 +0530
Subject: [PATCH 16/16] [REM]mrp: Remove tooltips from product_uos_qty

bzr revid: atp@tinyerp.com-20130913091810-xoblepy4nyo6i67m
---
 addons/mrp/mrp.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index ee6d78d5017..1d4d7cf5aa7 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -201,8 +201,7 @@ class mrp_bom(osv.osv):
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of bills of material."),
         'position': fields.char('Internal Reference', size=64, help="Reference to a position in an external plan."),
         'product_id': fields.many2one('product.product', 'Product', required=True),
-        'product_uos_qty': fields.float('Product UOS Qty', help='If set UOS on product, convert default Unit of Measure to Unit of Sale\n'
-            'uos_qty = product_qty * product.uos_coeff'),
+        'product_uos_qty': fields.float('Product UOS Qty'),
         'product_uos': fields.many2one('product.uom', 'Product UOS', help="Product UOS (Unit of Sale) is the unit of measurement for the invoicing and promotion of stock."),
         'product_qty': fields.float('Product Quantity', required=True, digits_compute=dp.get_precision('Product Unit of Measure')),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, help="Unit of Measure (Unit of Measure) is the unit of measurement for the inventory control"),
@@ -446,8 +445,7 @@ class mrp_production(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'product_qty': fields.float('Product Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, readonly=True, states={'draft': [('readonly', False)]}),
-        'product_uos_qty': fields.float('Product UoS Quantity', readonly=True, states={'draft': [('readonly', False)]}, help='If set UOS on product, convert default Unit of Measure to Unit of Sale\n'
-            'uos_qty = product_qty * product.uos_coeff'),
+        'product_uos_qty': fields.float('Product UoS Quantity', readonly=True, states={'draft': [('readonly', False)]}),
         'product_uos': fields.many2one('product.uom', 'Product UoS', readonly=True, states={'draft': [('readonly', False)]}),
         'progress': fields.function(_get_progress, type='float',
             string='Production progress'),