diff --git a/addons/account/account.py b/addons/account/account.py index 3fed8c45f17..c60a37602cf 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2512,7 +2512,7 @@ class account_fiscal_position_template(osv.osv): _description = 'Template for Fiscal Position' _columns = { - 'name': fields.char('Fiscal Position Template', size=64, translate=True, required=True), + 'name': fields.char('Fiscal Position Template', size=64, required=True), 'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True), 'account_ids': fields.one2many('account.fiscal.position.account.template', 'position_id', 'Account Mapping'), 'tax_ids': fields.one2many('account.fiscal.position.tax.template', 'position_id', 'Tax Mapping') diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 60228a7ffe0..9010fc3594d 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -45,7 +45,11 @@ class account_move_line(osv.osv): if context.get('company_id', False): company_clause = " AND " +obj+".company_id = %s" % context.get('company_id', False) if not context.get('fiscalyear', False): - fiscalyear_ids = fiscalyear_obj.search(cr, uid, [('state', '=', 'draft')]) + if context.get('all_fiscalyear', False): + #this option is needed by the aged balance report because otherwise, if we search only the draft ones, an open invoice of a closed fiscalyear won't be displayed + fiscalyear_ids = fiscalyear_obj.search(cr, uid, []) + else: + fiscalyear_ids = fiscalyear_obj.search(cr, uid, [('state', '=', 'draft')]) else: #for initial balance as well as for normal query, we check only the selected FY because the best practice is to generate the FY opening entries fiscalyear_ids = [context['fiscalyear']] @@ -74,7 +78,7 @@ class account_move_line(osv.osv): context['periods'] = fiscalperiod_obj.build_ctx_periods(cr, uid, context['period_from'], context['period_to']) if context.get('periods', False): if initial_bal: - query = obj+".state <> 'draft' AND "+obj+".period_id IN (SELECT id FROM account_period WHERE fiscalyear_id IN (%s) %s %s)" % (fiscalyear_clause, where_move_state, where_move_lines_by_date) + query = obj+".state <> 'draft' AND "+obj+".period_id IN (SELECT id FROM account_period WHERE fiscalyear_id IN (%s)) %s %s" % (fiscalyear_clause, where_move_state, where_move_lines_by_date) period_ids = fiscalperiod_obj.search(cr, uid, [('id', 'in', context['periods'])], order='date_start', limit=1) if period_ids and period_ids[0]: first_period = fiscalperiod_obj.browse(cr, uid, period_ids[0], context=context) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 71830154d74..0ef24bcd38d 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -602,7 +602,7 @@ - account.bank.statement.form + account.bank.statement.reconcile.form account.bank.statement form @@ -1519,70 +1519,6 @@ - - account.bank.statement.form - account.bank.statement - - form - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -