Merge lp:~openerp-dev/openobject-addons/6.0-opw-591314-rha into lp:openobject-addons/6.0

[Rifakat Husen (OpenERP)]

Manufacturing neither consider the activation of a bill attached to produceable product nor
check validity time period/activation time period of the particular bill(Valid From-Valid Until).

Deactivated bill of material(BoM) or the bills which does not belong to validity period should be
restricted to be used in a manufacturing process.

I enhance checking. Restrict deactivated and invalid BoM in MO.

Unmerged revisions

5467. By Rifakat Husen (OpenERP) on 2013-04-15

[FIX] mrp: allow only those bills which are active and not expired(belongs to specific period) in manufacturing

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2013-03-26 08:08:25 +0000
+++ mrp/mrp.py	2013-04-18 06:01:34 +0000
@@ -284,8 +284,10 @@
         @param properties: List of related properties.
         @return: False or BoM id.
         """
-        cr.execute('select id from mrp_bom where product_id=%s and bom_id is null order by sequence', (product_id,))
-        ids = map(lambda x: x[0], cr.fetchall())
+        domain = [('product_id', '=', product_id), ('bom_id', '=', False), '&',
+            '|', ('date_start', '=', False), ('date_start', '<=', time.strftime('%Y-%m-%d %H:%M:%S')),
+            '|', ('date_stop', '=', False), ('date_stop', '>=', time.strftime('%Y-%m-%d %H:%M:%S'))]
+        ids = self.search(cr, uid, domain, order='sequence')
         max_prop = 0
         result = False
         for bom in self.pool.get('mrp.bom').browse(cr, uid, ids):