diff --git a/addons/account/models/account_reconcile_model.py b/addons/account/models/account_reconcile_model.py index cd3065fefe9..cec7ffcb54e 100644 --- a/addons/account/models/account_reconcile_model.py +++ b/addons/account/models/account_reconcile_model.py @@ -330,10 +330,10 @@ class AccountReconcileModel(models.Model): for tax_res in res['taxes']: tax = self.env['account.tax'].browse(tax_res['id']) balance = tax_res['amount'] - + name = ' '.join([x for x in [base_line_dict.get('name', ''), tax_res['name']] if x]) new_aml_dicts.append({ 'account_id': tax_res['account_id'] or base_line_dict['account_id'], - 'name': tax_res['name'], + 'name': name, 'partner_id': base_line_dict.get('partner_id'), 'balance': balance, 'debit': balance > 0 and balance or 0, @@ -416,6 +416,7 @@ class AccountReconcileModel(models.Model): 'analytic_account_id': line.analytic_account_id.id, 'analytic_tag_ids': [(6, 0, line.analytic_tag_ids.ids)], 'reconcile_model_id': self.id, + 'journal_id': line.journal_id.id, } lines_vals_list.append(writeoff_line) diff --git a/addons/account/views/account_reconcile_model_views.xml b/addons/account/views/account_reconcile_model_views.xml index bee7e79fe25..12f52943e7d 100644 --- a/addons/account/views/account_reconcile_model_views.xml +++ b/addons/account/views/account_reconcile_model_views.xml @@ -238,18 +238,23 @@ + attrs="{'column_invisible': [('parent.rule_type', '!=', 'writeoff_button')]}" + optional="hide"/> + widget="many2many_tags" + optional="hide"/> + groups="analytic.group_analytic_accounting" + optional="hide"/> + groups="analytic.group_analytic_tags" + optional="hide"/> + attrs="{'invisible': [('show_force_tax_included', '=', False)]}" + optional="hide"/>