[IMP] agreement: Provide the value to copy for non-relational fields

This commit is contained in:
Maxime Chambreuil
2019-03-27 13:09:03 -06:00
parent 4bc9d0b159
commit 499ab4bcb7
5 changed files with 39 additions and 16 deletions

View File

@@ -342,11 +342,15 @@ class Agreement(models.Model):
@api.onchange('sub_model_object_field_id', 'default_value')
def onchange_copyvalue(self):
if self.sub_model_object_field_id or self.default_value:
self.copyvalue = "${object.%s.%s or %s}" % \
if self.field_id or self.default_value:
self.copyvalue = "${object.%s or %s}" % \
(self.field_id.name,
self.sub_model_object_field_id.name,
self.default_value or '\'\'')
if self.sub_model_object_field_id or self.default_value:
self.copyvalue = "${object.%s.%s or %s}" % \
(self.field_id.name,
self.sub_model_object_field_id.name,
self.default_value or '\'\'')
# Used for Kanban grouped_by view
@api.model

View File

@@ -57,11 +57,15 @@ class AgreementAppendix(models.Model):
@api.onchange('sub_model_object_field_id', 'default_value')
def onchange_copyvalue(self):
if self.sub_model_object_field_id or self.default_value:
self.copyvalue = "${object.%s.%s or %s}" % \
if self.field_id or self.default_value:
self.copyvalue = "${object.%s or %s}" % \
(self.field_id.name,
self.sub_model_object_field_id.name,
self.default_value or '\'\'')
if self.sub_model_object_field_id or self.default_value:
self.copyvalue = "${object.%s.%s or %s}" % \
(self.field_id.name,
self.sub_model_object_field_id.name,
self.default_value or '\'\'')
# compute the dynamic content for mako expression
@api.multi

View File

@@ -66,11 +66,15 @@ class AgreementClause(models.Model):
@api.onchange('sub_model_object_field_id', 'default_value')
def onchange_copyvalue(self):
if self.sub_model_object_field_id or self.default_value:
self.copyvalue = "${object.%s.%s or %s}" % \
if self.field_id or self.default_value:
self.copyvalue = "${object.%s or %s}" % \
(self.field_id.name,
self.sub_model_object_field_id.name,
self.default_value or '\'\'')
if self.sub_model_object_field_id or self.default_value:
self.copyvalue = "${object.%s.%s or %s}" % \
(self.field_id.name,
self.sub_model_object_field_id.name,
self.default_value or '\'\'')
# compute the dynamic content for mako expression
@api.multi

View File

@@ -58,11 +58,15 @@ class AgreementRecital(models.Model):
@api.onchange('sub_model_object_field_id', 'default_value')
def onchange_copyvalue(self):
if self.sub_model_object_field_id or self.default_value:
self.copyvalue = "${object.%s.%s or %s}" % \
if self.field_id or self.default_value:
self.copyvalue = "${object.%s or %s}" % \
(self.field_id.name,
self.sub_model_object_field_id.name,
self.default_value or '\'\'')
if self.sub_model_object_field_id or self.default_value:
self.copyvalue = "${object.%s.%s or %s}" % \
(self.field_id.name,
self.sub_model_object_field_id.name,
self.default_value or '\'\'')
# compute the dynamic content for mako expression
@api.multi

View File

@@ -54,14 +54,21 @@ class AgreementSection(models.Model):
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('sub_model_object_field_id', 'default_value')
@api.onchange('field_id', 'sub_model_object_field_id', 'default_value')
def onchange_copyvalue(self):
if self.sub_model_object_field_id or self.default_value:
self.copyvalue = "${object.%s.%s or %s}" % \
if self.field_id or self.default_value:
self.copyvalue = "${object.%s or %s}" % \
(self.field_id.name,
self.sub_model_object_field_id.name,
self.default_value or '\'\'')
if self.sub_model_object_field_id or self.default_value:
self.copyvalue = "${object.%s.%s or %s}" %\
(self.field_id.name,
self.sub_model_object_field_id.name,
self.default_value or '\'\'')
# compute the dynamic content for mako expression
@api.multi