From 7b8a28bb3a25bd5f155d53968c641324cf218868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Najla=C3=A2?= Date: Mon, 7 May 2012 13:50:51 +0200 Subject: [PATCH 1/3] [FIX] account: fixed starting details of bank statement bzr revid: nel@tinyerp.com-20120507115051-cqz3mxi1trbmcuvr --- addons/account/__openerp__.py | 4 ++-- addons/account/account_cash_statement.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index 850a8f49842..374c18d2d82 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -115,8 +115,8 @@ module named account_voucher. 'project/wizard/account_analytic_journal_report_view.xml', 'project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml', 'project/wizard/account_analytic_chart_view.xml', - 'product_view.xml', - 'account_assert_test.xml', +# 'product_view.xml', +# 'account_assert_test.xml', 'process/statement_process.xml', 'process/customer_invoice_process.xml', 'process/supplier_invoice_process.xml', diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py index 567af74b59c..28248ca621a 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -214,7 +214,8 @@ class account_cash_statement(osv.osv): if self.pool.get('account.journal').browse(cr, uid, vals['journal_id'], context=context).type == 'cash': open_close = self._get_cash_open_close_box_lines(cr, uid, context) if vals.get('starting_details_ids', False): - for start in vals.get('starting_details_ids'): + starting_details_ids = [val for val in vals.get('starting_details_ids') if val[2]] + for start in starting_details_ids: dict_val = start[2] for end in open_close['end']: if end[2]['pieces'] == dict_val['pieces']: From 071158358f1ee35c980061ca692b47b2784f5574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Najla=C3=A2?= Date: Mon, 7 May 2012 13:53:11 +0200 Subject: [PATCH 2/3] remove comment for openerp file bzr revid: nel@tinyerp.com-20120507115311-6eal7ta2qcps97xl --- addons/account/__openerp__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index 374c18d2d82..d8a0df95bcc 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -115,8 +115,8 @@ module named account_voucher. 'project/wizard/account_analytic_journal_report_view.xml', 'project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml', 'project/wizard/account_analytic_chart_view.xml', -# 'product_view.xml', -# 'account_assert_test.xml', + 'product_view.xml', + 'account_assert_test.xml', 'process/statement_process.xml', 'process/customer_invoice_process.xml', 'process/supplier_invoice_process.xml', @@ -133,7 +133,7 @@ module named account_voucher. 'project/analytic_account_demo.xml', 'demo/account_minimal.xml', 'demo/account_invoice_demo.xml', -# 'account_unit_test.xml', + 'account_unit_test.xml', ], 'test': [ 'test/account_customer_invoice.yml', From 74d305880344de991dba6f9b85ea48d67a702632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Najla=C3=A2?= Date: Mon, 7 May 2012 14:23:49 +0200 Subject: [PATCH 3/3] [FIX] account: fixed starting details of bank statement bzr revid: nel@tinyerp.com-20120507122349-795ygrwqm1uuvpwm --- addons/account/account_cash_statement.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py index 28248ca621a..cd510a1d5d0 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -214,12 +214,12 @@ class account_cash_statement(osv.osv): if self.pool.get('account.journal').browse(cr, uid, vals['journal_id'], context=context).type == 'cash': open_close = self._get_cash_open_close_box_lines(cr, uid, context) if vals.get('starting_details_ids', False): - starting_details_ids = [val for val in vals.get('starting_details_ids') if val[2]] + starting_details_ids = vals.get('starting_details_ids') for start in starting_details_ids: - dict_val = start[2] + dict_val = start[2] or {} for end in open_close['end']: - if end[2]['pieces'] == dict_val['pieces']: - end[2]['number'] += dict_val['number'] + if end[2]['pieces'] == dict_val.get('pieces', 0.0): + end[2]['number'] += dict_val.get('number', 0.0) vals.update({ # 'ending_details_ids': open_close['start'], 'starting_details_ids': open_close['end']