audrius/contract
1
0
Fork 1
mirror of https://github.com/OCA/contract.git synced 2025-02-13 17:57:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

[UPD] remove field reference and use field code

Browse Source
This commit is contained in:
Yves Goldberg
2019-04-02 18:42:13 +02:00
parent 45006663cd
commit 0d63ca642c
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
agreement_legal/models/agreement.py
View File

@@ -96,18 +96,14 @@ class Agreement(models.Model):
string="Dynamic Special Terms", string="Dynamic Special Terms",
help="Compute dynamic special terms", help="Compute dynamic special terms",
) )
reference = fields.Char( code = fields.Char(
string="Reference", string="Reference",
copy=False,
required=True, required=True,
default=lambda self: _("New"), default=lambda self: _("New"),
track_visibility="onchange", track_visibility="onchange",
copy=False,
help="ID used for internal contract tracking.", help="ID used for internal contract tracking.",
) )
code = fields.Char(
required=True,
default=lambda self: _("New"),
copy=False)
increase_type_id = fields.Many2one( increase_type_id = fields.Many2one(
"agreement.increasetype", "agreement.increasetype",
string="Increase Type", string="Increase Type",
@@ -372,13 +368,11 @@ class Agreement(models.Model):
"name": "{} - OLD VERSION".format(rec.name), "name": "{} - OLD VERSION".format(rec.name),
"active": False, "active": False,
"parent_agreement_id": rec.id, "parent_agreement_id": rec.id,
"code": "{} - OLD VERSION".format(rec.code),
} }
# Make a current copy and mark it as old # Make a current copy and mark it as old
rec.copy(default=default_vals) rec.copy(default=default_vals)
# Increment the Version # Increment the Version
rec.version = rec.version + 1 rec.version = rec.version + 1
rec.code = rec.code + "v" + str(rec.version)
# Reset revision to 0 since it's a new version # Reset revision to 0 since it's a new version
vals["revision"] = 0 vals["revision"] = 0
return super(Agreement, self).write(vals) return super(Agreement, self).write(vals)
@@ -386,7 +380,6 @@ class Agreement(models.Model):
def create_new_agreement(self): def create_new_agreement(self):
default_vals = { default_vals = {
"name": "NEW", "name": "NEW",
"code": "NEW",
"active": True, "active": True,
"version": 1, "version": 1,
"revision": 0, "revision": 0,
@@ -403,12 +396,10 @@ class Agreement(models.Model):
@api.model @api.model
def create(self, vals): def create(self, vals):
if vals.get("reference", _("New")) == _("New"): if vals.get("code", _("New")) == _("New"):
vals["reference"] = self.env["ir.sequence"].next_by_code( vals["code"] = self.env["ir.sequence"].next_by_code(
"agreement" "agreement"
) or _("New") ) or _("New")
if vals.get("code", _("New")) == _("New"):
vals["code"] = vals["reference"]
return super(Agreement, self).create(vals) return super(Agreement, self).create(vals)
# Increments the revision on each save action # Increments the revision on each save action

3
agreement_legal/views/agreement.xml
View File

@@ -40,8 +40,7 @@
</div> </div>
<group string="General"> <group string="General">
<group> <group>
<field name="code"/> <field name="code" readonly="1"/>
<field name="reference" readonly="1"/>
<field name="parent_agreement_id" <field name="parent_agreement_id"
domain="[('partner_id', '=', partner_id)]"/> domain="[('partner_id', '=', partner_id)]"/>
<field name="is_template"/> <field name="is_template"/>