[FIX] mrp: improved fix, used DEFAULT_SERVER_DATETIME_FORMAT for date, removed extra AND and _order from search()

bzr revid: rha@tinyerp.com-20130924062648-qshruwnukmtn0b7w
2013-09-24 11:56:48 +05:30
parent ff3a6ddde6 0b7f30af8b
commit e2e20bae4c
1 changed files with 4 additions and 2 deletions
@@ -296,8 +296,10 @@ class mrp_bom(osv.osv):
        """
        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):