Merge lp:~openerp-dev/openobject-addons/trunk-bug-953324-rpr into lp:openobject-addons

[Rajesh Prajapati (OpenERP)]

Hello

       I added the onchange method for UOM to check the UOM in stock.move and stock.inventory.line in stock

Thanks.
Rajesh

[Purnendu Singh (OpenERP) (purnendu-singh)]

Hello,

You should update 2 points in your mp:

1) Place the newly created onchange_uom method to proper place!!

2) Your forget to do the same thing for stock.inventory.line!!

to check go to warehouse-->inventory control-->physical inventory
 here create a new inventory and create lines. You can change the UOM of different categories!! So, please update the code as u did for stock.move

Thanks,
Purnendu Singh

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-953324-rpr]

7376. By Rajesh Prajapati (OpenERP) on 2012-09-10

[FIX] stock: method onchange_uom added for stock.inventory.line

7377. By Rajesh Prajapati (OpenERP) on 2012-09-10

[FIX] stock: method on_change_product_id improved to consider the proper UOM as per change

[Rajesh Prajapati (OpenERP) (rpr-tinyerp)]

Hello

      Added method for stock.inventory.line and improved onchange_product_id to consider proper UOM.

Thanks.
Rajesh

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/trunk-bug-953324-rpr]

7378. By Rajesh Prajapati (OpenERP) on 2012-09-10

[FIX] stock: space removed

[Amit Parik (amit-parik)]

Hello Rajesh,

on_change_uom is not a better solution to do this, but there must be a check_uom constraint which will also useful for import time. Because if someone try to import inventory line with csv file then on_change will never raise.

So for this bug lp:~openerp-dev/openobject-addons/trunk-bug-953324-mma branch is correct.

Thank you!

[lp:~openerp-dev/openobject-addons/trunk-bug-953324-rpr]

7379. By Rajesh Prajapati (OpenERP) on 2012-10-18

[MERGE] merge with main addons

7380. By Rajesh Prajapati (OpenERP) on 2012-10-18

[MERGE] merge with main addons

7381. By Rajesh Prajapati (OpenERP) on 2012-10-19

[MERGE] merge with main addons

Unmerged revisions

7381. By Rajesh Prajapati (OpenERP) on 2012-10-19

[MERGE] merge with main addons

7380. By Rajesh Prajapati (OpenERP) on 2012-10-18

[MERGE] merge with main addons

7379. By Rajesh Prajapati (OpenERP) on 2012-10-18

[MERGE] merge with main addons

7378. By Rajesh Prajapati (OpenERP) on 2012-09-10

[FIX] stock: space removed

7377. By Rajesh Prajapati (OpenERP) on 2012-09-10

[FIX] stock: method on_change_product_id improved to consider the proper UOM as per change

7376. By Rajesh Prajapati (OpenERP) on 2012-09-10

[FIX] stock: method onchange_uom added for stock.inventory.line

7375. By Rajesh Prajapati (OpenERP) on 2012-09-07

[FIX] stock: onchange method added for no_check_UOM in stock.move and stock.inventory.line

=== modified file 'stock/stock.py'
--- stock/stock.py	2013-12-18 15:57:15 +0000
+++ stock/stock.py	2014-01-15 16:02:43 +0000
@@ -1683,6 +1683,17 @@
             'You try to assign a lot which is not from the same product.',
             ['prodlot_id'])]
 
+    def onchange_uom(self, cr, uid, ids, product_id, product_uom, context=None):
+        res = {'value':{}}
+        if not product_uom or not product_id:
+            return res
+        product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+        uom = self.pool.get('product.uom').browse(cr, uid, product_uom, context=context)
+        if uom.category_id.id != product.uom_id.category_id.id:
+            res['warning'] = {'title': _('Warning'), 'message': _('Selected Unit of Measure does not belong to the same category as the product Unit of Measure')}
+            res['value'].update({'product_uom': product.uom_id.id})
+        return res
+
     def _default_location_destination(self, cr, uid, context=None):
         """ Gets default address of partner for destination location
         @return: Address id or False
@@ -2921,7 +2932,18 @@
         'location_id': _default_stock_location
     }
 
-    def on_change_product_id(self, cr, uid, ids, location_id, product, uom=False, to_date=False):
+    def onchange_uom(self, cr, uid, ids, product_id, product_uom, context=None):
+        res = {'value':{}}
+        if not product_uom or not product_id:
+            return res
+        product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+        uom = self.pool.get('product.uom').browse(cr, uid, product_uom, context=context)
+        if uom.category_id.id != product.uom_id.category_id.id:
+            res['warning'] = {'title': _('Warning'), 'message': _('Selected Unit of Measure does not belong to the same category as the product Unit of Measure')}
+            res['value'].update({'product_uom': product.uom_id.id})
+        return res
+
+    def on_change_product_id(self, cr, uid, ids, location_id, product, to_date=False):
         """ Changes UoM and name if product_id changes.
         @param location_id: Location id
         @param product: Changed product_id
@@ -2931,7 +2953,7 @@
         if not product:
             return {'value': {'product_qty': 0.0, 'product_uom': False, 'prod_lot_id': False}}
         obj_product = self.pool.get('product.product').browse(cr, uid, product)
-        uom = uom or obj_product.uom_id.id
+        uom = obj_product.uom_id.id
         amount = self.pool.get('stock.location')._product_get(cr, uid, location_id, [product], {'uom': uom, 'to_date': to_date, 'compute_child': False})[product]
         result = {'product_qty': amount, 'product_uom': uom, 'prod_lot_id': False}
         return {'value': result}

=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml	2013-12-18 15:57:15 +0000
+++ stock/stock_view.xml	2014-01-15 16:02:43 +0000
@@ -58,7 +58,7 @@
             <field name="arch" type="xml">
                 <form string="Stock Inventory Lines" version="7.0">
                     <group col="4">
-                        <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)" domain="[('type','&lt;&gt;','service')]"/>
+                        <field context="{'location':location_id, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,parent.date)" domain="[('type','&lt;&gt;','service')]"/>
                         <field name="product_qty"/>
                         <field name="product_uom" groups="product.group_uom"/>
                         <field name="prod_lot_id" groups="stock.group_production_lot"/>
@@ -130,9 +130,9 @@
                         <field name="inventory_line_id">
                             <tree string="Products" editable="bottom">
                                 <field domain="[('usage','=','internal')]" name="location_id" groups="stock.group_locations"/>
-                                <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
+                                <field context="{'location':location_id, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
-                                <field name="product_uom" groups="product.group_uom"/>
+                                <field name="product_uom" string="Unit of Measure" on_change="onchange_uom(product_id, product_uom, context)" groups="product.group_uom"/>
                                 <field name="prod_lot_id" groups="stock.group_production_lot"/>
                                 <button name="%(stock.action_view_stock_inventory_line_split)d"
                                     string="Split inventory lines" groups="stock.group_inventory_valuation"
@@ -143,7 +143,7 @@
                                 <group>
                                     <group>
                                         <field domain="[('usage','=','internal')]" name="location_id"/>
-                                        <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
+                                        <field context="{'location':location_id, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
                                     </group>
                                     <group>
                                         <label for="product_qty"/>
@@ -1138,7 +1138,7 @@
                     <field name="create_date" invisible="1" groups="base.group_no_one"/>
                     <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                    <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
+                    <field name="product_uom" string="Unit of Measure" on_change="onchange_uom(product_id, product_uom, context)" groups="product.group_uom"/>
                     <field name="product_uos" groups="product.group_uos"/>
                     <button name="%(stock.move_scrap)d"
                         string="Scrap Products" type="action"
@@ -1234,7 +1234,7 @@
                                 <field name="product_qty"
                                     on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"
                                     class="oe_inline"/>
-                                <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
+                                <field name="product_uom" on_change="onchange_uom(product_id, product_uom, context)" groups="product.group_uom" class="oe_inline"/>
                                 <button name="%(stock.move_scrap)d"
                                         string="Scrap" type="action"
                                         icon="terp-gtk-jump-to-ltr" context="{'scrap': True}"