From 4910b5e654f7ff54c71e5a72269e2d3e39c5c398 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 26 Jun 2013 11:34:12 +0200 Subject: [PATCH] [FIX] point_of_sale: don't group move lines if debit and credit lp bug: https://launchpad.net/bugs/1127114 fixed bzr revid: mat@openerp.com-20130626093412-or5k3eznjsxbvgu3 --- addons/point_of_sale/point_of_sale.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 9e0023f00c3..cd87117310c 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -973,11 +973,11 @@ class pos_order(osv.osv): }) if data_type == 'product': - key = ('product', values['partner_id'], values['product_id']) + key = ('product', values['partner_id'], values['product_id'], values['debit'] > 0) elif data_type == 'tax': - key = ('tax', values['partner_id'], values['tax_code_id'],) + key = ('tax', values['partner_id'], values['tax_code_id'], values['debit'] > 0) elif data_type == 'counter_part': - key = ('counter_part', values['partner_id'], values['account_id']) + key = ('counter_part', values['partner_id'], values['account_id'], values['debit'] > 0) else: return