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

[FIX] purchase_requisition: broken procurement wkf 

If a purchase requisition is created instead of a purchase order for a procurement order, the method make_po should not return the id of this requisition, as methods calling the make_po method expects ids of purchase orders, not purchase requisition ids.

Besides, on purchase requisition done or cancel, we set the procurement order accordingly, without the use of the workflow. We consider this as crappy, the proper fix should be the use of a dedicated workflow for purchase requisition, but I cannot be done in stable branches. This aims trunk/master.
This commit is contained in:
Denis Ledoux 2014-06-24 12:12:27 +02:00
parent 05a87c9f8d
commit 7d3453d119
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/purchase_requisition/purchase_requisition.py
View File

@ -72,6 +72,8 @@ class purchase_requisition(osv.osv):
for purchase_id in purchase.purchase_ids: for purchase_id in purchase.purchase_ids:
if str(purchase_id.state) in('draft'): if str(purchase_id.state) in('draft'):
purchase_order_obj.action_cancel(cr,uid,[purchase_id.id]) purchase_order_obj.action_cancel(cr,uid,[purchase_id.id])
procurement_ids = self.pool['procurement.order'].search(cr, uid, [('requisition_id', 'in', ids)], context=context)
self.pool['procurement.order'].write(cr, uid, procurement_ids, {'state': 'cancel'}, context=context)
return self.write(cr, uid, ids, {'state': 'cancel'}) return self.write(cr, uid, ids, {'state': 'cancel'})
def tender_in_progress(self, cr, uid, ids, context=None): def tender_in_progress(self, cr, uid, ids, context=None):
@ -81,6 +83,8 @@ class purchase_requisition(osv.osv):
return self.write(cr, uid, ids, {'state': 'draft'}) return self.write(cr, uid, ids, {'state': 'draft'})
def tender_done(self, cr, uid, ids, context=None): def tender_done(self, cr, uid, ids, context=None):
procurement_ids = self.pool['procurement.order'].search(cr, uid, [('requisition_id', 'in', ids)], context=context)
self.pool['procurement.order'].write(cr, uid, procurement_ids, {'state': 'done'}, context=context)
return self.write(cr, uid, ids, {'state':'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S')}, context=context) return self.write(cr, uid, ids, {'state':'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
def _planned_date(self, requisition, delay=0.0): def _planned_date(self, requisition, delay=0.0):
@ -272,7 +276,7 @@ class procurement_order(osv.osv):
for procurement in self.browse(cr, uid, ids, context=context): for procurement in self.browse(cr, uid, ids, context=context):
if procurement.product_id.purchase_requisition: if procurement.product_id.purchase_requisition:
user_company = self.pool['res.users'].browse(cr, uid, uid, context=context).company_id user_company = self.pool['res.users'].browse(cr, uid, uid, context=context).company_id
req = res[procurement.id] = requisition_obj.create(cr, uid, { req = requisition_obj.create(cr, uid, {
'origin': procurement.origin, 'origin': procurement.origin,
'date_end': procurement.date_planned, 'date_end': procurement.date_planned,
'warehouse_id': self._get_warehouse(procurement, user_company), 'warehouse_id': self._get_warehouse(procurement, user_company),
@ -288,6 +292,7 @@ class procurement_order(osv.osv):
'state': 'running', 'state': 'running',
'requisition_id': req 'requisition_id': req
}) })
res[procurement.id] = 0
else: else:
non_requisition.append(procurement.id) non_requisition.append(procurement.id)