summaryrefslogtreecommitdiff
path: root/addons/account/static/src/js/reconciliation/reconciliation_model.js
diff options
context:
space:
mode:
authorwan <wan@odoo.com>2019-01-28 12:53:15 +0000
committerqdp-odoo <qdp@odoo.com>2019-01-30 09:28:40 +0000
commit3eead65f07aac2f1e5008a11eaa7b0de403fd7bd (patch)
tree4b6a92ef520f43db29fd7538f60f98333870d96e /addons/account/static/src/js/reconciliation/reconciliation_model.js
parent0237654113c17402a3548f741a8ef2d3437d7c37 (diff)
[FIX] account: add date field in reconciliation writeoff form
purpose: when creating a writeoff from the manual reconciliation widget (invoices & payment matching), there's no way to specify the date of the writeoff journal entry specs: in v12, add a date field in the js and set the date of the writeoff entry accordingly Was PR #29794 Was OPW 1896593 closes odoo/odoo#30676
Diffstat (limited to 'addons/account/static/src/js/reconciliation/reconciliation_model.js')
-rw-r--r--addons/account/static/src/js/reconciliation/reconciliation_model.js11
1 files changed, 10 insertions, 1 deletions
diff --git a/addons/account/static/src/js/reconciliation/reconciliation_model.js b/addons/account/static/src/js/reconciliation/reconciliation_model.js
index 344f8521598..6b79d07a63a 100644
--- a/addons/account/static/src/js/reconciliation/reconciliation_model.js
+++ b/addons/account/static/src/js/reconciliation/reconciliation_model.js
@@ -854,6 +854,7 @@ var StatementModel = BasicModel.extend({
'tax_id': [tax.id, null],
'amount': tax.amount,
'label': tax.name,
+ 'date': prop.date,
'account_id': tax.account_id ? [tax.account_id, null] : prop.account_id,
'analytic': tax.analytic,
'is_tax': true,
@@ -1067,6 +1068,7 @@ var StatementModel = BasicModel.extend({
*/
_formatQuickCreate: function (line, values) {
values = values || {};
+ var today = new moment().utc().format();
var account = this._formatNameGet(values.account_id);
var formatOptions = {
currency_id: line.st_line.currency_id,
@@ -1083,6 +1085,7 @@ var StatementModel = BasicModel.extend({
'tax_id': this._formatNameGet(values.tax_id),
'debit': 0,
'credit': 0,
+ 'date': values.date ? values.date : field_utils.parse.date(today, {}, {isUTC: true}),
'base_amount': values.amount_type !== "percentage" ?
(amount) : line.balance.amount * values.amount / 100,
'percent': values.amount_type === "percentage" ? values.amount : null,
@@ -1233,7 +1236,7 @@ var StatementModel = BasicModel.extend({
* datas allowing manual reconciliation
*/
var ManualModel = StatementModel.extend({
- quickCreateFields: ['account_id', 'journal_id', 'amount', 'analytic_account_id', 'label', 'tax_id', 'force_tax_included', 'analytic_tag_ids'],
+ quickCreateFields: ['account_id', 'journal_id', 'amount', 'analytic_account_id', 'label', 'tax_id', 'force_tax_included', 'analytic_tag_ids', 'date'],
//--------------------------------------------------------------------------
// Public
@@ -1628,6 +1631,12 @@ var ManualModel = StatementModel.extend({
})
.then(this._formatMoveLine.bind(this, handle));
},
+
+ _formatToProcessReconciliation: function (line, prop) {
+ var result = this._super(line, prop);
+ result['date'] = prop.date;
+ return result;
+ },
});
return {