Merge lp:~openerp-dev/openobject-addons/trunk-bug-707287-mma into lp:openobject-addons

[Mayur Maheshwari(OpenERP)]

[Rucha (Open ERP) (rpa-openerp)]

improvements should also to be done in check_produce() to check for product mto, produce

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-707287-mma]

4766. By Mayur Maheshwari(OpenERP) on 2011-06-07

[FIX]procurement:excepation message when product mto, produce.

[Mayur Maheshwari(OpenERP) (mma-openerp)]

review: Needs Resubmitting

[Rucha (Open ERP) (rpa-openerp)]

review: Approve

[lp:~openerp-dev/openobject-addons/trunk-bug-707287-mma]

4767. By Mayur Maheshwari(OpenERP) on 2011-09-15

[MERGE]: Merge with lp:openobject-addons

[Fabien (Open ERP) (fp-tinyerp)]

see my comment in the related bug.

Unmerged revisions

4767. By Mayur Maheshwari(OpenERP) on 2011-09-15

[MERGE]: Merge with lp:openobject-addons

4766. By Mayur Maheshwari(OpenERP) on 2011-06-07

[FIX]procurement:excepation message when product mto, produce.

4765. By Mayur Maheshwari(OpenERP) on 2011-06-03

[FIX]procurement:excepation message when Procurement UOM and product purchase UOM mismatch!

=== modified file 'procurement/procurement.py'
--- procurement/procurement.py	2011-07-01 23:41:24 +0000
+++ procurement/procurement.py	2011-09-15 12:39:14 +0000
@@ -258,6 +258,10 @@
         res = True
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         for procurement in self.browse(cr, uid, ids, context=context):
+            if procurement.product_id.uom_po_id.category_id.id != procurement.product_uom.category_id.id:
+                message = _("Procurement UOM and product purchase UOM categories mismatch!")
+                cr.execute('update procurement_order set state=%s,  message=%s where id=%s', ('exception', message, procurement.id))
+                return False
             if procurement.product_id.product_tmpl_id.supply_method <> 'produce':
                 partner_list = sorted([(partner_id.sequence, partner_id) for partner_id in  procurement.product_id.seller_ids if partner_id])
                 if partner_list:
@@ -281,6 +285,10 @@
         user = self.pool.get('res.users').browse(cr, uid, uid)
         partner_obj = self.pool.get('res.partner')
         for procurement in self.browse(cr, uid, ids):
+            if procurement.product_id.uom_po_id.category_id.id != procurement.product_uom.category_id.id:
+                message = _("Procurement UOM and product purchase UOM categories mismatch!")
+                cr.execute('update procurement_order set state=%s,  message=%s where id=%s', ('exception', message, procurement.id))
+                return False
             if procurement.product_id.product_tmpl_id.supply_method <> 'buy':
                 return False
             if not procurement.product_id.seller_ids:
@@ -293,7 +301,6 @@
                 cr.execute('update procurement_order set message=%s where id=%s',
                            (_('No default supplier defined for this product'), procurement.id))
                 return False
-
             if user.company_id and user.company_id.partner_id:
                 if partner.id == user.company_id.partner_id.id:
                     return False
@@ -366,6 +373,10 @@
         @return: True or move id.
         """
         ok = True
+        if procurement.product_id.uom_po_id.category_id.id != procurement.product_uom.category_id.id:
+            message = _("Procurement UOM and product purchase UOM categories mismatch!")
+            cr.execute('update procurement_order set state=%s,  message=%s where id=%s', ('exception', message, procurement.id))
+            return False
         if procurement.move_id:
             message = False
             id = procurement.move_id.id