Merge lp:~openerp-dev/openobject-addons/7.0-opw-591314-rha into lp:openobject-addons/7.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 belong to validity period should be
restricted to be used in a manufacturing process.

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

[Moisés López - http://www.vauxoo.com (moylop260)]

Helllo Rifakat,
Do you have news?

[Martin Trigaux (OpenERP) (mat-openerp)]

Hello

- don't hard code date format, use the DEFAULT_SERVER_DATETIME_FORMAT variable
- don't user order argument if not needed, here we have already _order = "sequence" on the model
- the '&' in the domain is useless
- pass the context to search

Regards

review: Needs Fixing

[Rifakat Husen (OpenERP) (rha-openerp)]

Hi Martin,

Thanks for your review.
I have updated fix except passing context to search(), can't pass context because _bom_find() itself doesn't have context as parameter.

Regards.

[Martin Trigaux (OpenERP) (mat-openerp)]

You are right for the context, thanks for the update, merged into 7.0

revno: 9477 [merge]
revision-id: <email address hidden>

review: Approve

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2013-09-16 12:34:42 +0000
+++ mrp/mrp.py	2013-09-24 06:33:53 +0000
@@ -296,8 +296,10 @@
         """
         if properties is None:
             properties = []
-        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(DEFAULT_SERVER_DATETIME_FORMAT)),
+                   '|', ('date_stop', '=', False), ('date_stop', '>=', time.strftime(DEFAULT_SERVER_DATETIME_FORMAT))]
+        ids = self.search(cr, uid, domain)
         max_prop = 0
         result = False
         for bom in self.pool.get('mrp.bom').browse(cr, uid, ids):