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

[IMP] Make sure procurement goes only in exception on cancel + simplify wkf 

bzr revid: jco@openerp.com-20140423082808-2gjgowz6h89l5alu
This commit is contained in:
Josse Colpaert 2014-04-23 10:28:08 +02:00
parent 16adb0d75d
commit 6748d2818d
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/purchase/purchase.py
View File

@ -302,10 +302,10 @@ class purchase_order(osv.osv):
order_line_ids = [order_line.id for order_line in order.order_line]
lines += order_line_ids
line.write(cr, uid, order_line_ids, {'state': status}, context=context)
if lines:
if lines and status == 'cancel':
procs = proc_obj.search(cr, uid, [('purchase_line_id', 'in', lines)], context=context)
if procs:
proc_obj.write(cr, uid, procs, {'state': 'cancel'}, context=context)
proc_obj.write(cr, uid, procs, {'state': 'exception'}, context=context)
return True
def button_dummy(self, cr, uid, ids, context=None):
@ -620,10 +620,6 @@ class purchase_order(osv.osv):
return True
return False
def wkf_action_cancel(self, cr, uid, ids, context=None):
self.write(cr, uid, ids, {'state': 'cancel'})
self.set_order_line_status(cr, uid, ids, 'cancel', context=context)
def action_cancel(self, cr, uid, ids, context=None):
for purchase in self.browse(cr, uid, ids, context=context):
@ -638,11 +634,12 @@ class purchase_order(osv.osv):
if inv and inv.state not in ('cancel', 'draft'):
raise osv.except_osv(
_('Unable to cancel this purchase order.'),
_('You must first cancel all receptions related to this purchase order.'))
_('You must first cancel all invoices related to this purchase order.'))
self.pool.get('account.invoice') \
.signal_invoice_cancel(cr, uid, map(attrgetter('id'), purchase.invoice_ids))
self.write(cr, uid, ids, {'state': 'cancel'})
self.set_order_line_status(cr, uid, ids, 'cancel', context=context)
self.signal_purchase_cancel(cr, uid, ids)
return True

2
addons/purchase/purchase_workflow.xml
View File

@ -37,7 +37,7 @@
<field name="name">cancel</field>
<field name="kind">function</field>
<field name="flow_stop">True</field>
<field name="action">wkf_action_cancel()</field>
<field name="action">action_cancel()</field>
</record>
<record id="act_except_invoice" model="workflow.activity">
<field name="wkf_id" ref="purchase_order"/>