[FIX] agreement: dynamic field computation

agreement/models/agreement.py

@@ -334,19 +334,20 @@ class Agreement(models.Model):
         for record in self:
             record.total_company_mrc = amount_total
 
-    @api.onchange('field_id')
+    @api.onchange('field_id', 'sub_model_object_field_id', 'default_value')
-    def onchange_sub_object_id(self):
-        if self.field_id and self.field_id.relation:
-            self.sub_object_id = self.env['ir.model'].search(
-                [('model', '=', self.field_id.relation)])[0]
-
-    @api.onchange('sub_model_object_field_id', 'default_value')
     def onchange_copyvalue(self):
-        if self.field_id or self.default_value:
+        self.sub_object_id = False
+        self.copyvalue = False
+        self.sub_object_id = False
+        if self.field_id and not self.field_id.relation:
             self.copyvalue = "${object.%s or %s}" % \
                              (self.field_id.name,
                               self.default_value or '\'\'')
-            if self.sub_model_object_field_id or self.default_value:
+            self.sub_model_object_field_id = False
+        if self.field_id and self.field_id.relation:
+            self.sub_object_id = self.env['ir.model'].search(
+                    [('model', '=', self.field_id.relation)])[0]
+            if self.sub_model_object_field_id:
                 self.copyvalue = "${object.%s.%s or %s}" %\
                                  (self.field_id.name,
                                   self.sub_model_object_field_id.name,

agreement/models/agreement_appendix.py

@@ -49,19 +49,20 @@ class AgreementAppendix(models.Model):
         help="""Final placeholder expression, to be copy-pasted in the desired
          template field.""")
 
-    @api.onchange('field_id')
+    @api.onchange('field_id', 'sub_model_object_field_id', 'default_value')
-    def onchange_sub_object_id(self):
-        if self.field_id and self.field_id.relation:
-            self.sub_object_id = self.env['ir.model'].search(
-                [('model', '=', self.field_id.relation)])[0]
-
-    @api.onchange('sub_model_object_field_id', 'default_value')
     def onchange_copyvalue(self):
-        if self.field_id or self.default_value:
+        self.sub_object_id = False
+        self.copyvalue = False
+        self.sub_object_id = False
+        if self.field_id and not self.field_id.relation:
             self.copyvalue = "${object.%s or %s}" % \
                              (self.field_id.name,
                               self.default_value or '\'\'')
-            if self.sub_model_object_field_id or self.default_value:
+            self.sub_model_object_field_id = False
+        if self.field_id and self.field_id.relation:
+            self.sub_object_id = self.env['ir.model'].search(
+                    [('model', '=', self.field_id.relation)])[0]
+            if self.sub_model_object_field_id:
                 self.copyvalue = "${object.%s.%s or %s}" %\
                                  (self.field_id.name,
                                   self.sub_model_object_field_id.name,

agreement/models/agreement_clause.py

@@ -58,19 +58,20 @@ class AgreementClause(models.Model):
         help="""Final placeholder expression, to be copy-pasted in the desired
          template field.""")
 
-    @api.onchange('field_id')
+    @api.onchange('field_id', 'sub_model_object_field_id', 'default_value')
-    def onchange_sub_object_id(self):
-        if self.field_id and self.field_id.relation:
-            self.sub_object_id = self.env['ir.model'].search(
-                [('model', '=', self.field_id.relation)])[0]
-
-    @api.onchange('sub_model_object_field_id', 'default_value')
     def onchange_copyvalue(self):
-        if self.field_id or self.default_value:
+        self.sub_object_id = False
+        self.copyvalue = False
+        self.sub_object_id = False
+        if self.field_id and not self.field_id.relation:
             self.copyvalue = "${object.%s or %s}" % \
                              (self.field_id.name,
                               self.default_value or '\'\'')
-            if self.sub_model_object_field_id or self.default_value:
+            self.sub_model_object_field_id = False
+        if self.field_id and self.field_id.relation:
+            self.sub_object_id = self.env['ir.model'].search(
+                    [('model', '=', self.field_id.relation)])[0]
+            if self.sub_model_object_field_id:
                 self.copyvalue = "${object.%s.%s or %s}" %\
                                  (self.field_id.name,
                                   self.sub_model_object_field_id.name,

agreement/models/agreement_recital.py

@@ -50,19 +50,20 @@ class AgreementRecital(models.Model):
         help="""Final placeholder expression, to be copy-pasted in the desired
          template field.""")
 
-    @api.onchange('field_id')
+    @api.onchange('field_id', 'sub_model_object_field_id', 'default_value')
-    def onchange_sub_object_id(self):
-        if self.field_id and self.field_id.relation:
-            self.sub_object_id = self.env['ir.model'].search(
-                [('model', '=', self.field_id.relation)])[0]
-
-    @api.onchange('sub_model_object_field_id', 'default_value')
     def onchange_copyvalue(self):
-        if self.field_id or self.default_value:
+        self.sub_object_id = False
+        self.copyvalue = False
+        self.sub_object_id = False
+        if self.field_id and not self.field_id.relation:
             self.copyvalue = "${object.%s or %s}" % \
                              (self.field_id.name,
                               self.default_value or '\'\'')
-            if self.sub_model_object_field_id or self.default_value:
+            self.sub_model_object_field_id = False
+        if self.field_id and self.field_id.relation:
+            self.sub_object_id = self.env['ir.model'].search(
+                    [('model', '=', self.field_id.relation)])[0]
+            if self.sub_model_object_field_id:
                 self.copyvalue = "${object.%s.%s or %s}" %\
                                  (self.field_id.name,
                                   self.sub_model_object_field_id.name,

agreement/models/agreement_section.py

@@ -49,22 +49,20 @@ class AgreementSection(models.Model):
         help="""Final placeholder expression, to be copy-pasted in the desired
          template field.""")
 
-    @api.onchange('field_id')
-    def onchange_sub_object_id(self):
-        if self.field_id and self.field_id.relation:
-            self.sub_object_id = self.env['ir.model'].search(
-                [('model', '=', self.field_id.relation)])[0]
-        else:
-            self.sub_object_id = False
-
-
     @api.onchange('field_id', 'sub_model_object_field_id', 'default_value')
     def onchange_copyvalue(self):
-        if self.field_id or self.default_value:
+        self.sub_object_id = False
+        self.copyvalue = False
+        self.sub_object_id = False
+        if self.field_id and not self.field_id.relation:
             self.copyvalue = "${object.%s or %s}" % \
                              (self.field_id.name,
                               self.default_value or '\'\'')
-            if self.sub_model_object_field_id or self.default_value:
+            self.sub_model_object_field_id = False
+        if self.field_id and self.field_id.relation:
+            self.sub_object_id = self.env['ir.model'].search(
+                    [('model', '=', self.field_id.relation)])[0]
+            if self.sub_model_object_field_id:
                 self.copyvalue = "${object.%s.%s or %s}" %\
                                  (self.field_id.name,
                                   self.sub_model_object_field_id.name,