odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[WIP] search_suitable_rule should be responsible for taking route_ids into account or not 

bzr revid: jco@openerp.com-20130717124255-e3a9i0nh85z00895
This commit is contained in:
Josse Colpaert 2013-07-17 14:42:55 +02:00
parent 208f56c284
commit 1caa112b20
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/stock/procurement.py
View File

@ -57,7 +57,7 @@ class procurement_order(osv.osv):
def _find_suitable_rule(self, cr, uid, procurement, context=None):
rule_id = super(procurement_order, self)._find_suitable_rule(cr, uid, procurement, context=context)
if not rule_id:
rule_id = self._search_suitable_rule(cr, uid, procurement, [('action', '=', 'move'), ('location_id', '=', procurement.location_id.id)], context=context)
rule_id = self._search_suitable_rule(cr, uid, procurement, [('location_id', '=', procurement.location_id.id)], context=context) #action=move
rule_id = rule_id and rule_id[0] or False
return rule_id

13
addons/stock_location/stock_location.py
View File

@ -158,15 +158,22 @@ class procurement_order(osv.osv):
})
return d
def _find_suitable_rule(self, cr, uid, procurement, context=None):
rule_id = super(procurement_order, self)._find_suitable_rule(cr, uid, procurement, context=context)
if not rule_id:
rule_id = self._search_suitable_rule(cr, uid, procurement, [('location_id', '=', procurement.location_id.id)], context=context) #action=move
rule_id = rule_id and rule_id[0] or False
return rule_id
def _search_suitable_rule(self, cr, uid, procurement, domain, context=None):
'''we try to first find a rule among the ones defined on the procurement order group and if none is found, we try on the routes defined for the product, and finally we fallback on the default behavior'''
route_ids = [x.id for x in procurement.route_ids]
res = super(procurement_order, self)._search_suitable_rule(cr, uid, procurement, domain + [('route_id', 'in', route_ids)], context=context)
res = self.pool.get('procurement.rule').search(cr, uid, domain + [('route_id', 'in', route_ids)], context=context)
if not res:
route_ids = [x.id for x in procurement.product_id.route_ids]
res = super(procurement_order, self)._search_suitable_rule(cr, uid, procurement, domain + [('route_id', 'in', route_ids)], context=context)
self.pool.get('procurement.rule').search(cr, uid, domain + [('route_id', 'in', route_ids)], context=context)
if not res:
return super(procurement_order, self)._search_suitable_rule(cr, uid, procurement, domain, context=context)
self.pool.get('procurement.rule').search(cr, uid, domain, context=context)
return res