Merge lp:~openerp-dev/openobject-addons/6.1-opw-576033-rgo into lp:openobject-addons/6.1

[Ravi Gohil (OpenERP)]

Hello,

If we just created a product and saved it, it is impossible to change the unit of the product with the unit which has other category than current unit's category.

Fix has been back-ported from the trunk branch: lp:~openerp-dev/openobject-addons/trunk-bug-894648-amp.

Kindly review the fix.

Thanks.

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Naresh(OpenERP) (nch-openerp)]

well this fix seems some what complicated when a user tries to update the field externally either through say xmlrpc script.

you check the category ID for old and new along with if the move exist or not
 product_move = self.pool.get('stock.move').search(cr, uid, [('product_id', '=', ids[0])])

but you do the move check for just the first product and not all the product that are to be written.

say for eg: I want product with ID 4,5 to change there default UOM from PCE to KM and I have stock move for the product 5. so actually this should not allow me to update but in your case it does.

can you please recheck.

Thanks,
Naresh

review: Needs Fixing

[Ravi Gohil (OpenERP) (rgo-openerp)]

Hello,

Thanks for the review.

I have updated the fix as suggested in above comment.

Please review the fix.

Thanks.

[Ravi Gohil (OpenERP) (rgo-openerp)]

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/6.1-opw-576033-rgo]

6961. By Ravi Gohil (OpenERP) on 2012-08-23

[FIX] product: Fixed the issue caused when multiple ids passed to write: (Maintenance Case : 576033)

[Naresh(OpenERP) (nch-openerp)]

only covers stock what about other modules where product is interacted like SO, PO inventories etc.....

review: Disapprove

Unmerged revisions

6961. By Ravi Gohil (OpenERP) on 2012-08-23

[FIX] product: Fixed the issue caused when multiple ids passed to write: (Maintenance Case : 576033)

=== modified file 'product/product.py'
--- product/product.py	2012-04-03 13:05:28 +0000
+++ product/product.py	2012-08-23 13:51:19 +0000
@@ -354,15 +354,6 @@
             return {'value': {'uom_po_id': uom_id}}
         return {}
 
-    def write(self, cr, uid, ids, vals, context=None):
-        if 'uom_po_id' in vals:
-            new_uom = self.pool.get('product.uom').browse(cr, uid, vals['uom_po_id'], context=context)
-            for product in self.browse(cr, uid, ids, context=context):
-                old_uom = product.uom_po_id
-                if old_uom.category_id.id != new_uom.category_id.id:
-                    raise osv.except_osv(_('UoM categories Mismatch!'), _("New UoM '%s' must belong to same UoM category '%s' as of old UoM '%s'. If you need to change the unit of measure, you may desactivate this product from the 'Procurement & Locations' tab and create a new one.") % (new_uom.name, old_uom.category_id.name, old_uom.name,))
-        return super(product_template, self).write(cr, uid, ids, vals, context=context)
-
     _defaults = {
         '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,

=== modified file 'stock/product.py'
--- stock/product.py	2012-06-19 07:40:07 +0000
+++ stock/product.py	2012-08-23 13:51:19 +0000
@@ -493,6 +493,25 @@
                  "there is a specific valuation account set on the destination location. When not set on the product, the one from the product category is used."),
     }
 
+    def write(self, cr, uid, ids, vals, context=None):
+        if 'uom_po_id' in vals:
+            new_uom = self.pool.get('product.uom').browse(cr, uid, vals['uom_po_id'], context=context)
+            write_ids = []
+            warning = ""
+            for product in self.browse(cr, uid, ids, context=context):
+                product_move = self.pool.get('stock.move').search(cr, uid, [('product_id', '=', product.id)])
+                if product_move:
+                    old_uom = product.uom_po_id
+                    if old_uom.category_id.id != new_uom.category_id.id:
+                        warning +=  _("Product's new UoM '%s' must belong to same UoM category '%s' as of old UoM '%s'.Because product %s 's stock move is already created'") % (new_uom.name, old_uom.category_id.name, old_uom.name, product.name) + "\n"
+                    else:
+                        write_ids.append(product.id)
+                else:
+                    write_ids.append(product.id)
+            if warning:
+                raise osv.except_osv(_('UoM categories Mismatch!'), warning)
+            return super(product_template, self).write(cr, uid, write_ids, vals, context=context)
+
 product_template()
 
 class product_category(osv.osv):