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

Merge PR #730 into 13.0

Browse Source 
Signed-off-by AaronHForgeFlow
This commit is contained in:
OCA-git-bot
2021-11-19 10:26:37 +00:00
parent 518112ae2f fed491914a
commit be3e4becb2
4 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
agreement_legal/models/agreement.py
View File

@@ -96,6 +96,7 @@ class Agreement(models.Model):
tracking=True, tracking=True,
help="Date that the contract was terminated.", help="Date that the contract was terminated.",
) )
no_end_date = fields.Boolean(related="agreement_type_id.no_end_date")
reviewed_date = fields.Date(string="Reviewed Date", tracking=True) reviewed_date = fields.Date(string="Reviewed Date", tracking=True)
reviewed_user_id = fields.Many2one("res.users", string="Reviewed By", tracking=True) reviewed_user_id = fields.Many2one("res.users", string="Reviewed By", tracking=True)
approved_date = fields.Date(string="Approved Date", tracking=True) approved_date = fields.Date(string="Approved Date", tracking=True)

1
agreement_legal/models/agreement_type.py
View File

@@ -8,6 +8,7 @@ class AgreementType(models.Model):
_inherit = "agreement.type" _inherit = "agreement.type"
_description = "Agreement Types" _description = "Agreement Types"
no_end_date = fields.Boolean(default=False)
agreement_subtypes_ids = fields.One2many( agreement_subtypes_ids = fields.One2many(
"agreement.subtype", "agreement_type_id", string="Sub-Types" "agreement.subtype", "agreement_type_id", string="Sub-Types"
) )

3
agreement_legal/views/agreement.xml
View File

@@ -225,7 +225,7 @@
/> />
<field <field
name="end_date" name="end_date"
attrs="{'required': [('is_template', '=', False)], 'invisible': [('is_template', '=', True)]}" attrs="{'required': [('is_template', '=', False), ('no_end_date', '=', False)], 'invisible': [('is_template', '=', True)]}"
/> />
<field name="expiration_notice" /> <field name="expiration_notice" />
<field name="change_notice" /> <field name="change_notice" />
@@ -235,6 +235,7 @@
/> />
<field name="termination_requested" /> <field name="termination_requested" />
<field name="termination_date" /> <field name="termination_date" />
<field name="no_end_date" invisible="1" />
</group> </group>
</group> </group>
<group string="Special Terms"> <group string="Special Terms">

4
agreement_legal/views/agreement_type.xml
View File

@@ -7,6 +7,7 @@
<field name="inherit_id" ref="agreement.agreement_type_list_view" /> <field name="inherit_id" ref="agreement.agreement_type_list_view" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="name" position="after"> <field name="name" position="after">
<field name="no_end_date" />
<field name="agreement_subtypes_ids" widget="many2many_tags" /> <field name="agreement_subtypes_ids" widget="many2many_tags" />
</field> </field>
</field> </field>
@@ -17,6 +18,9 @@
<field name="model">agreement.type</field> <field name="model">agreement.type</field>
<field name="inherit_id" ref="agreement.agreement_type_form_view" /> <field name="inherit_id" ref="agreement.agreement_type_form_view" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//group[@name='main']" position="inside">
<field name="no_end_date" />
</xpath>
<xpath expr="//sheet" position="inside"> <xpath expr="//sheet" position="inside">
<field name="agreement_subtypes_ids" nolabel="1"> <field name="agreement_subtypes_ids" nolabel="1">
<tree editable="bottom"> <tree editable="bottom">