diff options
Diffstat (limited to 'addons/web')
5 files changed, 13 insertions, 17 deletions
diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js index c87a6aca455..0cddc887f18 100644 --- a/addons/web/static/src/js/views/basic/basic_model.js +++ b/addons/web/static/src/js/views/basic/basic_model.js @@ -3175,7 +3175,7 @@ var BasicModel = AbstractModel.extend({ commands[fieldName].push(x2ManyCommands.link_to(list.res_ids[i])); continue; } - changes = this._generateChanges(relRecord, options); + changes = this._generateChanges(relRecord, _.extend({}, options, {changesOnly: true})); if (!this.isNew(relRecord.id)) { // the subrecord already exists in db commands[fieldName].push(x2ManyCommands.link_to(relRecord.res_id)); diff --git a/addons/web/static/src/js/views/form/form_renderer.js b/addons/web/static/src/js/views/form/form_renderer.js index 71cf5ecbd07..9efadaabe30 100644 --- a/addons/web/static/src/js/views/form/form_renderer.js +++ b/addons/web/static/src/js/views/form/form_renderer.js @@ -568,7 +568,10 @@ var FormRenderer = BasicRenderer.extend({ } else if (child.tag === 'label') { $tds = self._renderInnerGroupLabel(child); } else { - $tds = $('<td/>').append(self._renderNode(child)); + if (child.tag === 'div' && child.attrs.class !== undefined && child.attrs.class.includes('o_td_label')) + $tds = $('<td class="o_td_label"/>').append(self._renderNode(child)); + else + $tds = $('<td/>').append(self._renderNode(child)); } if (finalColspan > 1) { $tds.last().attr('colspan', finalColspan); diff --git a/addons/web/static/tests/core/py_utils_tests.js b/addons/web/static/tests/core/py_utils_tests.js index fba8017cf01..8de80fbb0d7 100644 --- a/addons/web/static/tests/core/py_utils_tests.js +++ b/addons/web/static/tests/core/py_utils_tests.js @@ -901,20 +901,20 @@ QUnit.module('core', function () { "number": false, "type": "out_invoice", "currency_id": 1, "partner_id": 4, "fiscal_position_id": false, - "date_invoice": false, "date": false, + "invoice_date": false, "date": false, "payment_term_id": false, "reference": false, "account_id": 440, "name": false, "invoice_line_ids": [], "tax_line_ids": [], "amount_untaxed": 0, "amount_tax": 0, "reconciled": false, "amount_total": 0, "state": "draft", - "residual": 0, "company_id": 1, + "amount_residual": 0, "company_id": 1, "date_due": false, "user_id": 1, "partner_bank_id": false, "origin": false, "move_id": false, "comment": false, "payment_ids": [[6, false, []]], "active_id": false, "active_ids": [], - "active_model": "account.invoice", + "active_model": "account.move", "parent": {}} ], "__eval_context": null} }, { @@ -932,17 +932,17 @@ QUnit.module('core', function () { "invoice_line_tax_ids": [[6, false, [1]]], "active_id": false, "active_ids": [], - "active_model": "account.invoice.line", + "active_model": "account.move.line", "parent": { "id": false, "journal_id": 10, "number": false, "type": "out_invoice", "currency_id": 1, "partner_id": 4, "fiscal_position_id": false, - "date_invoice": false, "date": false, + "invoice_date": false, "date": false, "payment_term_id": false, "reference": false, "account_id": 440, "name": false, "tax_line_ids": [], "amount_untaxed": 0, "amount_tax": 0, "reconciled": false, "amount_total": 0, - "state": "draft", "residual": 0, "company_id": 1, + "state": "draft", "amount_residual": 0, "company_id": 1, "date_due": false, "user_id": 1, "partner_bank_id": false, "origin": false, "move_id": false, "comment": false, diff --git a/addons/web/static/tests/fields/relational_fields/field_many2one_tests.js b/addons/web/static/tests/fields/relational_fields/field_many2one_tests.js index ed38fbbaf03..b32f8478ccf 100644 --- a/addons/web/static/tests/fields/relational_fields/field_many2one_tests.js +++ b/addons/web/static/tests/fields/relational_fields/field_many2one_tests.js @@ -1676,9 +1676,7 @@ QUnit.module('fields', {}, function () { obj.turtles, [ [4, 2, false], - [1, 2, { turtle_foo: 'blip' }], [4, 3, false], - [1, 3, { turtle_foo: 'kawa' }] ], "should have properly created the x2many command list"); }; @@ -1702,14 +1700,9 @@ QUnit.module('fields', {}, function () { return Promise.resolve({ turtles: [[6, 0, [2, 3]]] }); } if (args.method === 'create') { - // it would be even better if we did not send the current - // unchanged state with the command 1, but this seems more - // difficult. assert.deepEqual(args.args[0].turtles, [ [4, 2, false], - [1, 2, { turtle_foo: 'blip' }], [4, 3, false], - [1, 3, { turtle_foo: 'kawa' }] ], 'should send proper commands to create method'); } return this._super.apply(this, arguments); diff --git a/addons/web/static/tests/fields/relational_fields/field_one2many_tests.js b/addons/web/static/tests/fields/relational_fields/field_one2many_tests.js index 4df25289083..f1f5f2a5e7e 100644 --- a/addons/web/static/tests/fields/relational_fields/field_one2many_tests.js +++ b/addons/web/static/tests/fields/relational_fields/field_one2many_tests.js @@ -7897,7 +7897,7 @@ QUnit.module('fields', {}, function () { data: this.data, arch: '<form string="Partners">' + '<header>' + - '<button name="action_invoice_open" type="object" string="Validate" class="oe_highlight"/>' + + '<button name="post" type="object" string="Validate" class="oe_highlight"/>' + '</header>' + '<field name="turtles">' + '<tree editable="bottom">' + @@ -7915,7 +7915,7 @@ QUnit.module('fields', {}, function () { }, }); - await testUtils.dom.click($('button[name="action_invoice_open"]')); + await testUtils.dom.click($('button[name="post"]')); await testUtils.dom.click(form.$('.o_field_x2many_list_row_add a')); form.destroy(); }); |