Skip to content

Commit 4683bcf

Browse files
committed
[FIX] Show analytic distribution and hide analytic account
1 parent 5045852 commit 4683bcf

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

Diff for: contract/models/contract_line.py

+13-1
Original file line numberDiff line numberDiff line change
@@ -559,12 +559,24 @@ def _prepare_invoice_line(self):
559559
self.last_date_invoiced, self.recurring_next_date
560560
)
561561
name = self._insert_markers(dates[0], dates[1])
562+
563+
analytic_distribution = self.analytic_distribution
564+
analytic_account_id = self.analytic_account_id.id
565+
if analytic_account_id:
566+
analytic_account_id = str(analytic_account_id)
567+
if analytic_distribution:
568+
analytic_distribution[analytic_account_id] = (
569+
analytic_distribution.get(analytic_account_id, 0) + 100
570+
)
571+
else:
572+
analytic_distribution = {analytic_account_id: 100}
573+
562574
return {
563575
"quantity": self._get_quantity_to_invoice(*dates),
564576
"product_uom_id": self.uom_id.id,
565577
"discount": self.discount,
566578
"contract_line_id": self.id,
567-
"analytic_distribution": self.analytic_distribution,
579+
"analytic_distribution": analytic_distribution,
568580
"sequence": self.sequence,
569581
"name": name,
570582
"price_unit": self.price_unit,

Diff for: contract/views/contract.xml

+12
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,12 @@
219219
<field
220220
name="analytic_account_id"
221221
groups="analytic.group_analytic_accounting"
222+
optional="hide"
223+
/>
224+
<field
225+
name="analytic_distribution"
226+
widget="analytic_distribution"
227+
groups="analytic.group_analytic_accounting"
222228
/>
223229
<field name="quantity" />
224230
<field name="uom_id" />
@@ -318,6 +324,12 @@
318324
<field
319325
name="analytic_account_id"
320326
groups="analytic.group_analytic_accounting"
327+
optional="hide"
328+
/>
329+
<field
330+
name="analytic_distribution"
331+
widget="analytic_distribution"
332+
groups="analytic.group_analytic_accounting"
321333
/>
322334
<field name="quantity" />
323335
<field name="uom_id" />

0 commit comments

Comments
 (0)