OCA
/
contract
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #293 from ursais/11.0-fix-issue-290 

[FIX] agreement: Issue #290
pull/317/head
Maxime Chambreuil 6 years ago
committed by GitHub
parent
efd500ec24 ffa0a841c9
commit
882eb64f6d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 65 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      agreement/models/agreement.py
  2. 21
      agreement/models/agreement_appendix.py
  3. 21
      agreement/models/agreement_clause.py
  4. 21
      agreement/models/agreement_recital.py
  5. 21
      agreement/models/agreement_section.py

21
agreement/models/agreement.py
View File

@ -334,16 +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:
@api.onchange('field_id', 'sub_model_object_field_id', 'default_value')
def onchange_copyvalue(self):
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 '\'\'')
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]
@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.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 '\'\'')

21
agreement/models/agreement_appendix.py
View File

@ -49,16 +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:
@api.onchange('field_id', 'sub_model_object_field_id', 'default_value')
def onchange_copyvalue(self):
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 '\'\'')
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]
@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.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 '\'\'')

21
agreement/models/agreement_clause.py
View File

@ -58,16 +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:
@api.onchange('field_id', 'sub_model_object_field_id', 'default_value')
def onchange_copyvalue(self):
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 '\'\'')
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]
@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.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 '\'\'')

21
agreement/models/agreement_recital.py
View File

@ -50,16 +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:
@api.onchange('field_id', 'sub_model_object_field_id', 'default_value')
def onchange_copyvalue(self):
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 '\'\'')
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]
@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.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 '\'\'')

21
agreement/models/agreement_section.py
View File

@ -49,16 +49,21 @@ 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:
@api.onchange('field_id', 'sub_model_object_field_id', 'default_value')
def onchange_copyvalue(self):
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 '\'\'')
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]
@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.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 '\'\'')

Write Preview
Loading…
Cancel
Save