Skip to content

Commit 48a8d87

Browse files
committed
Cleanup 29 july
1 parent e37fc2c commit 48a8d87

File tree

4 files changed

+26
-33
lines changed

4 files changed

+26
-33
lines changed

condominium/data/account_analytic_account.xml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo noupdate="1">
3-
<record id="condominium_analytic_account_12" model="account.analytic.account">
3+
<!-- <record id="condominium_analytic_account_12" model="account.analytic.account">
44
<field name="name">Apartment A0</field>
55
<field name="partner_id" ref="res_partner_32"/>
66
<field name="x_tags" eval="[(6, 0, [ref('x_properties_tag_1')])]"/>
77
<field name="x_building" ref="x_buildings_1"/>
88
<field name="x_area">100.0</field>
99
<field name="x_type" ref="x_properties_types_1"/>
1010
<field name="x_floor">0</field>
11-
<field name="company_id" ref="res_company_2"/>
1211
</record>
1312
<record id="condominium_analytic_account_14" model="account.analytic.account">
1413
<field name="name">Apartment A1</field>
@@ -25,7 +24,6 @@
2524
<field name="x_area">100.0</field>
2625
<field name="x_type" ref="x_properties_types_1"/>
2726
<field name="x_floor">2</field>
28-
<field name="company_id" ref="res_company_2"/>
2927
</record>
3028
<record id="condominium_analytic_account_17" model="account.analytic.account">
3129
<field name="name">Apartment B0</field>
@@ -34,7 +32,6 @@
3432
<field name="x_area">200.0</field>
3533
<field name="x_type" ref="x_properties_types_1"/>
3634
<field name="x_floor">0</field>
37-
<field name="company_id" ref="res_company_2"/>
3835
</record>
3936
<record id="condominium_analytic_account_19" model="account.analytic.account">
4037
<field name="name">Apartment B1.1</field>
@@ -43,13 +40,11 @@
4340
<field name="x_area">100.0</field>
4441
<field name="x_type" ref="x_properties_types_1"/>
4542
<field name="x_floor">1</field>
46-
<field name="company_id" ref="res_company_2"/>
4743
</record>
4844
<record id="condominium_analytic_account_18" model="account.analytic.account">
4945
<field name="name">Apartment B1.2</field>
5046
<field name="partner_id" ref="res_partner_36"/>
5147
<field name="x_building" ref="x_buildings_4"/>
52-
<field name="company_id" ref="res_company_2"/>
5348
<field name="x_area">100.0</field>
5449
<field name="x_type" ref="x_properties_types_1"/>
5550
<field name="x_floor">1</field>
@@ -68,7 +63,6 @@
6863
<field name="partner_id" ref="res_partner_32"/>
6964
<field name="x_building" ref="x_buildings_1"/>
7065
<field name="x_area">40.0</field>
71-
<field name="company_id" ref="res_company_2"/>
7266
<field name="x_parent" ref="condominium_analytic_account_12"/>
7367
<field name="x_type" ref="x_properties_types_4"/>
7468
<field name="x_floor">-1</field>
@@ -80,7 +74,6 @@
8074
<field name="x_area">300.0</field>
8175
<field name="x_type" ref="x_properties_types_2"/>
8276
<field name="x_floor">0</field>
83-
<field name="company_id" ref="res_company_2"/>
8477
</record>
8578
<record id="condominium_analytic_account_21" model="account.analytic.account">
8679
<field name="name">Parking CP</field>
@@ -90,27 +83,25 @@
9083
<field name="x_parent" ref="condominium_analytic_account_20"/>
9184
<field name="x_type" ref="x_properties_types_6"/>
9285
<field name="x_floor">0</field>
93-
<field name="company_id" ref="res_company_2"/>
9486
</record>
9587
<record id="condominium_analytic_account_22" model="account.analytic.account">
9688
<field name="name">Studio CS</field>
9789
<field name="partner_id" ref="res_partner_35"/>
9890
<field name="x_building" ref="x_buildings_5"/>
9991
<field name="x_area">50.0</field>
100-
<field name="company_id" ref="res_company_2"/>
10192
<field name="x_parent" ref="condominium_analytic_account_20"/>
10293
<field name="x_type" ref="x_properties_types_6"/>
10394
<field name="x_floor">0</field>
10495
</record>
105-
<record id="condominium_analytic_account_2" model="account.analytic.account">
96+
record id="condominium_analytic_account_2" model="account.analytic.account">
10697
<field name="name">Kick-Off Template</field>
10798
<field name="plan_id" ref="analytic.analytic_plan_projects"/>
10899
</record>
109100
<record id="condominium_analytic_account_32" model="account.analytic.account">
110101
<field name="name">S00002 - Kick-Off Template</field>
111102
<field name="plan_id" ref="analytic.analytic_plan_projects"/>
112103
<field name="partner_id" ref="res_partner_7"/>
113-
</record>
104+
</record> -->
114105
<record id="condominium_analytic_account_33" model="account.analytic.account">
115106
<field name="name">Apartment A0 - Charlotte M. Warren</field>
116107
<field name="partner_id" ref="res_partner_32"/>
@@ -128,6 +119,7 @@
128119
<record id="condominium_analytic_account_35" model="account.analytic.account">
129120
<field name="name">Apartment A1 - Harold J. Butler</field>
130121
<field name="partner_id" ref="res_partner_34"/>
122+
<field name="company_id" ref="res_company_2"/>
131123
<field name="x_studio_owner_line" ref="x_property_line_019a4_3"/>
132124
<field name="x_studio_property" ref="x_property_2"/>
133125
</record>
@@ -162,6 +154,7 @@
162154
<record id="condominium_analytic_account_24" model="account.analytic.account">
163155
<field name="name">Basement AB - Harold J. Butler</field>
164156
<field name="partner_id" ref="res_partner_34"/>
157+
<field name="company_id" ref="res_company_2"/>
165158
<field name="x_studio_owner_line" ref="x_property_line_019a4_5"/>
166159
<field name="x_studio_property" ref="x_property_4"/>
167160
</record>

condominium/data/account_move_line.xml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<field name="product_id" ref="product_product_784"/>
66
<field name="price_unit">1000.0</field>
77
<field name="analytic_distribution" eval="{
8-
'%s'%(ref('condominium_analytic_account_20')): 12.35,
9-
'%s'%(ref('condominium_analytic_account_21')): 6.18,
10-
'%s'%(ref('condominium_analytic_account_22')): 2.56,
8+
'%s'%(ref('condominium_analytic_account_29')): 12.35,
9+
'%s'%(ref('condominium_analytic_account_30')): 6.18,
10+
'%s'%(ref('condominium_analytic_account_31')): 2.56,
1111
'%s'%(ref('condominium_analytic_account_23')): 4.79,
1212
'%s'%(ref('condominium_analytic_account_26')): 24.76,
1313
'%s'%(ref('condominium_analytic_account_27')): 12.35,
@@ -30,9 +30,9 @@
3030
<field name="partner_id" ref="res_partner_32"/>
3131
<field name="product_id" ref="product_product_784"/>
3232
<field name="analytic_distribution" eval="{
33-
'%s'%(ref('condominium_analytic_account_20')): 7.21,
34-
'%s'%(ref('condominium_analytic_account_21')): 1.41,
35-
'%s'%(ref('condominium_analytic_account_22')): 8.62,
33+
'%s'%(ref('condominium_analytic_account_29')): 7.21,
34+
'%s'%(ref('condominium_analytic_account_30')): 1.41,
35+
'%s'%(ref('condominium_analytic_account_31')): 8.62,
3636
'%s'%(ref('condominium_analytic_account_23')): 10.34,
3737
'%s'%(ref('condominium_analytic_account_24')): 4.31,
3838
'%s'%(ref('condominium_analytic_account_25')): 3.45,
@@ -59,9 +59,9 @@
5959
<field name="partner_id" ref="res_partner_32"/>
6060
<field name="product_id" ref="product_product_760"/>
6161
<field name="analytic_distribution" eval="{
62-
'%s'%(ref('condominium_analytic_account_20')): 7.21,
63-
'%s'%(ref('condominium_analytic_account_21')): 1.41,
64-
'%s'%(ref('condominium_analytic_account_22')): 8.62,
62+
'%s'%(ref('condominium_analytic_account_29')): 7.21,
63+
'%s'%(ref('condominium_analytic_account_30')): 1.41,
64+
'%s'%(ref('condominium_analytic_account_31')): 8.62,
6565
'%s'%(ref('condominium_analytic_account_23')): 10.34,
6666
'%s'%(ref('condominium_analytic_account_24')): 4.31,
6767
'%s'%(ref('condominium_analytic_account_25')): 3.45,
@@ -87,9 +87,9 @@
8787
<record id="account_move_line_719" model="account.move.line">
8888
<field name="product_id" ref="product_product_713"/>
8989
<field name="analytic_distribution" eval="{
90-
'%s'%(ref('condominium_analytic_account_20')): 7.21,
91-
'%s'%(ref('condominium_analytic_account_21')): 1.41,
92-
'%s'%(ref('condominium_analytic_account_22')): 8.62,
90+
'%s'%(ref('condominium_analytic_account_29')): 7.21,
91+
'%s'%(ref('condominium_analytic_account_30')): 1.41,
92+
'%s'%(ref('condominium_analytic_account_31')): 8.62,
9393
'%s'%(ref('condominium_analytic_account_23')): 10.34,
9494
'%s'%(ref('condominium_analytic_account_24')): 4.31,
9595
'%s'%(ref('condominium_analytic_account_25')): 3.45,
@@ -121,9 +121,9 @@
121121
<field name="product_id" ref="product_product_772"/>
122122
<field name="analytic_distribution">{'20': 12.35, '21': 6.18, '22': 2.56, '23': 4.79, '26': 24.76, '27': 12.35, '28': 6.12, '29': 6.18, '31': 24.71}</field>
123123
<field name="analytic_distribution" eval="{
124-
'%s'%(ref('condominium_analytic_account_20')): 12.35,
125-
'%s'%(ref('condominium_analytic_account_21')): 6.18,
126-
'%s'%(ref('condominium_analytic_account_22')): 2.56,
124+
'%s'%(ref('condominium_analytic_account_29')): 12.35,
125+
'%s'%(ref('condominium_analytic_account_30')): 6.18,
126+
'%s'%(ref('condominium_analytic_account_31')): 2.56,
127127
'%s'%(ref('condominium_analytic_account_23')): 4.79,
128128
'%s'%(ref('condominium_analytic_account_26')): 24.76,
129129
'%s'%(ref('condominium_analytic_account_27')): 12.35,

condominium/data/x_meter_reading.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
<field name="x_date" eval="DateTime.today().date()"/>
66
<field name="x_quantity">123456.0</field>
77
<field name="x_usage">456.0</field>
8-
<field name="x_account_analytic_account_id" ref="condominium_analytic_account_17"/>
8+
<field name="x_account_analytic_account_id" ref="condominium_analytic_account_26"/>
99
</record>
1010
<record id="x_meter_reading_2" model="x_meter_reading">
1111
<field name="x_meter_id" ref="x_meters_gas"/>
1212
<field name="x_date" eval="DateTime.today().date()"/>
1313
<field name="x_quantity">123000.0</field>
14-
<field name="x_account_analytic_account_id" ref="condominium_analytic_account_17"/>
14+
<field name="x_account_analytic_account_id" ref="condominium_analytic_account_26"/>
1515
</record>
1616
<record id="x_meter_reading_3" model="x_meter_reading">
1717
<field name="x_meter_id" ref="x_meters_gas"/>
1818
<field name="x_date" eval="DateTime.today().date()"/>
1919
<field name="x_quantity">123.0</field>
2020
<field name="x_description">lmsfdmzkfd</field>
21-
<field name="x_account_analytic_account_id" ref="condominium_analytic_account_12"/>
21+
<field name="x_account_analytic_account_id" ref="condominium_analytic_account_33"/>
2222
</record>
2323
<record id="x_meter_reading_5" model="x_meter_reading">
2424
<field name="x_meter_id" ref="x_meters_elec"/>

condominium/demo/x_property_line_019a4.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo noupdate="1">
33
<record id="x_property_line_019a4_1" model="x_property_line_019a4">
4-
<field name="x_studio_account" ref="condominium_analytic_account_20"/>
4+
<field name="x_studio_account" ref="condominium_analytic_account_29"/>
55
<field name="x_studio_owner" ref="res_partner_35"/>
66
</record>
77
<record id="x_property_line_019a4_2" model="x_property_line_019a4">
88
<field name="x_studio_co_owners" eval="[(6, 0, [ref('res_partner_33')])]"/>
9-
<field name="x_studio_account" ref="condominium_analytic_account_21"/>
9+
<field name="x_studio_account" ref="condominium_analytic_account_30"/>
1010
<field name="x_studio_owner" ref="res_partner_32"/>
1111
</record>
1212
<record id="x_property_line_019a4_3" model="x_property_line_019a4">
13-
<field name="x_studio_account" ref="condominium_analytic_account_22"/>
13+
<field name="x_studio_account" ref="condominium_analytic_account_31"/>
1414
<field name="x_studio_owner" ref="res_partner_34"/>
1515
</record>
1616
<record id="x_property_line_019a4_4" model="x_property_line_019a4">

0 commit comments

Comments
 (0)