Skip to content

Commit aed7453

Browse files
mega-odoomega-odoo
committed
Cleanup commit -3
- change a sequence
1 parent abd1ecf commit aed7453

File tree

2 files changed

+60
-20
lines changed

2 files changed

+60
-20
lines changed

‎condominium/data/ir_actions_server.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ for line in records.x_line_ids:
3333
original_id = line.x_analytic_line_id.id
3434
3535
new_analytic_item_id = new_analytic_item.create({
36-
"x_plan11_id": analytic_id.id,
36+
"x_plan2_id": analytic_id.id,
3737
"name": analytic_id.name,
3838
"amount": line.x_amount
3939
})
@@ -96,7 +96,7 @@ for record in records:
9696
9797
for _ in range(2):
9898
analytic_account_lines.append((0, 0, {
99-
"x_analytic_account_name_id": record.x_plan11_id.id,
99+
"x_analytic_account_name_id": record.x_plan2_id.id,
100100
"x_analytic_line_id": record.id,
101101
"x_amount": split_amount
102102
}))

‎condominium/data/ir_model_fields.xml‎

Lines changed: 58 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -586,6 +586,14 @@ for record in self:
586586
<field name="name">x_studio_current_owner</field>
587587
<field name="relation">res.partner</field>
588588
</record>
589+
<record id="field_ratios_property" model="ir.model.fields">
590+
<field name="ttype">many2one</field>
591+
<field name="copied" eval="True"/>
592+
<field name="field_description">Property</field>
593+
<field name="model_id" ref="ratios_model"/>
594+
<field name="name">x_studio_property</field>
595+
<field name="relation">x_property</field>
596+
</record>
589597
<record id="field_property_name" model="ir.model.fields">
590598
<field name="ttype">char</field>
591599
<field name="copied" eval="True"/>
@@ -873,6 +881,13 @@ for record in self:
873881
<field name="selectable" eval="False"/>
874882
<field name="store" eval="False"/>
875883
</record>
884+
<record id="x_property_on_meter" model="ir.model.fields">
885+
<field name="name">x_studio_property</field>
886+
<field name="ttype">many2one</field>
887+
<field name="model_id" ref="model_meter_reading"/>
888+
<field name="field_description">Property</field>
889+
<field name="relation">x_property</field>
890+
</record>
876891
<record id="field_property_meter_reading_ids" model="ir.model.fields">
877892
<field name="ttype">one2many</field>
878893
<field name="field_description">Meter Reading ids</field>
@@ -1542,6 +1557,14 @@ for record in self: record['x_x_studio_condominium_x_property_count'] = self.env
15421557
<field name="name">x_distribution_key_id</field>
15431558
<field name="relation">x_distribution_key</field>
15441559
</record>
1560+
<record id="distribution_key_account_move_field" model="ir.model.fields">
1561+
<field name="ttype">many2one</field>
1562+
<field name="copied" eval="True"/>
1563+
<field name="field_description">Distribution Key</field>
1564+
<field name="model_id" ref="account.model_account_move"/>
1565+
<field name="name">x_studio_distribution_key</field>
1566+
<field name="relation">x_distribution_key</field>
1567+
</record>
15451568
<record id="distribution_key_sale_order_field" model="ir.model.fields">
15461569
<field name="ttype">many2one</field>
15471570
<field name="copied" eval="True"/>
@@ -1761,8 +1784,14 @@ for record in self: record['x_x_studio_condominium_x_property_count'] = self.env
17611784
<field name="name">x_calendar_event_line_a1bce_id</field>
17621785
<field name="relation">x_calendar_event_line_a1bce</field>
17631786
</record>
1764-
1765-
1787+
<record id="new_lines_calendar_e_5f600d8e-925a-43ee-99ad-5a1e5174d333" model="ir.model.fields">
1788+
<field name="ttype">one2many</field>
1789+
<field name="field_description">New Lines</field>
1790+
<field name="model_id" ref="calendar_event_line_c0871dc9-8843-41a1-8c07-bbfd5c053508"/>
1791+
<field name="name">x_studio_one2many_field_1ed_1is91cj3m</field>
1792+
<field name="relation">x_calendar_event_line_a1bce_line_89b1c</field>
1793+
<field name="relation_field">x_calendar_event_line_a1bce_id</field>
1794+
</record>
17661795

17671796
<record id="field_line_wizard_id" model="ir.model.fields">
17681797
<field name="name">x_analytic_account_wizard_id</field>
@@ -1771,16 +1800,18 @@ for record in self: record['x_x_studio_condominium_x_property_count'] = self.env
17711800
<field name="model_id" ref="model_x_analytic_account_wizard_line"/>
17721801
<field name="relation">x_analytic_account_wizard</field>
17731802
</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>
17831803

1804+
<!-- <record id="ir_model_fields_3089" model="ir.model.fields">
1805+
<field name="ttype">many2one</field>
1806+
<field name="copied" eval="True"/>
1807+
<field name="field_description">Departments</field>
1808+
<field name="index" eval="True"/>
1809+
<field name="model">account.analytic.line</field>
1810+
<field name="model_id" ref="analytic.model_account_analytic_line"/>
1811+
<field name="name">x_plan2_id</field>
1812+
<field name="on_delete">restrict</field>
1813+
<field name="relation">account.analytic.account</field>
1814+
</record> -->
17841815

17851816
<!-- Many2one to analytic line -->
17861817
<record id="field_x_analytic_line_id" model="ir.model.fields">
@@ -1795,10 +1826,9 @@ for record in self: record['x_x_studio_condominium_x_property_count'] = self.env
17951826
<field name="ttype">many2one</field>
17961827
<field name="relation">account.analytic.account</field>
17971828
<field name="field_description">Account name</field>
1798-
<field name="related">x_analytic_line_id.x_plan11_id</field>
1829+
<field name="related">x_analytic_line_id.x_plan2_id</field>
17991830
<field name="model_id" ref="model_x_analytic_account_wizard_line"/>
18001831
</record>
1801-
18021832
<record id="field_x_currency_id" model="ir.model.fields">
18031833
<field name="name">x_currency_id</field>
18041834
<field name="ttype">many2one</field>
@@ -1816,6 +1846,15 @@ for record in self: record['x_x_studio_condominium_x_property_count'] = self.env
18161846
<field name="currency_field">x_currency_id</field>
18171847
<field name="store">True</field>
18181848
</record>
1849+
<!-- Add One2many field to Wizard -->
1850+
<record id="field_line_ids" model="ir.model.fields">
1851+
<field name="name">x_line_ids</field>
1852+
<field name="ttype">one2many</field>
1853+
<field name="relation">x_analytic_account_wizard_line</field>
1854+
<field name="relation_field">x_analytic_account_wizard_id</field>
1855+
<field name="field_description">Split Lines</field>
1856+
<field name="model_id" ref="model_analytic_account_wizard"/>
1857+
</record>
18191858
<!-- Share -->
18201859
<record id="field_x_share" model="ir.model.fields">
18211860
<field name="name">x_share</field>
@@ -1831,22 +1870,23 @@ for line in self:
18311870
<field name="store" eval="True"/>
18321871
<field name="readonly" eval="True"/>
18331872
</record>
1873+
<record id="x_total_field" model="ir.model.fields">
1874+
<field name="name">x_total</field>
1875+
<field name="ttype">float</field>
1876+
<field name="field_description">Total</field>
1877+
<field name="model_id" ref="model_analytic_account_wizard" />
1878+
</record>
18341879
<record id="x_notes_splited_analytic_items" model="ir.model.fields">
18351880
<field name="name">x_notes</field>
18361881
<field name="ttype">html</field>
18371882
<field name="copied" eval="True"/>
18381883
<field name="field_description">Notes</field>
18391884
<field name="model_id" ref="analytic.model_account_analytic_line"/>
18401885
</record>
1841-
<<<<<<< HEAD
1842-
1843-
>>>>>>> 413a26e70 (Cleanup commit -1)
1844-
=======
18451886
<record id="x_total_field" model="ir.model.fields">
18461887
<field name="name">x_total</field>
18471888
<field name="ttype">float</field>
18481889
<field name="field_description">Total</field>
18491890
<field name="model_id" ref="model_analytic_account_wizard" />
18501891
</record>
1851-
>>>>>>> 6a2cafc57 (split analytic item -2)
18521892
</odoo>

0 commit comments

Comments
 (0)