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']: