diff --git a/addons/account/account.py b/addons/account/account.py index b1c19476548..625bcd1a6a8 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2361,7 +2361,7 @@ class account_chart_template(osv.osv): 'property_account_income_categ': fields.many2one('account.account.template','Income Category Account'), 'property_account_expense': fields.many2one('account.account.template','Expense Account on Product Template'), 'property_account_income': fields.many2one('account.account.template','Income Account on Product Template'), - 'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Surplus Account', domain=[('type', '=', 'payable')] , help='This Account is used for transferring Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profilt & Loss Report'), + 'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')] , help='This Account is used for transferring Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profilt & Loss Report'), } account_chart_template() @@ -2442,14 +2442,14 @@ class account_tax_template(osv.osv): account_tax_template() -# Fiscal Position Templates +# Fiscal Mapping Templates class account_fiscal_position_template(osv.osv): _name = 'account.fiscal.position.template' - _description = 'Template for Fiscal Position' + _description = 'Template for Fiscal Mapping' _columns = { - 'name': fields.char('Fiscal Position Template', size=64, translate=True, required=True), + 'name': fields.char('Fiscal Mapping Template', size=64, translate=True, 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') @@ -2459,11 +2459,11 @@ account_fiscal_position_template() class account_fiscal_position_tax_template(osv.osv): _name = 'account.fiscal.position.tax.template' - _description = 'Fiscal Position Template Tax Mapping' + _description = 'Template Tax Fiscal Mapping' _rec_name = 'position_id' _columns = { - 'position_id': fields.many2one('account.fiscal.position.template', 'Fiscal Position', required=True, ondelete='cascade'), + 'position_id': fields.many2one('account.fiscal.position.template', 'Fiscal Mapping', required=True, ondelete='cascade'), 'tax_src_id': fields.many2one('account.tax.template', 'Tax Source', required=True), 'tax_dest_id': fields.many2one('account.tax.template', 'Replacement Tax') } @@ -2472,10 +2472,10 @@ account_fiscal_position_tax_template() class account_fiscal_position_account_template(osv.osv): _name = 'account.fiscal.position.account.template' - _description = 'Fiscal Position Template Account Mapping' + _description = 'Template Account Fiscal Mapping' _rec_name = 'position_id' _columns = { - 'position_id': fields.many2one('account.fiscal.position.template', 'Fiscal Position', required=True, ondelete='cascade'), + 'position_id': fields.many2one('account.fiscal.position.template', 'Fiscal Mapping', required=True, ondelete='cascade'), 'account_src_id': fields.many2one('account.account.template', 'Account Source', domain=[('type','<>','view')], required=True), 'account_dest_id': fields.many2one('account.account.template', 'Account Destination', domain=[('type','<>','view')], required=True) } diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 662fdda69d5..53c08525a6a 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -730,7 +730,7 @@ class account_bank_statement_line(osv.osv): 'reconcile_amount': fields.function(_reconcile_amount, string='Amount reconciled', method=True, type='float'), 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of bank statement lines."), - 'company_id': fields.related('statement_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True), + 'company_id': fields.related('statement_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True), } _defaults = { 'name': lambda self,cr,uid,context={}: self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement.line'), diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py index daf2f9ba8f2..8cdb20aa225 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -267,7 +267,7 @@ class account_cash_statement(osv.osv): super(account_cash_statement, self).write(cr, uid, ids, vals) res = self._get_starting_balance(cr, uid, ids) for rs in res: - super(account_cash_statement, self).write(cr, uid, rs, res.get(rs)) + super(account_cash_statement, self).write(cr, uid, [rs], res.get(rs)) return True def onchange_journal_id(self, cr, uid, statement_id, journal_id, context={}): diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 7ddd4ad42f0..990dd277d65 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -1202,7 +1202,7 @@ class account_move_line(osv.osv): tax_sign = 'tax_sign' tmp_cnt = 0 - for tax in tax_obj.compute(cr, uid, [tax_id], total, 1.00): + for tax in tax_obj.compute_all(cr, uid, [tax_id], total, 1.00).get('taxes'): #create the base movement if tmp_cnt == 0: if tax[base_code]: diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml index be0569fa65f..14efecf350d 100644 --- a/addons/account/account_report.xml +++ b/addons/account/account_report.xml @@ -4,7 +4,7 @@ - + diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 5e4e7aa2ccb..bcd5d8b233b 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -207,9 +207,9 @@ - + - + @@ -566,6 +566,42 @@ + + + account.bank.statement.form + account.bank.statement + form + +
+ + + + + + + + + +