From c57cc2a2b668879e1b1c6e1f4dd0d57e3c9d1059 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 9 May 2012 16:41:08 +0200 Subject: [PATCH] [FIX] point_of_sale: Confirm the bank statements for the pos session [FIX] account_bank_statement_extensions: fix bzr revid: stw@openerp.com-20120509144108-n5ol7twovy639s7s --- .../account_bank_statement.py | 7 ++++--- addons/point_of_sale/point_of_sale.py | 5 +---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/addons/account_bank_statement_extensions/account_bank_statement.py b/addons/account_bank_statement_extensions/account_bank_statement.py index 6fb51bbc4aa..5590dc81bce 100644 --- a/addons/account_bank_statement_extensions/account_bank_statement.py +++ b/addons/account_bank_statement_extensions/account_bank_statement.py @@ -42,9 +42,10 @@ class account_bank_statement(osv.osv): def button_confirm_bank(self, cr, uid, ids, context=None): super(account_bank_statement, self).button_confirm_bank(cr, uid, ids, context=context) for st in self.browse(cr, uid, ids, context=context): - cr.execute("UPDATE account_bank_statement_line \ - SET state='confirm' WHERE id in %s ", - (tuple([x.id for x in st.line_ids]),)) + if st.line_ids: + cr.execute("UPDATE account_bank_statement_line \ + SET state='confirm' WHERE id in %s ", + (tuple([x.id for x in st.line_ids]),)) return True def button_cancel(self, cr, uid, ids, context=None): diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 7010200a26e..8ebc81cf05c 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -317,10 +317,7 @@ class pos_session(osv.osv): # Close CashBox for record in self.browse(cr, uid, ids, context=context): for st in record.statement_ids: - if st.journal_id.type == 'cash': - st.button_confirm_cash(context=context) - if st.journal_id.type == 'bank': - st.button_confirm_bank(context=context) + getattr(st, 'button_confirm_%s' % st.journal_id.type)(context=context) return self.write(cr, uid, ids, {'state' : 'closing_control', 'stop_at' : time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)