[MERGE] forward port branch saas-11.2 up to 42659dc70c2

1 files changed, 7 insertions, 2 deletions

diff --git a/addons/web/static/src/js/views/basic/basic_view.js b/addons/web/static/src/js/views/basic/basic_view.js
index df9f9807bfd..b4df9c8e09e 100644
--- a/addons/web/static/src/js/views/basic/basic_view.js
+++ b/addons/web/static/src/js/views/basic/basic_view.js
@@ -45,7 +45,7 @@ var BasicView = AbstractView.extend({
         this.rendererParams.viewType = this.viewType;
 
         this.controllerParams.confirmOnDelete = true;
-        this.controllerParams.archiveEnabled = 'active' in viewInfo.fields;
+        this.controllerParams.archiveEnabled = 'active' in this.fields;
         this.controllerParams.hasButtons =
                 'action_buttons' in params ? params.action_buttons : true;
 
@@ -161,7 +161,12 @@ var BasicView = AbstractView.extend({
                 // (because those fields were unknow at that time). So we ask
                 // the model to process them.
                 def = this.model.applyRawChanges(record.id, viewType).then(function () {
-                    if (!self.model.isNew(record.id)) {
+                    if (self.model.isNew(record.id)) {
+                        return self.model.applyDefaultValues(record.id, {}, {
+                            fieldNames: fieldNames,
+                            viewType: viewType,
+                        });
+                    } else {
                         return self.model.reload(record.id, {
                             fieldNames: fieldNames,
                             keepChanges: true,