mirror of
https://github.com/OCA/contract.git
synced 2025-02-13 17:57:24 +02:00
[IMP] agreement_legal: Replace the created_by + date_created fields.
The created_by + date_created fields are removed and will be displayed in the view create_uid + create_date or related fields (create_uid_parent + create_date_parent). TT32469
This commit is contained in:
@@ -210,6 +210,12 @@ class Agreement(models.Model):
|
|||||||
"agreement is an amendment to another agreement. This list will "
|
"agreement is an amendment to another agreement. This list will "
|
||||||
"only show other agreements related to the same account.",
|
"only show other agreements related to the same account.",
|
||||||
)
|
)
|
||||||
|
create_uid_parent = fields.Many2one(
|
||||||
|
related="parent_agreement_id.create_uid", string="Created by (parent)"
|
||||||
|
)
|
||||||
|
create_date_parent = fields.Datetime(
|
||||||
|
related="parent_agreement_id.create_date", string="Created on (parent)"
|
||||||
|
)
|
||||||
recital_ids = fields.One2many(
|
recital_ids = fields.One2many(
|
||||||
"agreement.recital", "agreement_id", string="Recitals", copy=True
|
"agreement.recital", "agreement_id", string="Recitals", copy=True
|
||||||
)
|
)
|
||||||
@@ -279,19 +285,6 @@ class Agreement(models.Model):
|
|||||||
help="""Final placeholder expression, to be copy-pasted in the desired
|
help="""Final placeholder expression, to be copy-pasted in the desired
|
||||||
template field.""",
|
template field.""",
|
||||||
)
|
)
|
||||||
created_by = fields.Many2one(
|
|
||||||
"res.users",
|
|
||||||
string="Created By",
|
|
||||||
copy=False,
|
|
||||||
default=lambda self: self.env.user,
|
|
||||||
help="User which create the agreement.",
|
|
||||||
)
|
|
||||||
date_created = fields.Datetime(
|
|
||||||
string="Created On",
|
|
||||||
copy=False,
|
|
||||||
default=lambda self: fields.Datetime.now(),
|
|
||||||
help="Date which create the agreement.",
|
|
||||||
)
|
|
||||||
template_id = fields.Many2one(
|
template_id = fields.Many2one(
|
||||||
"agreement",
|
"agreement",
|
||||||
string="Template",
|
string="Template",
|
||||||
@@ -384,8 +377,6 @@ class Agreement(models.Model):
|
|||||||
"parent_agreement_id": self.id,
|
"parent_agreement_id": self.id,
|
||||||
"version": self.version,
|
"version": self.version,
|
||||||
"revision": self.revision,
|
"revision": self.revision,
|
||||||
"created_by": self.created_by.id,
|
|
||||||
"date_created": self.date_created,
|
|
||||||
"code": "{}-V{}".format(self.code, str(self.version)),
|
"code": "{}-V{}".format(self.code, str(self.version)),
|
||||||
"stage_id": self.stage_id.id,
|
"stage_id": self.stage_id.id,
|
||||||
}
|
}
|
||||||
@@ -400,13 +391,8 @@ class Agreement(models.Model):
|
|||||||
# Make a current copy and mark it as old
|
# Make a current copy and mark it as old
|
||||||
rec.copy(default=rec._get_old_version_default_vals())
|
rec.copy(default=rec._get_old_version_default_vals())
|
||||||
# Update version, created by and created on
|
# Update version, created by and created on
|
||||||
rec.update(
|
rec.update({"version": rec.version + 1})
|
||||||
{
|
# Reset revision to 0 since it's a new version
|
||||||
"version": rec.version + 1,
|
|
||||||
"created_by": self.env.user.id,
|
|
||||||
"date_created": fields.Datetime.now(),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
return super().write({"revision": 0})
|
return super().write({"revision": 0})
|
||||||
|
|
||||||
def _get_new_agreement_default_vals(self):
|
def _get_new_agreement_default_vals(self):
|
||||||
|
|||||||
@@ -364,8 +364,27 @@
|
|||||||
name="revision"
|
name="revision"
|
||||||
readonly="True"
|
readonly="True"
|
||||||
/>
|
/>
|
||||||
| Created By: <field name="created_by" readonly="True" />
|
| Created By:
|
||||||
| Created On: <field name="date_created" readonly="True" />
|
<field
|
||||||
|
name="create_uid"
|
||||||
|
readonly="True"
|
||||||
|
attrs="{'invisible': [('parent_agreement_id', '!=', False)]}"
|
||||||
|
/>
|
||||||
|
<field
|
||||||
|
name="create_uid_parent"
|
||||||
|
attrs="{'invisible': [('parent_agreement_id', '=', False)]}"
|
||||||
|
/>
|
||||||
|
| Created On:
|
||||||
|
<field
|
||||||
|
name="create_date"
|
||||||
|
readonly="True"
|
||||||
|
attrs="{'invisible': [('parent_agreement_id', '!=', False)]}"
|
||||||
|
/>
|
||||||
|
<field
|
||||||
|
name="create_date_parent"
|
||||||
|
readonly="True"
|
||||||
|
attrs="{'invisible': [('parent_agreement_id', '=', False)]}"
|
||||||
|
/>
|
||||||
</p>
|
</p>
|
||||||
</sheet>
|
</sheet>
|
||||||
<div class="oe_chatter">
|
<div class="oe_chatter">
|
||||||
|
|||||||
Reference in New Issue
Block a user