From a118dc71410a7c1bac15c1c8cc573391d8021fad Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Wed, 27 Mar 2019 12:47:02 -0600 Subject: [PATCH 01/11] [FIX] agreement: Issue #290 --- agreement/models/agreement_appendix.py | 2 +- agreement/models/agreement_clause.py | 2 +- agreement/models/agreement_recital.py | 2 +- agreement/models/agreement_section.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/agreement/models/agreement_appendix.py b/agreement/models/agreement_appendix.py index 8699d5793..03ff83372 100644 --- a/agreement/models/agreement_appendix.py +++ b/agreement/models/agreement_appendix.py @@ -51,7 +51,7 @@ class AgreementAppendix(models.Model): @api.onchange('field_id') def onchange_sub_object_id(self): - if self.field_id: + if self.field_id and self.field_id.relation: self.sub_object_id = self.env['ir.model'].search( [('model', '=', self.field_id.relation)])[0] diff --git a/agreement/models/agreement_clause.py b/agreement/models/agreement_clause.py index 00651f984..fd3e979d2 100644 --- a/agreement/models/agreement_clause.py +++ b/agreement/models/agreement_clause.py @@ -60,7 +60,7 @@ class AgreementClause(models.Model): @api.onchange('field_id') def onchange_sub_object_id(self): - if self.field_id: + if self.field_id and self.field_id.relation: self.sub_object_id = self.env['ir.model'].search( [('model', '=', self.field_id.relation)])[0] diff --git a/agreement/models/agreement_recital.py b/agreement/models/agreement_recital.py index c466f45d2..ea4243103 100644 --- a/agreement/models/agreement_recital.py +++ b/agreement/models/agreement_recital.py @@ -52,7 +52,7 @@ class AgreementRecital(models.Model): @api.onchange('field_id') def onchange_sub_object_id(self): - if self.field_id: + if self.field_id and self.field_id.relation: self.sub_object_id = self.env['ir.model'].search( [('model', '=', self.field_id.relation)])[0] diff --git a/agreement/models/agreement_section.py b/agreement/models/agreement_section.py index 2ee345c6c..fe8e46d73 100644 --- a/agreement/models/agreement_section.py +++ b/agreement/models/agreement_section.py @@ -51,7 +51,7 @@ class AgreementSection(models.Model): @api.onchange('field_id') def onchange_sub_object_id(self): - if self.field_id: + if self.field_id and self.field_id.relation: self.sub_object_id = self.env['ir.model'].search( [('model', '=', self.field_id.relation)])[0] From 4bc9d0b15996a1d54fd4ba80c46fcd848cdb5b2d Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Wed, 27 Mar 2019 12:53:30 -0600 Subject: [PATCH 02/11] [FIX] agreement: Issue #290 --- agreement/models/agreement.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agreement/models/agreement.py b/agreement/models/agreement.py index c2ce8bb2a..58a930dd2 100644 --- a/agreement/models/agreement.py +++ b/agreement/models/agreement.py @@ -336,7 +336,7 @@ class Agreement(models.Model): @api.onchange('field_id') def onchange_sub_object_id(self): - if self.field_id: + if self.field_id and self.field_id.relation: self.sub_object_id = self.env['ir.model'].search( [('model', '=', self.field_id.relation)])[0] From 499ab4bcb7b1354f518dabff3dbf7c6dfc2e6d6b Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Wed, 27 Mar 2019 13:09:03 -0600 Subject: [PATCH 03/11] [IMP] agreement: Provide the value to copy for non-relational fields --- agreement/models/agreement.py | 10 +++++++--- agreement/models/agreement_appendix.py | 10 +++++++--- agreement/models/agreement_clause.py | 10 +++++++--- agreement/models/agreement_recital.py | 10 +++++++--- agreement/models/agreement_section.py | 15 +++++++++++---- 5 files changed, 39 insertions(+), 16 deletions(-) diff --git a/agreement/models/agreement.py b/agreement/models/agreement.py index 58a930dd2..1cf44a1fe 100644 --- a/agreement/models/agreement.py +++ b/agreement/models/agreement.py @@ -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 diff --git a/agreement/models/agreement_appendix.py b/agreement/models/agreement_appendix.py index 03ff83372..0d3d2a558 100644 --- a/agreement/models/agreement_appendix.py +++ b/agreement/models/agreement_appendix.py @@ -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 diff --git a/agreement/models/agreement_clause.py b/agreement/models/agreement_clause.py index fd3e979d2..38e37ab68 100644 --- a/agreement/models/agreement_clause.py +++ b/agreement/models/agreement_clause.py @@ -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 diff --git a/agreement/models/agreement_recital.py b/agreement/models/agreement_recital.py index ea4243103..4cc43db42 100644 --- a/agreement/models/agreement_recital.py +++ b/agreement/models/agreement_recital.py @@ -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 diff --git a/agreement/models/agreement_section.py b/agreement/models/agreement_section.py index fe8e46d73..86e9db16b 100644 --- a/agreement/models/agreement_section.py +++ b/agreement/models/agreement_section.py @@ -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 From 2d450ad4372739fbdd127ed0346dfb07e20b2ae2 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Wed, 27 Mar 2019 16:21:06 -0600 Subject: [PATCH 04/11] [FIX] agreement: dynamic field computation --- agreement/models/agreement.py | 21 +++++++++++---------- agreement/models/agreement_appendix.py | 21 +++++++++++---------- agreement/models/agreement_clause.py | 21 +++++++++++---------- agreement/models/agreement_recital.py | 21 +++++++++++---------- agreement/models/agreement_section.py | 20 +++++++++----------- 5 files changed, 53 insertions(+), 51 deletions(-) diff --git a/agreement/models/agreement.py b/agreement/models/agreement.py index 1cf44a1fe..37feb4b4f 100644 --- a/agreement/models/agreement.py +++ b/agreement/models/agreement.py @@ -334,20 +334,21 @@ class Agreement(models.Model): for record in self: record.total_company_mrc = amount_total - @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] - - @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.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.copyvalue = "${object.%s.%s or %s}" % \ + 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, self.default_value or '\'\'') diff --git a/agreement/models/agreement_appendix.py b/agreement/models/agreement_appendix.py index 0d3d2a558..a224d7a0e 100644 --- a/agreement/models/agreement_appendix.py +++ b/agreement/models/agreement_appendix.py @@ -49,20 +49,21 @@ class AgreementAppendix(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] - - @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.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.copyvalue = "${object.%s.%s or %s}" % \ + 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, self.default_value or '\'\'') diff --git a/agreement/models/agreement_clause.py b/agreement/models/agreement_clause.py index 38e37ab68..84dbc19b2 100644 --- a/agreement/models/agreement_clause.py +++ b/agreement/models/agreement_clause.py @@ -58,20 +58,21 @@ class AgreementClause(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] - - @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.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.copyvalue = "${object.%s.%s or %s}" % \ + 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, self.default_value or '\'\'') diff --git a/agreement/models/agreement_recital.py b/agreement/models/agreement_recital.py index 4cc43db42..b10ea4a32 100644 --- a/agreement/models/agreement_recital.py +++ b/agreement/models/agreement_recital.py @@ -50,20 +50,21 @@ class AgreementRecital(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] - - @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.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.copyvalue = "${object.%s.%s or %s}" % \ + 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, self.default_value or '\'\'') diff --git a/agreement/models/agreement_section.py b/agreement/models/agreement_section.py index 86e9db16b..74e7ebbaf 100644 --- a/agreement/models/agreement_section.py +++ b/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, From 2071b1141dfbae9626b77744e971881308b68cc6 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Thu, 28 Mar 2019 08:49:59 -0600 Subject: [PATCH 05/11] [FIX] PEP8 errors --- agreement/models/agreement.py | 2 +- agreement/models/agreement_appendix.py | 2 +- agreement/models/agreement_clause.py | 2 +- agreement/models/agreement_recital.py | 2 +- agreement/models/agreement_section.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/agreement/models/agreement.py b/agreement/models/agreement.py index 37feb4b4f..d9595e27e 100644 --- a/agreement/models/agreement.py +++ b/agreement/models/agreement.py @@ -346,7 +346,7 @@ class Agreement(models.Model): 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] + [('model', '=', self.field_id.relation)])[0] if self.sub_model_object_field_id: self.copyvalue = "${object.%s.%s or %s}" %\ (self.field_id.name, diff --git a/agreement/models/agreement_appendix.py b/agreement/models/agreement_appendix.py index a224d7a0e..9c0d799d3 100644 --- a/agreement/models/agreement_appendix.py +++ b/agreement/models/agreement_appendix.py @@ -61,7 +61,7 @@ class AgreementAppendix(models.Model): 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] + [('model', '=', self.field_id.relation)])[0] if self.sub_model_object_field_id: self.copyvalue = "${object.%s.%s or %s}" %\ (self.field_id.name, diff --git a/agreement/models/agreement_clause.py b/agreement/models/agreement_clause.py index 84dbc19b2..c8ae2a75a 100644 --- a/agreement/models/agreement_clause.py +++ b/agreement/models/agreement_clause.py @@ -70,7 +70,7 @@ class AgreementClause(models.Model): 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] + [('model', '=', self.field_id.relation)])[0] if self.sub_model_object_field_id: self.copyvalue = "${object.%s.%s or %s}" %\ (self.field_id.name, diff --git a/agreement/models/agreement_recital.py b/agreement/models/agreement_recital.py index b10ea4a32..c7a30adba 100644 --- a/agreement/models/agreement_recital.py +++ b/agreement/models/agreement_recital.py @@ -62,7 +62,7 @@ class AgreementRecital(models.Model): 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] + [('model', '=', self.field_id.relation)])[0] if self.sub_model_object_field_id: self.copyvalue = "${object.%s.%s or %s}" %\ (self.field_id.name, diff --git a/agreement/models/agreement_section.py b/agreement/models/agreement_section.py index 74e7ebbaf..e6a2b2aef 100644 --- a/agreement/models/agreement_section.py +++ b/agreement/models/agreement_section.py @@ -61,7 +61,7 @@ class AgreementSection(models.Model): 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] + [('model', '=', self.field_id.relation)])[0] if self.sub_model_object_field_id: self.copyvalue = "${object.%s.%s or %s}" %\ (self.field_id.name, From b5ee7a5ab642637c06cf9660ca58229c6a66ec24 Mon Sep 17 00:00:00 2001 From: Yves Goldberg Date: Thu, 11 Apr 2019 09:51:47 -0500 Subject: [PATCH 06/11] Update agreement/models/agreement.py Co-Authored-By: max3903 --- agreement/models/agreement.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/agreement/models/agreement.py b/agreement/models/agreement.py index d9595e27e..e96b303a6 100644 --- a/agreement/models/agreement.py +++ b/agreement/models/agreement.py @@ -347,7 +347,12 @@ class Agreement(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] - if self.sub_model_object_field_id: + 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, + self.default_value or '\'\'') + self.copyvalue = "${object.%s.%s or %s}" %\ (self.field_id.name, self.sub_model_object_field_id.name, From 8d97f772adf6969949634ecfe04068e8292f0311 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Thu, 11 Apr 2019 09:53:18 -0500 Subject: [PATCH 07/11] Update agreement.py --- agreement/models/agreement.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/agreement/models/agreement.py b/agreement/models/agreement.py index e96b303a6..963398306 100644 --- a/agreement/models/agreement.py +++ b/agreement/models/agreement.py @@ -353,11 +353,6 @@ class Agreement(models.Model): self.sub_model_object_field_id.name, self.default_value or '\'\'') - 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 def _read_group_stage_ids(self, stages, domain, order): From da18339f85bcff0bbd6f86929a0c49c6a91c0da0 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Thu, 11 Apr 2019 09:54:08 -0500 Subject: [PATCH 08/11] Update agreement_appendix.py --- agreement/models/agreement_appendix.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/agreement/models/agreement_appendix.py b/agreement/models/agreement_appendix.py index 9c0d799d3..d70f2e21b 100644 --- a/agreement/models/agreement_appendix.py +++ b/agreement/models/agreement_appendix.py @@ -62,11 +62,11 @@ class AgreementAppendix(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] - 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, - self.default_value or '\'\'') + 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, + self.default_value or '\'\'') # compute the dynamic content for mako expression @api.multi From d99303c3470c33019205f8f00af9c0de4118b8db Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Thu, 11 Apr 2019 09:54:37 -0500 Subject: [PATCH 09/11] Update agreement_clause.py --- agreement/models/agreement_clause.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/agreement/models/agreement_clause.py b/agreement/models/agreement_clause.py index c8ae2a75a..182f42279 100644 --- a/agreement/models/agreement_clause.py +++ b/agreement/models/agreement_clause.py @@ -71,11 +71,11 @@ class AgreementClause(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] - 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, - self.default_value or '\'\'') + 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, + self.default_value or '\'\'') # compute the dynamic content for mako expression @api.multi From 238d847fa3859181d299fdc31f2bf1f441135187 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Thu, 11 Apr 2019 09:55:09 -0500 Subject: [PATCH 10/11] Update agreement_recital.py --- agreement/models/agreement_recital.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/agreement/models/agreement_recital.py b/agreement/models/agreement_recital.py index c7a30adba..47bc28bc8 100644 --- a/agreement/models/agreement_recital.py +++ b/agreement/models/agreement_recital.py @@ -63,11 +63,11 @@ class AgreementRecital(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] - 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, - self.default_value or '\'\'') + 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, + self.default_value or '\'\'') # compute the dynamic content for mako expression @api.multi From ffa0a841c9c2b7138b7589748203f5cb131b81bb Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Thu, 11 Apr 2019 09:55:31 -0500 Subject: [PATCH 11/11] Update agreement_section.py --- agreement/models/agreement_section.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/agreement/models/agreement_section.py b/agreement/models/agreement_section.py index e6a2b2aef..ea80af770 100644 --- a/agreement/models/agreement_section.py +++ b/agreement/models/agreement_section.py @@ -62,11 +62,11 @@ 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] - 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, - self.default_value or '\'\'') + 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, + self.default_value or '\'\'') # compute the dynamic content for mako expression @api.multi