[10.0] Added analytic tags to contracts

This commit adds ability to specify analytic tags on contracts invoice
lines, which will be propagated to invoice lines.
This commit is contained in:
Дмитро Катюха
2017-10-27 15:57:31 +03:00
committed by Дмитро Катюха
parent e383e90823
commit a8ef7c939d
5 changed files with 9 additions and 1 deletions

View File

@@ -9,7 +9,7 @@
{
'name': 'Contracts Management - Recurring',
'version': '10.0.4.0.1',
'version': '10.0.4.1.1',
'category': 'Contract Management',
'license': 'AGPL-3',
'author': "OpenERP SA, "

View File

@@ -188,6 +188,8 @@ class AccountAnalyticAccount(models.Model):
'uom_id': line.uom_id.id,
'discount': line.discount,
})
# Add analytic tags to invoice line
invoice_line.analytic_tag_ids |= line.analytic_tag_ids
# Get other invoice line values from product onchange
invoice_line._onchange_product_id()
invoice_line_vals = invoice_line._convert_to_write(invoice_line._cache)

View File

@@ -65,6 +65,10 @@ class AccountAnalyticInvoiceLine(models.Model):
help='Discount that is applied in generated invoices.'
' It should be less or equal to 100',
)
analytic_tag_ids = fields.Many2many(
'account.analytic.tag',
string='Analytic Tags',
)
sequence = fields.Integer(
string="Sequence",
default=10,

View File

@@ -82,6 +82,7 @@
<field name="specific_price" invisible="1"/>
<field name="discount" groups="sale.group_discount_per_so_line" />
<field name="price_subtotal"/>
<field name="analytic_tag_ids" widget="many2many_tags"/>
</tree>
</field>
</div>

View File

@@ -41,6 +41,7 @@
<field name="specific_price" invisible="1"/>
<field name="discount" groups="sale.group_discount_per_so_line" />
<field name="price_subtotal" />
<field name="analytic_tag_ids" widget="many2many_tags" />
</tree>
</field>
</group>