Merge lp:~openerp-dev/openobject-addons/trunk-wms-1269504-csn into lp:~openerp-dev/openobject-addons/trunk-wms

Proposed by Cedric Snauwaert (OpenERP)
Status: Merged
Merged at revision: 9519
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-wms-1269504-csn
Merge into: lp:~openerp-dev/openobject-addons/trunk-wms
Diff against target: 12 lines (+1/-1)
1 file modified
purchase_requisition/purchase_requisition.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-wms-1269504-csn
Reviewer Review Type Date Requested Status
qdp (OpenERP) Pending
Review via email: mp+202475@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'purchase_requisition/purchase_requisition.py'
2--- purchase_requisition/purchase_requisition.py 2013-11-29 16:56:44 +0000
3+++ purchase_requisition/purchase_requisition.py 2014-01-21 15:02:26 +0000
4@@ -403,7 +403,7 @@
5 def _run(self, cr, uid, procurement, context=None):
6 requisition_obj = self.pool.get('purchase.requisition')
7 warehouse_obj = self.pool.get('stock.warehouse')
8- if procurement.product_id.purchase_requisition:
9+ if procurement.rule_id and procurement.rule_id.action == 'buy' and procurement.product_id.purchase_requisition:
10 warehouse_id = warehouse_obj.search(cr, uid, [('company_id', '=', procurement.company_id.id)], context=context)
11 requisition_id = requisition_obj.create(cr, uid, {
12 'origin': procurement.origin,