← Back to team overview

openerp-community-reviewer team mailing list archive

[Merge] lp:~acsone-openerp/ocb-addons/7.0-bug-1278080-revert-8932 into lp:ocb-addons

 

Laurent Mignon (Acsone) has proposed merging lp:~acsone-openerp/ocb-addons/7.0-bug-1278080-revert-8932 into lp:ocb-addons.

Requested reviews:
  OpenERP Community Backports Team (ocb)
Related bugs:
  Bug #1278080 in OpenERP Community Backports (Addons): "Broken yml test in account_payment"
  https://bugs.launchpad.net/ocb-addons/+bug/1278080

For more details, see:
https://code.launchpad.net/~acsone-openerp/ocb-addons/7.0-bug-1278080-revert-8932/+merge/206805

[FIX] lp:1278080 Broken yml test in account_payment
Test is broken since the rev 8932 when the mp  https://code.launchpad.net/~camptocamp/ocb-addons/7.0-fix-bug-1102078 has been merged in ocb-addons. This mp has been finally rejected on the openobject-addons branch and the related bug fixed in an other way in rev 9314 (http://bazaar.launchpad.net/~openerp/openobject-addons/7.0/revision/9314.) The following mp undo changes introduced in rev 8932. Iv'followed the steps described in lp:1102078 and everything seems ok now without the changes of rev 8932. 

-- 
https://code.launchpad.net/~acsone-openerp/ocb-addons/7.0-bug-1278080-revert-8932/+merge/206805
Your team OpenERP Community Backports Team is requested to review the proposed merge of lp:~acsone-openerp/ocb-addons/7.0-bug-1278080-revert-8932 into lp:ocb-addons.
=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2014-02-05 10:03:24 +0000
+++ account/account_invoice.py	2014-02-17 20:08:30 +0000
@@ -793,11 +793,10 @@
 
     def action_date_assign(self, cr, uid, ids, *args):
         for inv in self.browse(cr, uid, ids):
-            if not inv.date_due:
-                res = self.onchange_payment_term_date_invoice(cr, uid, inv.id,
+            res = self.onchange_payment_term_date_invoice(cr, uid, inv.id,
                                                               inv.payment_term.id, inv.date_invoice)
-                if res and res['value']:
-                    self.write(cr, uid, [inv.id], res['value'])
+            if res and res['value']:
+                self.write(cr, uid, [inv.id], res['value'])
         return True
 
     def finalize_invoice_move_lines(self, cr, uid, invoice_browse, move_lines):


Follow ups