diff --git a/addons/account/__manifest__.py b/addons/account/__manifest__.py
index fba849af309bf852d1c810824239b8b1715e7a6e..7c3a6b642ddbe239fa75fff80f7b217ce7abe879 100644
--- a/addons/account/__manifest__.py
+++ b/addons/account/__manifest__.py
@@ -76,8 +76,8 @@ You could use this simplified accounting in case you work with an (external) acc
"static/src/xml/account_report_backend.xml",
"static/src/xml/bills_tree_upload_views.xml",
'static/src/xml/account_journal_activity.xml',
+ 'static/src/xml/grouped_view_widget.xml',
'static/src/xml/tax_group.xml',
- "static/src/xml/aml_preview_templates.xml",
],
'installable': True,
'application': True,
diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index c21df95feaa897d6fe7bac3563ff5cc3ecf71bbc..f6aa47d517ffd4589172f87494a6e14256435401 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -2455,6 +2455,20 @@ class AccountMove(models.Model):
action['res_id'] = self.copy().id
return action
+ @api.model
+ def _move_dict_to_preview_vals(self, move_vals, currency_id=None):
+ preview_vals = {
+ 'group_name': "%s, %s" % (format_date(self.env, move_vals['date']) or _('[Not set]'), move_vals['ref']),
+ 'items_vals': move_vals['line_ids'],
+ }
+ for line in preview_vals['items_vals']:
+ if 'partner_id' in line[2]:
+ line[2]['partner_id'] = self.env['res.partner'].browse(line[2]['partner_id']).display_name
+ line[2]['account_id'] = self.env['account.account'].browse(line[2]['account_id']).display_name or _('Destination Account')
+ line[2]['debit'] = currency_id and formatLang(self.env, line[2]['debit'], currency_obj=currency_id) or line[2]['debit']
+ line[2]['credit'] = currency_id and formatLang(self.env, line[2]['credit'], currency_obj=currency_id) or line[2]['debit']
+ return preview_vals
+
class AccountMoveLine(models.Model):
_name = "account.move.line"
diff --git a/addons/account/static/src/js/aml_preview.js b/addons/account/static/src/js/aml_preview.js
deleted file mode 100644
index a8f5c668504dd2746e891f2141f5978d54bfd8c2..0000000000000000000000000000000000000000
--- a/addons/account/static/src/js/aml_preview.js
+++ /dev/null
@@ -1,42 +0,0 @@
-odoo.define('account.move.line.preview', function (require) {
-"use strict";
-
-var AbstractField = require('web.AbstractField');
-var core = require('web.core');
-var field_registry = require('web.field_registry');
-var field_utils = require('web.field_utils');
-
-var QWeb = core.qweb;
-
-
-var AccountMoveLinePreviewWidget = AbstractField.extend({
-
- supportedFieldTypes: ['char'],
-
- /**
- * @private
- * @override
- */
- _render: function() {
- var self = this;
- var all_aml_data = JSON.parse(this.value);
-
- if (!all_aml_data) {
- this.$el.html('');
- return;
- }
-
- this.$el.html(QWeb.render('AccountMoveLinePreview', {
- lines_to_preview: all_aml_data,
- }));
-
- },
-});
-
-field_registry.add('aml_preview', AccountMoveLinePreviewWidget);
-
-return {
- AccountMoveLinePreviewWidget: AccountMoveLinePreviewWidget
-};
-
-});
\ No newline at end of file
diff --git a/addons/account/static/src/js/grouped_view_widget.js b/addons/account/static/src/js/grouped_view_widget.js
new file mode 100644
index 0000000000000000000000000000000000000000..3af2d0e1fe012eaa8b5a9da70c2b030fcae46e0b
--- /dev/null
+++ b/addons/account/static/src/js/grouped_view_widget.js
@@ -0,0 +1,40 @@
+odoo.define('account.ShowGroupedList', function (require) {
+"use strict";
+
+const { Component } = owl;
+const { useState } = owl.hooks;
+const AbstractFieldOwl = require('web.AbstractFieldOwl');
+const field_registry = require('web.field_registry');
+
+class ListItem extends Component { }
+ListItem.template = 'account.GroupedItemTemplate';
+ListItem.props = ["item_vals", "options"];
+
+class ListGroup extends Component { }
+ListGroup.template = 'account.GroupedItemsTemplate';
+ListGroup.components = { ListItem }
+ListGroup.props = ["group_vals", "options"];
+
+
+class ShowGroupedList extends AbstractFieldOwl {
+ constructor(...args) {
+ super(...args);
+ this.data = this.value ? JSON.parse(this.value) : {
+ groups_vals: [],
+ options: {
+ discarded_number: '',
+ columns: [],
+ },
+ };
+ }
+ async willUpdateProps(nextProps) {
+ await super.willUpdateProps(nextProps);
+ Object.assign(this.data, JSON.parse(this.value));
+ }
+}
+ShowGroupedList.template = 'account.GroupedListTemplate';
+ShowGroupedList.components = { ListGroup }
+
+field_registry.add('grouped_view_widget', ShowGroupedList);
+return ShowGroupedList;
+});
diff --git a/addons/account/static/src/xml/aml_preview_templates.xml b/addons/account/static/src/xml/aml_preview_templates.xml
deleted file mode 100644
index 919526b95265d6e48de00e7458cf59ddb7a4c716..0000000000000000000000000000000000000000
--- a/addons/account/static/src/xml/aml_preview_templates.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<templates xml:space="preserve">
-
- <t t-name="AccountMoveLinePreview">
- <div class="table-responsive">
- <table class="o_list_table table table-sm table-hover table-striped o_list_table_ungrouped"
- style="table-layout: fixed">
- <thead>
- <tr>
- <th>Account</th>
- <th>Label</th>
- <th>Partner</th>
- <th>Debit</th>
- <th>Credit</th>
- </tr>
- </thead>
-
- <tbody>
- <t t-foreach="lines_to_preview" t-as="line">
- <tr class="o_data_row">
- <td><t t-esc="line['preview-account']"/></td>
- <td><t t-esc="line['name']"/></td>
- <td><t t-esc="line['preview-partner']"/></td>
- <td align="center"><t t-esc="line['debit']"/></td>
- <td align="center"><t t-esc="line['credit']"/></td>
- </tr>
- </t>
- </tbody>
- </table>
- </div>
- </t>
-</templates>
\ No newline at end of file
diff --git a/addons/account/static/src/xml/grouped_view_widget.xml b/addons/account/static/src/xml/grouped_view_widget.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9863fc8219da5405ed8a708b8f6a1d52bf621bed
--- /dev/null
+++ b/addons/account/static/src/xml/grouped_view_widget.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<templates>
+ <div t-name="account.GroupedListTemplate" owl="1" class="d-block">
+ <table t-if="data.groups_vals.length" class="table table-sm o_list_table table table-sm table-hover table-striped o_list_table_grouped">
+ <thead><tr>
+ <t t-foreach="data.options.columns" t-as="col">
+ <th t-esc="col['label']" t-attf-class="{{col['class']}}"/>
+ </t>
+ </tr></thead>
+ <t t-foreach="data.groups_vals" t-as="group_vals">
+ <ListGroup group_vals="group_vals" options="data.options"/>
+ </t>
+ </table>
+ <t t-if="data.options.discarded_number">
+ <span><t t-esc="data.options.discarded_number"/> are not shown in the preview</span>
+ </t>
+ </div>
+
+ <tbody t-name="account.GroupedItemsTemplate" owl="1">
+ <tr style="background-color: #dee2e6;">
+ <td t-attf-colspan="{{props.options.columns.length}}">
+ <t t-esc="props.group_vals.group_name"/>
+ </td>
+ </tr>
+ <t t-foreach="props.group_vals.items_vals" t-as="item_vals">
+ <ListItem item_vals="item_vals[2]" options="props.options"/>
+ </t>
+ </tbody>
+
+ <tr t-name="account.GroupedItemTemplate" owl="1">
+ <t t-foreach="props.options.columns" t-as="col">
+ <td t-esc="props.item_vals[col['field']]" t-attf-class="{{col['class']}}"/>
+ </t>
+ </tr>
+
+</templates>
diff --git a/addons/account/views/account.xml b/addons/account/views/account.xml
index 93f9464ce70b43fa53e335abd8ef4de4c2562cb5..ae91e2411c6e41b23d4393b1465eb3b44897b7cf 100644
--- a/addons/account/views/account.xml
+++ b/addons/account/views/account.xml
@@ -21,9 +21,9 @@
<script type="text/javascript" src="/account/static/src/js/account_payment_field.js"></script>
<script type="text/javascript" src="/account/static/src/js/account_resequence_field.js"></script>
+ <script type="text/javascript" src="/account/static/src/js/grouped_view_widget.js"></script>
<script type="text/javascript" src="/account/static/src/js/mail_activity.js"></script>
<script type="text/javascript" src="/account/static/src/js/tax_group.js"></script>
- <script type="text/javascript" src="/account/static/src/js/aml_preview.js"></script>
<script type="text/javascript" src="/account/static/src/js/bank_statement.js"></script>
<script type="text/javascript" src="/account/static/src/js/section_and_note_fields_backend.js"></script>
diff --git a/addons/account/views/account_move_views.xml b/addons/account/views/account_move_views.xml
index 2a49bca8c42ecb43c1b8d0f86590f3b4ea8a0a64..946eecbf94ad410ada482878afb574e994cd2c8b 100644
--- a/addons/account/views/account_move_views.xml
+++ b/addons/account/views/account_move_views.xml
@@ -1139,7 +1139,7 @@
res_model="account.move.line"/>
<record id="action_accrual_entry" model="ir.actions.server">
- <field name="name">Create Accrual Entry</field>
+ <field name="name">Create Accrual Entries</field>
<field name="model_id" ref="account.model_account_move_line"/>
<field name="groups_id" eval="[(4, ref('account.group_account_user'))]"/>
<field name="binding_model_id" ref="account.model_account_move_line"/>
diff --git a/addons/account/wizard/account_accrual_accounting.py b/addons/account/wizard/account_accrual_accounting.py
index 84cde15d05d4533e4a32348675e4d66001c9fe23..98058bbd035e40ec71722e1bf74f2aa140d9febf 100644
--- a/addons/account/wizard/account_accrual_accounting.py
+++ b/addons/account/wizard/account_accrual_accounting.py
@@ -1,11 +1,13 @@
# -*- coding: utf-8 -*-
from odoo import api, fields, models, _
from odoo.exceptions import UserError
+from odoo.tools.misc import format_date
+import json
class AccrualAccountingWizard(models.TransientModel):
_name = 'account.accrual.accounting.wizard'
- _description = 'Create accrual entry.'
+ _description = 'Create accrual entries.'
date = fields.Date(required=True)
company_id = fields.Many2one('res.company', required=True, readonly=True)
@@ -23,6 +25,8 @@ class AccrualAccountingWizard(models.TransientModel):
percentage = fields.Float("Percentage", default=100.0)
total_amount = fields.Monetary(compute="_compute_total_amount", currency_field='company_currency_id')
company_currency_id = fields.Many2one('res.currency', related='company_id.currency_id')
+ data = fields.Text(compute="_compute_data")
+ preview_data = fields.Text(compute="_compute_preview_data")
@api.constrains('percentage')
def _constraint_percentage(self):
@@ -54,112 +58,163 @@ class AccrualAccountingWizard(models.TransientModel):
rec['company_id'] = active_move_line_ids[0].company_id.id
account_types_allowed = self.env.ref('account.data_account_type_expenses') + self.env.ref('account.data_account_type_revenue') + self.env.ref('account.data_account_type_other_income')
if active_move_line_ids[0].account_id.user_type_id not in account_types_allowed:
- raise UserError(_('You can only change the period for items in these types of accounts: ') + ", ".join(account_types_allowed.mapped('name')))
+ raise UserError(_('You can only change the period for items in these types of accounts: %s') % ", ".join(account_types_allowed.mapped('name')))
rec['account_type'] = active_move_line_ids[0].account_id.user_type_id.internal_group
return rec
- def amend_entries(self):
- # set the accrual account on the selected journal items
- accrual_account = self.revenue_accrual_account if self.account_type == 'income' else self.expense_accrual_account
-
- # Generate journal entries.
- move_data = {}
- for aml in self.active_move_line_ids:
- ref1 = _('Accrual Adjusting Entry (%s recognized) for invoice: %s') % (self.percentage, aml.move_id.name)
- ref2 = _('Accrual Adjusting Entry (%s recognized) for invoice: %s') % (100 - self.percentage, aml.move_id.name)
- move_data.setdefault(aml.move_id, (
- [
- # Values to create moves.
- {
- 'date': self.date,
- 'ref': ref1,
- 'journal_id': self.journal_id.id,
- 'line_ids': [],
- },
- {
- 'date': aml.move_id.date,
- 'ref': ref2,
- 'journal_id': self.journal_id.id,
- 'line_ids': [],
- },
- ], [
- # Messages to log on the chatter.
- (_('Accrual Adjusting Entry ({percent}% recognized) for invoice:') + ' <a href=# data-oe-model=account.move data-oe-id={id}>{name}</a>').format(
- percent=self.percentage,
- id=aml.move_id.id,
- name=aml.move_id.name,
- ),
- (_('Accrual Adjusting Entry ({percent}% recognized) for invoice:') + ' <a href=# data-oe-model=account.move data-oe-id={id}>{name}</a>').format(
- percent=100 - self.percentage,
- id=aml.move_id.id,
- name=aml.move_id.name,
- ),
+ @api.depends('active_move_line_ids', 'journal_id', 'revenue_accrual_account', 'expense_accrual_account', 'percentage', 'date', 'account_type')
+ def _compute_data(self):
+ for record in self:
+ # set the accrual account on the selected journal items
+ accrual_account = record.revenue_accrual_account if record.account_type == 'income' else record.expense_accrual_account
+
+ move_data = {}
+
+ # compute the account.move.lines and the total amount per move
+ for aml in record.active_move_line_ids:
+ if aml.move_id not in move_data:
+ move_data[aml.move_id] = {
+ 'total_amount': 0,
+ 'move_vals': {
+ 'new_date': {'line_ids': []},
+ 'original_date': {'line_ids': []},
+ }
+ }
+ # total amount per move is used to build the account.move references and chatter messages
+ move_data[aml.move_id]['total_amount'] += aml.balance
+
+ # account.move.line data
+ reported_debit = aml.company_id.currency_id.round((record.percentage / 100) * aml.debit)
+ reported_credit = aml.company_id.currency_id.round((record.percentage / 100) * aml.credit)
+ if aml.currency_id:
+ reported_amount_currency = aml.currency_id.round((record.percentage / 100) * aml.amount_currency)
+ else:
+ reported_amount_currency = 0.0
+
+ move_data[aml.move_id]['move_vals']['new_date']['line_ids'] += [
+ (0, 0, {
+ 'name': aml.name,
+ 'debit': reported_debit,
+ 'credit': reported_credit,
+ 'amount_currency': reported_amount_currency,
+ 'currency_id': aml.currency_id.id,
+ 'account_id': aml.account_id.id,
+ 'partner_id': aml.partner_id.id,
+ }),
+ (0, 0, {
+ 'name': _('Accrual Adjusting Entry'),
+ 'debit': reported_credit,
+ 'credit': reported_debit,
+ 'amount_currency': -reported_amount_currency,
+ 'currency_id': aml.currency_id.id,
+ 'account_id': accrual_account.id,
+ 'partner_id': aml.partner_id.id,
+ }),
+ ]
+ move_data[aml.move_id]['move_vals']['original_date']['line_ids'] += [
+ (0, 0, {
+ 'name': aml.name,
+ 'debit': aml.debit - reported_debit,
+ 'credit': aml.credit - reported_credit,
+ 'amount_currency': aml.amount_currency - reported_amount_currency,
+ 'currency_id': aml.currency_id.id,
+ 'account_id': aml.account_id.id,
+ 'partner_id': aml.partner_id.id,
+ }),
+ (0, 0, {
+ 'name': _('Accrual Adjusting Entry'),
+ 'debit': aml.credit - reported_credit,
+ 'credit': aml.debit - reported_debit,
+ 'amount_currency': reported_amount_currency - aml.amount_currency,
+ 'currency_id': aml.currency_id.id,
+ 'account_id': accrual_account.id,
+ 'partner_id': aml.partner_id.id,
+ }),
]
- ))
- reported_debit = aml.company_id.currency_id.round((self.percentage / 100) * aml.debit)
- reported_credit = aml.company_id.currency_id.round((self.percentage / 100) * aml.credit)
- if aml.currency_id:
- reported_amount_currency = aml.currency_id.round((self.percentage / 100) * aml.amount_currency)
- else:
- reported_amount_currency = 0.0
-
- move_data[aml.move_id][0][0]['line_ids'] += [
- (0, 0, {
- 'name': aml.name,
- 'debit': reported_debit,
- 'credit': reported_credit,
- 'amount_currency': reported_amount_currency,
- 'currency_id': aml.currency_id.id,
- 'account_id': aml.account_id.id,
- 'partner_id': aml.partner_id.id,
- }),
- (0, 0, {
- 'name': ref1,
- 'debit': reported_credit,
- 'credit': reported_debit,
- 'amount_currency': -reported_amount_currency,
- 'currency_id': aml.currency_id.id,
- 'account_id': accrual_account.id,
- 'partner_id': aml.partner_id.id,
- }),
+ # complete the account.move data
+ for move in record.active_move_line_ids.move_id:
+ def format_strings(string):
+ return string.format(
+ percent=record.percentage,
+ name=move.name,
+ id=move.id,
+ origin_amount=origin_amount,
+ date=format_date(self.env, move.date),
+ new_date=record.date and format_date(self.env, record.date) or _('[Not set]'),
+ )
+ origin_amount = abs(move_data[move]['total_amount'])
+ ref1 = format_strings(_('Adjusting Entry of {name} ({percent}% of {origin_amount} recognized from {date})'))
+ ref2 = format_strings(_('Adjusting Entry of {name} ({percent}% of {origin_amount} recognized on {new_date})'))
+ move_data[move]['move_vals']['new_date']['ref'] = ref1
+ move_data[move]['move_vals']['new_date']['date'] = fields.Date.to_string(record.date)
+ move_data[move]['move_vals']['new_date']['journal_id'] = record.journal_id.id
+ move_data[move]['move_vals']['original_date']['ref'] = ref2
+ move_data[move]['move_vals']['original_date']['date'] = fields.Date.to_string(move.date)
+ move_data[move]['move_vals']['original_date']['journal_id'] = record.journal_id.id
+ move_data[move]['log_messages'] = {
+ 'new_date': format_strings(
+ _('Accrual Adjusting Entry')
+ + ' <a href=# data-oe-model=account.move data-oe-id={id}>{name}</a>: '
+ + _('{percent}% of {origin_amount} recognized from {date}')
+ ),
+ 'original_date': format_strings(
+ _('Accrual Adjusting Entry for')
+ + ' <a href=# data-oe-model=account.move data-oe-id={id}>{name}</a>: '
+ + _('{percent}% of {origin_amount} recognized on {date}')
+ ),
+ 'origin': format_strings(
+ _('Accrual Adjusting Entries have been created for this invoice')
+ + ':<ul><li><a href=# data-oe-model=account.move data-oe-id=%(second_id)d>%(second_name)s</a> '
+ + _('cancelling {percent}%% of {origin_amount} ')
+ + '</li><li><a href=# data-oe-model=account.move data-oe-id=%(first_id)d>%(first_name)s</a> '
+ + _('postponing it to {date}')
+ + '</li></ul>'
+ )
+ }
+
+ move_vals = [m for o in move_data.values() for m in o['move_vals'].values()]
+ log_messages = [m for o in move_data.values() for m in o['log_messages'].values()]
+
+ record.data = json.dumps({
+ 'move_vals': move_vals,
+ 'log_messages': log_messages,
+ })
+
+ @api.depends('data')
+ def _compute_preview_data(self):
+ for record in self:
+ data = json.loads(record.data)
+ move_vals, log_messages = (data['move_vals'], data['log_messages'])
+
+ preview_vals = []
+ for move in move_vals[:4]:
+ preview_vals += [self.env['account.move']._move_dict_to_preview_vals(move, record.company_id.currency_id)]
+
+ preview_discarded = max(0, len(move_vals) - len(preview_vals))
+ preview_columns = [
+ {'field': 'account_id', 'label': _('Account')},
+ {'field': 'name', 'label': _('Label')},
+ {'field': 'debit', 'label': _('Debit'), 'class': 'text-right text-nowrap'},
+ {'field': 'credit', 'label': _('Credit'), 'class': 'text-right text-nowrap'},
]
- move_data[aml.move_id][0][1]['line_ids'] += [
- (0, 0, {
- 'name': aml.name,
- 'debit': aml.debit - reported_debit,
- 'credit': aml.credit - reported_credit,
- 'amount_currency': aml.amount_currency - reported_amount_currency,
- 'currency_id': aml.currency_id.id,
- 'account_id': aml.account_id.id,
- 'partner_id': aml.partner_id.id,
- }),
- (0, 0, {
- 'name': ref2,
- 'debit': aml.credit - reported_credit,
- 'credit': aml.debit - reported_debit,
- 'amount_currency': reported_amount_currency - aml.amount_currency,
- 'currency_id': aml.currency_id.id,
- 'account_id': accrual_account.id,
- 'partner_id': aml.partner_id.id,
- }),
- ]
+ record.preview_data = json.dumps({
+ 'groups_vals': preview_vals,
+ 'options': {
+ 'discarded_number': (_("%d moves") % preview_discarded) if preview_discarded else False,
+ 'columns': preview_columns,
+ },
+ })
+
+ def amend_entries(self):
+ accrual_account = self.revenue_accrual_account if self.account_type == 'income' else self.expense_accrual_account
+ data = json.loads(self.data)
+ move_vals, log_messages = (data['move_vals'], data['log_messages'])
# Update the account of selected journal items.
self.active_move_line_ids.write({'account_id': accrual_account.id})
- # When the percentage is 100%, the second move is not needed.
- if self.percentage < 100:
- move_vals = []
- log_messages = []
- for v in move_data.values():
- move_vals += v[0]
- log_messages += v[1]
- else:
- move_vals = [v[0][0] for k, v in move_data.items()]
- log_messages = [v[1][0] for k, v in move_data.items()]
-
created_moves = self.env['account.move'].create(move_vals)
created_moves.post()
diff --git a/addons/account/wizard/account_accrual_accounting_view.xml b/addons/account/wizard/account_accrual_accounting_view.xml
index c8684aa67a79ab9baaf95224df425289772fb80c..98b88d945301810c6efe91f98aa49417e92cbc97 100644
--- a/addons/account/wizard/account_accrual_accounting_view.xml
+++ b/addons/account/wizard/account_accrual_accounting_view.xml
@@ -22,8 +22,10 @@
<field name="journal_id"/>
</group>
</group>
+ <label for="preview_data" string="The following Journal Entries will be generated"/>
+ <field name="preview_data" widget="grouped_view_widget"/>
<footer>
- <button string="Create Journal Entry" name="amend_entries" type="object" class="oe_highlight"/>
+ <button string="Create Journal Entries" name="amend_entries" type="object" class="oe_highlight"/>
<button string="Cancel" class="btn btn-secondary" special="cancel"/>
</footer>
</form>
@@ -31,7 +33,7 @@
</record>
<record id="account_accrual_accounting_wizard_action" model="ir.actions.act_window">
- <field name="name">Create Accrual Entry for the expense/revenue recognition</field>
+ <field name="name">Create Accrual Entries for the expense/revenue recognition</field>
<field name="res_model">account.accrual.accounting.wizard</field>
<field name="view_mode">form</field>
<field name="target">new</field>
diff --git a/addons/account/wizard/account_transfer_wizard.py b/addons/account/wizard/account_transfer_wizard.py
index e771cd0342a7621201193faaa4a0b7d2454eb1ca..c6d73973abf1da628dbbad8e25103a63b25cd341 100644
--- a/addons/account/wizard/account_transfer_wizard.py
+++ b/addons/account/wizard/account_transfer_wizard.py
@@ -2,6 +2,7 @@
from odoo import api, fields, models, _
from odoo.exceptions import UserError
+from odoo.tools.misc import format_date, formatLang
from collections import defaultdict
@@ -43,9 +44,20 @@ class AccountTransferWizard(models.TransientModel):
@api.depends('destination_account_id')
def _compute_aml_preview_data(self):
for record in self:
- record.aml_preview_data = json.dumps(self._get_lines_to_create_dict())
-
- def _get_lines_to_create_dict(self):
+ record.aml_preview_data = json.dumps({
+ 'groups_vals': [self.env['account.move']._move_dict_to_preview_vals(self._get_move_to_create_dict(), record.company_id.currency_id)],
+ 'options': {
+ 'columns': [
+ {'field': 'account_id', 'label': _('Account')},
+ {'field': 'name', 'label': _('Label')},
+ {'field': 'partner_id', 'label': _('Partner')},
+ {'field': 'debit', 'label': _('Debit'), 'class': 'text-right text-nowrap'},
+ {'field': 'credit', 'label': _('Credit'), 'class': 'text-right text-nowrap'},
+ ],
+ },
+ })
+
+ def _get_move_to_create_dict(self):
line_vals = []
# Group data from selected move lines
@@ -77,9 +89,7 @@ class AccountTransferWizard(models.TransientModel):
'debit': counterpart_vals['balance'] > 0 and self.company_id.currency_id.round(counterpart_vals['balance']) or 0,
'credit': counterpart_vals['balance'] < 0 and self.company_id.currency_id.round(-counterpart_vals['balance']) or 0,
'account_id': self.destination_account_id.id,
- 'preview-account': self.destination_account_id and self.destination_account_id.name_get()[0][1] or _('Destination Account'),
'partner_id': counterpart_partner.id or None,
- 'preview-partner': counterpart_partner and counterpart_partner.name or None,
'amount_currency': counterpart_currency and counterpart_currency.round((counterpart_vals['balance'] < 0 and -1 or 1) * abs(counterpart_vals['amount_currency'])) or 0,
'currency_id': counterpart_currency.id or None,
})
@@ -94,31 +104,20 @@ class AccountTransferWizard(models.TransientModel):
'debit': account_balance < 0 and self.company_id.currency_id.round(-account_balance) or 0,
'credit': account_balance > 0 and self.company_id.currency_id.round(account_balance) or 0,
'account_id': account.id,
- 'preview-account': account.name_get()[0][1],
'partner_id': partner.id or None,
- 'preview-partner': partner and partner.name or None,
'currency_id': currency.id or None,
'amount_currency': (account_balance > 0 and -1 or 1) * abs(account_amount_currency),
})
- return line_vals
-
- def button_transfer(self):
- all_lines_dict = self._get_lines_to_create_dict()
-
- orm_line_commands = []
- for line_dict in all_lines_dict:
- del line_dict['preview-account']
- del line_dict['preview-partner']
- orm_line_commands.append((0, 0, line_dict))
-
- new_move = self.env['account.move'].create({
+ return {
'journal_id': self.journal_id.id,
'date': self.date,
- 'ref': _("Transfer entry to %s") % self.destination_account_id.display_name,
- 'line_ids': orm_line_commands,
- })
+ 'ref': self.destination_account_id.display_name and _("Transfer entry to %s") % self.destination_account_id.display_name or '',
+ 'line_ids': [(0, 0, line) for line in line_vals],
+ }
+ def button_transfer(self):
+ new_move = self.env['account.move'].create(self._get_move_to_create_dict())
new_move.post()
# Group lines
@@ -193,4 +192,4 @@ class AccountTransferWizard(models.TransientModel):
def _format_move_link(self, move):
move_link_format = "<a href=# data-oe-model=account.move data-oe-id=%(move_id)s>%(move_name)s</a>"
- return move_link_format % {'move_id': move.id, 'move_name': move.name}
\ No newline at end of file
+ return move_link_format % {'move_id': move.id, 'move_name': move.name}
diff --git a/addons/account/wizard/account_transfer_wizard.xml b/addons/account/wizard/account_transfer_wizard.xml
index 965e737f750e4c84682b6c6987cbabffd05f3295..052bf8cdc9b38d7edac56e377a88078df9af08c0 100644
--- a/addons/account/wizard/account_transfer_wizard.xml
+++ b/addons/account/wizard/account_transfer_wizard.xml
@@ -27,7 +27,7 @@
<p><strong>The following journal entry will be generated</strong></p>
- <field name="aml_preview_data" widget="aml_preview"/>
+ <field name="aml_preview_data" widget="grouped_view_widget"/>
<footer>
<button string="Transfer Entries" name="button_transfer" type="object" class="oe_highlight"/>
@@ -38,4 +38,4 @@
</record>
</data>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/addons/l10n_generic_coa/data/account.account.template.csv b/addons/l10n_generic_coa/data/account.account.template.csv
index 5d7b60102290f77fd963d1662b31a0c67c1325df..82f70556f4a5adb84a03a86f7bca7e6762235f46 100644
--- a/addons/l10n_generic_coa/data/account.account.template.csv
+++ b/addons/l10n_generic_coa/data/account.account.template.csv
@@ -4,6 +4,7 @@
"stock_in","Stock Interim (Received)","1102","account.data_account_type_current_assets","l10n_generic_coa.configurable_chart_template","","True"
"stock_out","Stock Interim (Delivered)","1103","account.data_account_type_current_assets","l10n_generic_coa.configurable_chart_template","","True"
"receivable","Account Receivable","1210","account.data_account_type_receivable","l10n_generic_coa.configurable_chart_template","","True"
+"to_receive_rec","Products to receive","12101","account.data_account_type_current_assets","l10n_generic_coa.configurable_chart_template","","True"
"tax_paid","Tax Paid","1310","account.data_account_type_current_assets","l10n_generic_coa.configurable_chart_template","","False"
"tax_receivable","Tax Receivable","1320","account.data_account_type_current_assets","l10n_generic_coa.configurable_chart_template","","False"
"prepayments","Prepayments","1410","account.data_account_type_prepayments","l10n_generic_coa.configurable_chart_template","","False"
@@ -11,6 +12,7 @@
"non_current_assets","Non-current assets","1910","account.data_account_type_non_current_assets","l10n_generic_coa.configurable_chart_template","","False"
"current_liabilities","Current Liabilities","2010","account.data_account_type_current_liabilities","l10n_generic_coa.configurable_chart_template","","False"
"payable","Account Payable","2110","account.data_account_type_payable","l10n_generic_coa.configurable_chart_template","","True"
+"to_receive_pay","Bills to receive","21101","account.data_account_type_current_liabilities","l10n_generic_coa.configurable_chart_template","","True"
"tax_received","Tax Received","2510","account.data_account_type_current_liabilities","l10n_generic_coa.configurable_chart_template","","False"
"tax_payable","Tax Payable","2520","account.data_account_type_current_liabilities","l10n_generic_coa.configurable_chart_template","","False"
"non_current_liabilities","Non-current Liabilities","2910","account.data_account_type_non_current_liabilities","l10n_generic_coa.configurable_chart_template","","False"