From 73091c76b2cdc6b6d2225a1dde0cf95d8236eb18 Mon Sep 17 00:00:00 2001 From: mtr Date: Wed, 15 Dec 2010 16:40:53 +0530 Subject: [PATCH 1/2] [FIX] Sale: called the button_check() method of procurement workflow to cancel procurement lp bug: https://launchpad.net/bugs/588220 fixed bzr revid: mtr@mtr-20101215111053-ax0zi27n0o1y7lza --- addons/sale/sale.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 9dd353a7b20..42627750697 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -604,6 +604,9 @@ class sale_order(osv.osv): for r in self.read(cr, uid, ids, ['invoice_ids']): for inv in r['invoice_ids']: wf_service.trg_validate(uid, 'account.invoice', inv, 'invoice_cancel', cr) + proc_ids = self.pool.get('procurement.order').search(cr, uid, [('origin', '=', sale.name)]) + for proc in proc_ids: + wf_service.trg_validate(uid, 'procurement.order', proc, 'button_check', cr) sale_order_line_obj.write(cr, uid, [l.id for l in sale.order_line], {'state': 'cancel'}) message = _("The sales order '%s' has been cancelled.") % (sale.name,) From d45fb357424216cbf31ee84d474f56249c16f383 Mon Sep 17 00:00:00 2001 From: mtr Date: Thu, 16 Dec 2010 16:03:45 +0530 Subject: [PATCH 2/2] [FIX] Account:changes in the query of _balance of account.move.line lp bug: https://launchpad.net/bugs/690895 fixed bzr revid: mtr@mtr-20101216103345-ues63v1olmx98ojl --- addons/account/account_move_line.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index a9bb550429a..d487873ff20 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -304,7 +304,7 @@ class account_move_line(osv.osv): FROM account_move_line l1, account_move_line l2 WHERE l2.account_id = l1.account_id AND l1.id <= l2.id - AND l2.id IN %%s AND """ + \ + AND l2.id IN %s AND """ + \ self._query_get(cr, uid, obj='l1', context=c) + \ " GROUP BY l2.id"