Skip to content

Commit d26b14e

Browse files
committed
Cleanup commit -3
- change a sequence
1 parent 09380da commit d26b14e

File tree

2 files changed

+61
-21
lines changed

2 files changed

+61
-21
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: 59 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -585,6 +585,14 @@ for record in self:
585585
<field name="name">x_studio_current_owner</field>
586586
<field name="relation">res.partner</field>
587587
</record>
588+
<record id="field_ratios_property" model="ir.model.fields">
589+
<field name="ttype">many2one</field>
590+
<field name="copied" eval="True"/>
591+
<field name="field_description">Property</field>
592+
<field name="model_id" ref="ratios_model"/>
593+
<field name="name">x_studio_property</field>
594+
<field name="relation">x_property</field>
595+
</record>
588596
<record id="field_property_name" model="ir.model.fields">
589597
<field name="ttype">char</field>
590598
<field name="copied" eval="True"/>
@@ -872,6 +880,13 @@ for record in self:
872880
<field name="selectable" eval="False"/>
873881
<field name="store" eval="False"/>
874882
</record>
883+
<record id="x_property_on_meter" model="ir.model.fields">
884+
<field name="name">x_studio_property</field>
885+
<field name="ttype">many2one</field>
886+
<field name="model_id" ref="model_meter_reading"/>
887+
<field name="field_description">Property</field>
888+
<field name="relation">x_property</field>
889+
</record>
875890
<record id="field_property_meter_reading_ids" model="ir.model.fields">
876891
<field name="ttype">one2many</field>
877892
<field name="field_description">Meter Reading ids</field>
@@ -1541,6 +1556,14 @@ for record in self: record['x_x_studio_condominium_x_property_count'] = self.env
15411556
<field name="name">x_distribution_key_id</field>
15421557
<field name="relation">x_distribution_key</field>
15431558
</record>
1559+
<record id="distribution_key_account_move_field" model="ir.model.fields">
1560+
<field name="ttype">many2one</field>
1561+
<field name="copied" eval="True"/>
1562+
<field name="field_description">Distribution Key</field>
1563+
<field name="model_id" ref="account.model_account_move"/>
1564+
<field name="name">x_studio_distribution_key</field>
1565+
<field name="relation">x_distribution_key</field>
1566+
</record>
15441567
<record id="distribution_key_sale_order_field" model="ir.model.fields">
15451568
<field name="ttype">many2one</field>
15461569
<field name="copied" eval="True"/>
@@ -1760,8 +1783,14 @@ for record in self: record['x_x_studio_condominium_x_property_count'] = self.env
17601783
<field name="name">x_calendar_event_line_a1bce_id</field>
17611784
<field name="relation">x_calendar_event_line_a1bce</field>
17621785
</record>
1763-
1764-
1786+
<record id="new_lines_calendar_e_5f600d8e-925a-43ee-99ad-5a1e5174d333" model="ir.model.fields">
1787+
<field name="ttype">one2many</field>
1788+
<field name="field_description">New Lines</field>
1789+
<field name="model_id" ref="calendar_event_line_c0871dc9-8843-41a1-8c07-bbfd5c053508"/>
1790+
<field name="name">x_studio_one2many_field_1ed_1is91cj3m</field>
1791+
<field name="relation">x_calendar_event_line_a1bce_line_89b1c</field>
1792+
<field name="relation_field">x_calendar_event_line_a1bce_id</field>
1793+
</record>
17651794

17661795
<record id="field_line_wizard_id" model="ir.model.fields">
17671796
<field name="name">x_analytic_account_wizard_id</field>
@@ -1770,16 +1799,18 @@ for record in self: record['x_x_studio_condominium_x_property_count'] = self.env
17701799
<field name="model_id" ref="model_x_analytic_account_wizard_line"/>
17711800
<field name="relation">x_analytic_account_wizard</field>
17721801
</record>
1773-
<!-- Add One2many field to Wizard -->
1774-
<record id="field_line_ids" model="ir.model.fields">
1775-
<field name="name">x_line_ids</field>
1776-
<field name="ttype">one2many</field>
1777-
<field name="relation">x_analytic_account_wizard_line</field>
1778-
<field name="relation_field">x_analytic_account_wizard_id</field>
1779-
<field name="field_description">Split Lines</field>
1780-
<field name="model_id" ref="model_analytic_account_wizard"/>
1781-
</record>
17821802

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

17841815
<!-- Many2one to analytic line -->
17851816
<record id="field_x_analytic_line_id" model="ir.model.fields">
@@ -1794,10 +1825,9 @@ for record in self: record['x_x_studio_condominium_x_property_count'] = self.env
17941825
<field name="ttype">many2one</field>
17951826
<field name="relation">account.analytic.account</field>
17961827
<field name="field_description">Account name</field>
1797-
<field name="related">x_analytic_line_id.x_plan11_id</field>
1828+
<field name="related">x_analytic_line_id.x_plan2_id</field>
17981829
<field name="model_id" ref="model_x_analytic_account_wizard_line"/>
17991830
</record>
1800-
18011831
<record id="field_x_currency_id" model="ir.model.fields">
18021832
<field name="name">x_currency_id</field>
18031833
<field name="ttype">many2one</field>
@@ -1815,6 +1845,15 @@ for record in self: record['x_x_studio_condominium_x_property_count'] = self.env
18151845
<field name="currency_field">x_currency_id</field>
18161846
<field name="store">True</field>
18171847
</record>
1848+
<!-- Add One2many field to Wizard -->
1849+
<record id="field_line_ids" model="ir.model.fields">
1850+
<field name="name">x_line_ids</field>
1851+
<field name="ttype">one2many</field>
1852+
<field name="relation">x_analytic_account_wizard_line</field>
1853+
<field name="relation_field">x_analytic_account_wizard_id</field>
1854+
<field name="field_description">Split Lines</field>
1855+
<field name="model_id" ref="model_analytic_account_wizard"/>
1856+
</record>
18181857
<!-- Share -->
18191858
<record id="field_x_share" model="ir.model.fields">
18201859
<field name="name">x_share</field>
@@ -1830,17 +1869,18 @@ for line in self:
18301869
<field name="store" eval="True"/>
18311870
<field name="readonly" eval="True"/>
18321871
</record>
1872+
<record id="x_total_field" model="ir.model.fields">
1873+
<field name="name">x_total</field>
1874+
<field name="ttype">float</field>
1875+
<field name="field_description">Total</field>
1876+
<field name="model_id" ref="model_analytic_account_wizard" />
1877+
</record>
18331878
<record id="x_notes_splited_analytic_items" model="ir.model.fields">
18341879
<field name="name">x_notes</field>
18351880
<field name="ttype">html</field>
18361881
<field name="copied" eval="True"/>
18371882
<field name="field_description">Notes</field>
18381883
<field name="model_id" ref="analytic.model_account_analytic_line"/>
18391884
</record>
1840-
<record id="x_total_field" model="ir.model.fields">
1841-
<field name="name">x_total</field>
1842-
<field name="ttype">float</field>
1843-
<field name="field_description">Total</field>
1844-
<field name="model_id" ref="model_analytic_account_wizard" />
1845-
</record>
1885+
18461886
</odoo>

0 commit comments

Comments
 (0)