diff --git a/addons/account/static/src/js/reconciliation/reconciliation_renderer.js b/addons/account/static/src/js/reconciliation/reconciliation_renderer.js
index 9c76ae6c0ee..d409ad64c39 100644
--- a/addons/account/static/src/js/reconciliation/reconciliation_renderer.js
+++ b/addons/account/static/src/js/reconciliation/reconciliation_renderer.js
@@ -427,14 +427,15 @@ var LineRenderer = Widget.extend(FieldManagerMixin, {
this._renderCreate(state);
}
var data = this.model.get(this.handleCreateRecord).data;
- this.model.notifyChanges(this.handleCreateRecord, state.createForm);
- var record = this.model.get(this.handleCreateRecord);
- _.each(this.fields, function (field, fieldName) {
- if (self._avoidFieldUpdate[fieldName]) return;
- if (fieldName === "partner_id") return;
- if ((data[fieldName] || state.createForm[fieldName]) && !_.isEqual(state.createForm[fieldName], data[fieldName])) {
- field.reset(record);
- }
+ this.model.notifyChanges(this.handleCreateRecord, state.createForm).then(function () {
+ var record = self.model.get(self.handleCreateRecord);
+ _.each(self.fields, function (field, fieldName) {
+ if (self._avoidFieldUpdate[fieldName]) return;
+ if (fieldName === "partner_id") return;
+ if ((data[fieldName] || state.createForm[fieldName]) && !_.isEqual(state.createForm[fieldName], data[fieldName])) {
+ field.reset(record);
+ }
+ });
});
}
this.$('.create .add_line').toggle(!!state.balance.amount_currency);
diff --git a/addons/account/static/tests/reconciliation_tests.js b/addons/account/static/tests/reconciliation_tests.js
index e0898f76c8a..96ba1e97871 100644
--- a/addons/account/static/tests/reconciliation_tests.js
+++ b/addons/account/static/tests/reconciliation_tests.js
@@ -34,17 +34,22 @@ var db = {
fields: {
id: {string: "ID", type: 'integer'},
code: {string: "code", type: 'integer'},
- display_name: {string: "Displayed name", type: 'char'},
+ name: {string: "Displayed name", type: 'char'},
},
records: [
- {id: 282, code: 100000, display_name: "100000 Fixed Asset Account"},
- {id: 283, code: 101000, display_name: "101000 Current Assets"},
- {id: 284, code: 101110, display_name: "101110 Stock Valuation Account"},
- {id: 285, code: 101120, display_name: "101120 Stock Interim Account (Received)"},
- {id: 286, code: 101130, display_name: "101130 Stock Interim Account (Delivered)"},
- {id: 287, code: 101200, display_name: "101200 Account Receivable"},
- {id: 288, code: 101300, display_name: "101300 Tax Paid"},
- {id: 308, code: 101401, display_name: "101401 Bank"},
+ {id: 282, code: 100000, name: "100000 Fixed Asset Account"},
+ {id: 283, code: 101000, name: "101000 Current Assets"},
+ {id: 284, code: 101110, name: "101110 Stock Valuation Account"},
+ {id: 285, code: 101120, name: "101120 Stock Interim Account (Received)"},
+ {id: 286, code: 101130, name: "101130 Stock Interim Account (Delivered)"},
+ {id: 287, code: 101200, name: "101200 Account Receivable"},
+ {id: 288, code: 101300, name: "101300 Tax Paid"},
+ {id: 308, code: 101401, name: "101401 Bank"},
+ {id: 500, code: 500, name: "500 Account"},
+ {id: 501, code: 501, name: "501 Account"},
+ {id: 502, code: 502, name: "502 Account"},
+ {id: 503, code: 503, name: "503 Account"},
+ {id: 504, code: 504, name: "504 Account"},
],
mark_as_reconciled: function () {
return $.when();
@@ -1021,13 +1026,77 @@ QUnit.module('account', {
clientAction.destroy();
});
+ QUnit.test('Reconciliation create line (many2one test)', function (assert) {
+ assert.expect(5);
+
+ var clientAction = new ReconciliationClientAction.StatementAction(null, this.params.options);
+ var def = $.Deferred();
+
+ testUtils.addMockEnvironment(clientAction, {
+ data: this.params.data,
+ session: {
+ currencies: {
+ 3: {
+ digits: [69, 2],
+ position: "before",
+ symbol: "$"
+ }
+ }
+ },
+ archs: {
+ "account.account,false,list": '',
+ "account.account,false,search": '',
+ },
+ mockRPC: function (route, args) {
+ if (args.method === 'name_get') {
+ return def.then(this._super.bind(this, route, args));
+ }
+ return this._super(route, args);
+ },
+ });
+
+ clientAction.prependTo($('#qunit-fixture'));
+
+ var widget = clientAction.widgets[0];
+
+ // open the first line in write-off mode
+ widget.$('.accounting_view tfoot td:first').trigger('click');
+
+ // select an account with the many2one (drop down)
+ widget.$('.create .create_account_id input').trigger('click');
+ $('.ui-autocomplete .ui-menu-item a:contains(101200)').trigger('mouseenter').trigger('click');
+ assert.strictEqual(widget.$('.create .create_account_id input').val(), "101200 Account Receivable", "Display the selected account");
+ assert.strictEqual(widget.$('tbody:first .cell_account_code').text(), "101200", "Display the code of the selected account");
+
+ // use the many2one select dialog to change the account
+ widget.$('.create .create_account_id input').trigger('click');
+ $('.ui-autocomplete .ui-menu-item a:contains(Search)').trigger('mouseenter').trigger('click');
+ // select the account who does not appear in the drop drown
+ $('.modal tr.o_data_row:contains(502)').click();
+ assert.strictEqual(widget.$('.create .create_account_id input').val(), "101200 Account Receivable", "Selected account does not change");
+ // wait the name_get to render the changes
+ def.resolve();
+ assert.strictEqual(widget.$('.create .create_account_id input').val(), "502 Account", "Display the selected account");
+ assert.strictEqual(widget.$('tbody:first .cell_account_code').text(), "502", "Display the code of the selected account");
+ clientAction.destroy();
+ });
+
QUnit.test('Reconciliation create line with taxes', function (assert) {
assert.expect(13);
var clientAction = new ReconciliationClientAction.StatementAction(null, this.params.options);
testUtils.addMockEnvironment(clientAction, {
- 'data': this.params.data,
+ data: this.params.data,
+ session: {
+ currencies: {
+ 3: {
+ digits: [69, 2],
+ position: "before",
+ symbol: "$"
+ }
+ }
+ },
});
clientAction.appendTo($('#qunit-fixture'));
@@ -1039,26 +1108,26 @@ QUnit.module('account', {
widget.$('.create .create_label input').val('test1').trigger('input');
widget.$('.create .create_amount input').val('1100').trigger('input');
- assert.strictEqual(widget.$('.accounting_view tbody .cell_right:last').text(), "1100.00", "should display the value 1100.00 in left column");
+ assert.strictEqual(widget.$('.accounting_view tbody .cell_right:last').text(), "$\u00a01100.00", "should display the value 1100.00 in left column");
assert.strictEqual(widget.$('.accounting_view tfoot .cell_label').text(), "Open balance", "should display 'Open Balance'");
- assert.strictEqual(widget.$('.accounting_view tfoot .cell_right').text(), "75.00", "should display 'Open Balance' with 75.00 in right column");
+ assert.strictEqual(widget.$('.accounting_view tfoot .cell_right').text(), "$\u00a075.00", "should display 'Open Balance' with 75.00 in right column");
assert.strictEqual(widget.$('.accounting_view tbody tr').length, 1, "should have 1 created reconcile lines");
widget.$('.create .create_tax_id input').trigger('click');
$('.ui-autocomplete .ui-menu-item a:contains(10.00%)').trigger('mouseenter').trigger('click');
- assert.strictEqual(widget.$('.accounting_view tbody .cell_right').text().replace('$_', ''), "1000.00100.00", "should have 2 created reconcile lines with right column values");
+ assert.strictEqual(widget.$('.accounting_view tbody .cell_right').text().replace('$_', ''), "$\u00a01000.00$\u00a0100.00", "should have 2 created reconcile lines with right column values");
assert.strictEqual(widget.$('.accounting_view tfoot .cell_label').text(), "Open balance", "should display 'Open Balance'");
- assert.strictEqual(widget.$('.accounting_view tfoot .cell_right').text(), "75.00", "should display 'Open Balance' with 75.00 in right column");
+ assert.strictEqual(widget.$('.accounting_view tfoot .cell_right').text(), "$\u00a075.00", "should display 'Open Balance' with 75.00 in right column");
assert.strictEqual(widget.$('.accounting_view tfoot .cell_left').text(), "", "should display 'Open Balance' without any value in left column");
assert.strictEqual(widget.$('.accounting_view tbody tr').length, 2, "should have 2 created reconcile lines");
widget.$('.create .create_tax_id input').trigger('click');
$('.ui-autocomplete .ui-menu-item a:contains(20.00%)').trigger('mouseenter').trigger('click');
- assert.strictEqual(widget.$('.accounting_view tbody .cell_right').text().replace('$_', ''), "1100.00220.00", "should have 2 created reconcile lines with right column values");
+ assert.strictEqual(widget.$('.accounting_view tbody .cell_right').text().replace('$_', ''), "$\u00a01100.00$\u00a0220.00", "should have 2 created reconcile lines with right column values");
assert.strictEqual(widget.$('.accounting_view tfoot .cell_label').text(), "Create Write-off", "should display 'Create Write-off'");
- assert.strictEqual(widget.$('.accounting_view tfoot .cell_left').text(), "145.00", "should display 'Create Write-off' with 145.00 in right column");
+ assert.strictEqual(widget.$('.accounting_view tfoot .cell_left').text(), "$\u00a0145.00", "should display 'Create Write-off' with 145.00 in right column");
assert.strictEqual(widget.$('.accounting_view tbody tr').length, 2, "should have 2 created reconcile lines");
clientAction.destroy();
@@ -1070,7 +1139,7 @@ QUnit.module('account', {
var clientAction = new ReconciliationClientAction.StatementAction(null, this.params.options);
testUtils.addMockEnvironment(clientAction, {
- 'data': this.params.data,
+ data: this.params.data,
});
clientAction.appendTo($('#qunit-fixture'));