Merge lp:~vauxoo/openobject-addons/addons-6.1-mrp_bug_bom-dev-julio into lp:openobject-addons/6.1

[Julio Serna-http://www.vauxoo.com]

modifies query that gets the BoM, validating if the BoM is active or if the date is in valid range

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

Hi Julio,
Your fix works great.
You may also use search() instead,
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'))]

How about this one?
I will fix using search() for 7.0.

Thanks!

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

Searh function() is better.
We are agree.
Thank you

Regards!

Unmerged revisions

6984. By Julio Serna-http://www.vauxoo.com on 2012-09-11

[FIX][mrp] modified function _bom_find to get the BoM considering if active or dates

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2012-07-23 08:44:52 +0000
+++ mrp/mrp.py	2012-09-12 00:05:23 +0000
@@ -279,7 +279,13 @@
         @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,))
+        cr.execute(""" select id
+            from mrp_bom where product_id=%s 
+            and bom_id is null 
+            and active=True
+            and (date_start is null or date_start <= current_date)
+            and (date_stop is null or date_stop >= current_date)
+            order by sequence """, (product_id,))
         ids = map(lambda x: x[0], cr.fetchall())
         max_prop = 0
         result = False