Joël Grand-Guillaume @ camptocamp has proposed merging
lp:~jgrandguillaume-c2c/openobject-addons/trunk-account_constraints-jge2 into
lp:~openerp-dev/openobject-addons/trunk-account_constraints-qdp2.
Requested reviews:
qdp (OpenERP) (qdp)
For more details, see:
https://code.launchpad.net/~jgrandguillaume-c2c/openobject-addons/trunk-account_constraints-jge2/+merge/136396
Hi Quentin,
My last merge proposal that correct the runbot, BUT NOT last Luc Maurer's
comment about the fiscal year and account move's date.
Thanks,
Joël
--
https://code.launchpad.net/~jgrandguillaume-c2c/openobject-addons/trunk-account_constraints-jge2/+merge/136396
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-account_constraints-qdp2.
=== modified file 'account_payment/account_invoice.py'
--- account_payment/account_invoice.py 2012-11-27 10:24:42 +0000
+++ account_payment/account_invoice.py 2012-11-27 12:54:26 +0000
@@ -33,10 +33,17 @@
def action_cancel(self, cr, uid, ids, context=None):
payment_line_obj = self.pool.get('payment.line')
for inv in self.browse(cr, uid, ids, context=context):
+<<<<<<< TREE
pl_line_ids = []
if inv.move_id and inv.move_id.line_id:
inv_mv_lines = [x.id for x in inv.move_id.line_id]
pl_line_ids = payment_line_obj.search(cr, uid, [('move_line_id','in',inv_mv_lines)], context=context)
+=======
+ pl_line_ids = False
+ if inv.move_id and inv.move_id.line_id:
+ inv_mv_lines = [x.id for x in inv.move_id.line_id]
+ pl_line_ids = payment_line_obj.search(cr, uid, [('move_line_id','in',inv_mv_lines)], context=context)
+>>>>>>> MERGE-SOURCE
if pl_line_ids:
pay_line = payment_line_obj.browse(cr, uid, pl_line_ids, context=context)
payment_order_name = ','.join(map(lambda x: x.order_id.reference, pay_line))
=== modified file 'account_voucher/test/case5_suppl_usd_usd.yml'
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
