Skip to content

[10.0] Added analytic tags to contracts #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pedrobaeza merged 1 commit into from Mar 28, 2018
Merged

[10.0] Added analytic tags to contracts #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contract/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, "
Expand Down
2 changes: 2 additions & 0 deletions contract/models/account_analytic_account.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ def _prepare_invoice_line(self, line, invoice_id):
'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)
Expand Down
4 changes: 4 additions & 0 deletions contract/models/account_analytic_invoice_line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions contract/views/account_analytic_account_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions contract/views/account_analytic_contract_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down