openerp-dev-web team mailing list archive

["mtr\(OpenERP\)" <mtr@xxxxxxxxxxx>]

mtr(OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #588220 Cancelling sale order should affect Procurements,production orders
  https://bugs.launchpad.net/bugs/588220
  #600547 Invoice totals not updated when a line is moved (store={...} bug?)
  https://bugs.launchpad.net/bugs/600547
  #690895 copy account.move crash 
  https://bugs.launchpad.net/bugs/690895


[FIX] Account:changes in the query of _balance of account.move.line" --fixes lp:690895
[FIX] Sale: called the button_check() method of procurement workflow to cancel procurement"--fixes lp:588220 
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1/+merge/44011
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2010-12-17 04:37:32 +0000
+++ account/account_move_line.py	2010-12-17 06:01:34 +0000
@@ -308,7 +308,7 @@
                     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"
 

=== modified file 'sale/sale.py'
--- sale/sale.py	2010-12-17 04:37:32 +0000
+++ sale/sale.py	2010-12-17 06:01:34 +0000
@@ -576,6 +576,9 @@
             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,)