Skip to content

Commit abd1ecf

Browse files
mega-odoomega-odoo
committed
split analytic item -2
- split account.analytoic.line wizard
1 parent 1552453 commit abd1ecf

File tree

2 files changed

+42
-82
lines changed

2 files changed

+42
-82
lines changed

‎condominium/data/ir_actions_server.xml‎

Lines changed: 22 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -30,29 +30,29 @@ if round(total_share) != 100:
3030
for line in records.x_line_ids:
3131
analytic_id = line.x_analytic_account_name_id
3232
analytic_name = analytic_id.name
33-
33+
original_id = line.x_analytic_line_id.id
3434
3535
new_analytic_item_id = new_analytic_item.create({
3636
"x_plan11_id": analytic_id.id,
3737
"name": analytic_id.name,
3838
"amount": line.x_amount
3939
})
4040
# new_analytic_item += new_analytic_item_id
41-
# occupied_cells.append((line.x_analytic_line_id.id, new_analytic_item_id))
41+
# occupied_cells.append((original_id, new_analytic_item_id))
4242
43-
if line.x_analytic_line_id.id in occupied_cells:
44-
occupied_cells[line.x_analytic_line_id.id].update(new_analytic_item_id)
43+
if original_id in occupied_cells:
44+
occupied_cells[original_id].update(new_analytic_item_id)
4545
else:
46-
occupied_cells.update({line.x_analytic_line_id.id: set(new_analytic_item_id)})
46+
occupied_cells.update({original_id: set(new_analytic_item_id)})
4747
48-
if line.x_analytic_line_id.id in note_details:
48+
if original_id in note_details:
4949
analytic_url = f"/odoo/analytic-items/{new_analytic_item_id.id}"
5050
note_line = f"- {line.x_share:.2f}% on <a href='{analytic_url}' target='_blank'>{analytic_name}</a>"
51-
note_details[line.x_analytic_line_id.id].add(note_line)
51+
note_details[original_id].add(note_line)
5252
else:
5353
analytic_url = f"/odoo/analytic-items/{new_analytic_item_id.id}"
5454
note_line = {f"- {line.x_share:.2f}% on <a href='{analytic_url}' target='_blank'>{analytic_name}</a>"}
55-
note_details.update({line.x_analytic_line_id.id: set(note_line)})
55+
note_details.update({original_id: set(note_line)})
5656
5757
for cell, new_analytic_lines in occupied_cells.items():
5858
for new_analytic_line in list(new_analytic_lines):
@@ -77,20 +77,6 @@ for Aid, values in note_details.items():
7777
"""
7878
new_analytic_item.browse(Aid).write({"x_notes": note_html.strip()})
7979
80-
81-
# for Aid, values in occupied_cells.items():
82-
# raise UserError(values)
83-
# for value in values:
84-
# raise UserError(value)
85-
86-
# note_html = f"""
87-
# <i>{datetime.date}</i><br/>
88-
# <p><b>Analytic item coming from a split</b><br/>
89-
# {'<br/>'.join(note_lines)}<br/>
90-
# See <a href='/odoo/analytic-items/{original_id.id}' target='_blank'> original analytic item:</a>
91-
# </p>
92-
# """
93-
9480
# new_analytic_item.write({"x_notes": note_html.strip()})]]>
9581
</field>
9682
</record>
@@ -101,31 +87,30 @@ for Aid, values in note_details.items():
10187
<field name="binding_model_id" ref="analytic.model_account_analytic_line"/>
10288
<field name="binding_view_types">list,kanban</field>
10389
<field name="state">code</field>
104-
<field name="code"><![CDATA[product_commands = []
90+
<field name="code"><![CDATA[analytic_account_lines = []
10591
amount_total = 0
92+
10693
for record in records:
10794
amount_total += record.amount
108-
product_commands.append((0, 0, {
109-
"x_analytic_account_name_id": record.x_plan11_id.id,
110-
"x_analytic_line_id": record.id,
111-
"x_amount": record.amount / 2
95+
split_amount = record.amount / 2
96+
97+
for _ in range(2):
98+
analytic_account_lines.append((0, 0, {
99+
"x_analytic_account_name_id": record.x_plan11_id.id,
100+
"x_analytic_line_id": record.id,
101+
"x_amount": split_amount
102+
}))
112103
113-
}))
114-
product_commands.append((0, 0, {
115-
"x_analytic_account_name_id": record.x_plan11_id.id,
116-
"x_analytic_line_id": record.id,
117-
"x_amount": record.amount / 2
104+
if amount_total == 0:
105+
raise UserError("Total amount is zero. Cannot split analytic items.")
118106
119-
}))
120107
wizard = env['x_analytic_account_wizard'].create({
121-
"x_line_ids": product_commands,
108+
"x_line_ids": analytic_account_lines,
122109
"x_total": amount_total
123110
})
124111
125112
action = env['ir.actions.act_window']._for_xml_id('condominium.split_act_window')
126-
action['res_id'] = wizard.id
127-
128-
]]>
113+
action['res_id'] = wizard.id]]>
129114
</field>
130115
</record>
131116

‎condominium/data/ir_model_fields.xml‎

Lines changed: 20 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo>
3-
=======
43
<record id="description_building" model="ir.model.fields">
54
<field name="name">x_name</field>
65
<field name="ttype">char</field>
@@ -1763,33 +1762,7 @@ for record in self: record['x_x_studio_condominium_x_property_count'] = self.env
17631762
<field name="relation">x_calendar_event_line_a1bce</field>
17641763
</record>
17651764

1766-
<!-- <record id="field_analytic_line_id" model="ir.model.fields">
1767-
<field name="name">x_analytic_line_id</field>
1768-
<field name="ttype">many2one</field>
1769-
<field name="field_description">Analytic Line</field>
1770-
<field name="model_id" ref="model_analytic_account_wizard" />
1771-
<field name="relation">account.analytic.line</field>
1772-
</record>
1773-
<record id="field_analytic_account_name" model="ir.model.fields">
1774-
<field name="name">x_analytic_account_name_id</field>
1775-
<field name="ttype">many2one</field>
1776-
<field name="related">x_analytic_line_id.x_plan11_id</field>
1777-
<field name="field_description">Account name</field>
1778-
<field name="model_id" ref="model_analytic_account_wizard" />
1779-
<field name="relation">account.analytic.account</field>
1780-
</record>
1781-
<record id="x_share_field" model="ir.model.fields">
1782-
<field name="name">x_share</field>
1783-
<field name="ttype">float</field>
1784-
<field name="field_description">Share</field>
1785-
<field name="model_id" ref="model_analytic_account_wizard" />
1786-
</record>
1787-
<record id="x_total_field" model="ir.model.fields">
1788-
<field name="name">x_total</field>
1789-
<field name="ttype">float</field>
1790-
<field name="field_description">Total</field>
1791-
<field name="model_id" ref="model_analytic_account_wizard" />
1792-
</record> -->
1765+
17931766

17941767
<record id="field_line_wizard_id" model="ir.model.fields">
17951768
<field name="name">x_analytic_account_wizard_id</field>
@@ -1798,6 +1771,16 @@ for record in self: record['x_x_studio_condominium_x_property_count'] = self.env
17981771
<field name="model_id" ref="model_x_analytic_account_wizard_line"/>
17991772
<field name="relation">x_analytic_account_wizard</field>
18001773
</record>
1774+
<!-- Add One2many field to Wizard -->
1775+
<record id="field_line_ids" model="ir.model.fields">
1776+
<field name="name">x_line_ids</field>
1777+
<field name="ttype">one2many</field>
1778+
<field name="relation">x_analytic_account_wizard_line</field>
1779+
<field name="relation_field">x_analytic_account_wizard_id</field>
1780+
<field name="field_description">Split Lines</field>
1781+
<field name="model_id" ref="model_analytic_account_wizard"/>
1782+
</record>
1783+
18011784

18021785
<!-- Many2one to analytic line -->
18031786
<record id="field_x_analytic_line_id" model="ir.model.fields">
@@ -1833,15 +1816,6 @@ for record in self: record['x_x_studio_condominium_x_property_count'] = self.env
18331816
<field name="currency_field">x_currency_id</field>
18341817
<field name="store">True</field>
18351818
</record>
1836-
<!-- Add One2many field to Wizard -->
1837-
<record id="field_line_ids" model="ir.model.fields">
1838-
<field name="name">x_line_ids</field>
1839-
<field name="ttype">one2many</field>
1840-
<field name="relation">x_analytic_account_wizard_line</field>
1841-
<field name="relation_field">x_analytic_account_wizard_id</field>
1842-
<field name="field_description">Split Lines</field>
1843-
<field name="model_id" ref="model_analytic_account_wizard"/>
1844-
</record>
18451819
<!-- Share -->
18461820
<record id="field_x_share" model="ir.model.fields">
18471821
<field name="name">x_share</field>
@@ -1857,21 +1831,22 @@ for line in self:
18571831
<field name="store" eval="True"/>
18581832
<field name="readonly" eval="True"/>
18591833
</record>
1860-
1861-
<record id="x_total_field" model="ir.model.fields">
1862-
<field name="name">x_total</field>
1863-
<field name="ttype">float</field>
1864-
<field name="field_description">Total</field>
1865-
<field name="model_id" ref="model_analytic_account_wizard" />
1866-
</record>
1867-
18681834
<record id="x_notes_splited_analytic_items" model="ir.model.fields">
18691835
<field name="name">x_notes</field>
18701836
<field name="ttype">html</field>
18711837
<field name="copied" eval="True"/>
18721838
<field name="field_description">Notes</field>
18731839
<field name="model_id" ref="analytic.model_account_analytic_line"/>
18741840
</record>
1841+
<<<<<<< HEAD
18751842

18761843
>>>>>>> 413a26e70 (Cleanup commit -1)
1844+
=======
1845+
<record id="x_total_field" model="ir.model.fields">
1846+
<field name="name">x_total</field>
1847+
<field name="ttype">float</field>
1848+
<field name="field_description">Total</field>
1849+
<field name="model_id" ref="model_analytic_account_wizard" />
1850+
</record>
1851+
>>>>>>> 6a2cafc57 (split analytic item -2)
18771852
</odoo>

0 commit comments

Comments
 (0)