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 #480 into 12.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2020-03-02 09:58:33 +00:00
parent a8ef31e813 5b6f304355
commit c0bc148564
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contract/models/contract_line.py
View File

@@ -31,6 +31,10 @@ class ContractLine(models.Model):
string="Analytic account", string="Analytic account",
comodel_name='account.analytic.account', comodel_name='account.analytic.account',
) )
analytic_tag_ids = fields.Many2many(
comodel_name='account.analytic.tag',
string='Analytic Tags',
)
date_start = fields.Date( date_start = fields.Date(
string='Date Start', string='Date Start',
required=True, required=True,
@@ -675,6 +679,7 @@ class ContractLine(models.Model):
{ {
'name': name, 'name': name,
'account_analytic_id': self.analytic_account_id.id, 'account_analytic_id': self.analytic_account_id.id,
'analytic_tag_ids': [(6, 0, self.analytic_tag_ids.ids)],
'price_unit': self.price_unit, 'price_unit': self.price_unit,
} }
) )

6
contract/views/contract_line.xml
View File

@@ -38,8 +38,9 @@
</group> </group>
</group> </group>
<group name="recurrence_info" position="after"> <group name="recurrence_info" position="after">
<group name="analytic" groups="analytic.group_analytic_accounting"> <group name="analytic" groups="analytic.group_analytic_accounting,analytic.group_analytic_tags">
<field name="analytic_account_id"/> <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<field name="analytic_tag_ids" widget="many2many_tags" groups="analytic.group_analytic_tags"/>
</group> </group>
</group> </group>
</field> </field>
@@ -87,6 +88,7 @@
<field name="product_id"/> <field name="product_id"/>
<field name="name"/> <field name="name"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/> <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<field name="analytic_tag_ids" widget="many2many_tags" groups="analytic.group_analytic_tags"/>
<field name="quantity"/> <field name="quantity"/>
<field name="uom_id"/> <field name="uom_id"/>
<field name="automatic_price"/> <field name="automatic_price"/>