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

[FIX] Show analytic distribution and hide analytic account

Browse Source
This commit is contained in:
fkantelberg
2023-11-07 13:27:37 +01:00
parent cb81c7d021
commit 4924db528f
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contract/models/contract_line.py
View File

@@ -559,12 +559,24 @@ class ContractLine(models.Model):
self.last_date_invoiced, self.recurring_next_date self.last_date_invoiced, self.recurring_next_date
) )
name = self._insert_markers(dates[0], dates[1]) name = self._insert_markers(dates[0], dates[1])
analytic_distribution = self.analytic_distribution
analytic_account_id = self.analytic_account_id.id
if analytic_account_id:
analytic_account_id = str(analytic_account_id)
if analytic_distribution:
analytic_distribution[analytic_account_id] = (
analytic_distribution.get(analytic_account_id, 0) + 100
)
else:
analytic_distribution = {analytic_account_id: 100}
return { return {
"quantity": self._get_quantity_to_invoice(*dates), "quantity": self._get_quantity_to_invoice(*dates),
"product_uom_id": self.uom_id.id, "product_uom_id": self.uom_id.id,
"discount": self.discount, "discount": self.discount,
"contract_line_id": self.id, "contract_line_id": self.id,
"analytic_distribution": self.analytic_distribution, "analytic_distribution": analytic_distribution,
"sequence": self.sequence, "sequence": self.sequence,
"name": name, "name": name,
"price_unit": self.price_unit, "price_unit": self.price_unit,

12
contract/views/contract.xml
View File

@@ -219,6 +219,12 @@
<field <field
name="analytic_account_id" name="analytic_account_id"
groups="analytic.group_analytic_accounting" groups="analytic.group_analytic_accounting"
optional="hide"
/>
<field
name="analytic_distribution"
widget="analytic_distribution"
groups="analytic.group_analytic_accounting"
/> />
<field name="quantity" /> <field name="quantity" />
<field name="uom_id" /> <field name="uom_id" />
@@ -318,6 +324,12 @@
<field <field
name="analytic_account_id" name="analytic_account_id"
groups="analytic.group_analytic_accounting" groups="analytic.group_analytic_accounting"
optional="hide"
/>
<field
name="analytic_distribution"
widget="analytic_distribution"
groups="analytic.group_analytic_accounting"
/> />
<field name="quantity" /> <field name="quantity" />
<field name="uom_id" /> <field name="uom_id" />