Skip to content

Commit 35d008e

Browse files
committed
[IMP] condominium: cl-19
1 parent c04e468 commit 35d008e

File tree

9 files changed

+75
-29
lines changed

9 files changed

+75
-29
lines changed

condominium/data/ir_model_fields.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@ for record in self:
448448
<field name="field_description">Ratio</field>
449449
<field name="model_id" ref="ratios_model" />
450450
<field name="name">x_ratio</field>
451+
<!-- <field name="digits" eval="(10, 6)"/> -->
451452
</record>
452453

453454
<!-- not found -->
@@ -957,6 +958,26 @@ for record in self:
957958
<field name="name">x_studio_company_id</field>
958959
<field name="relation">res.company</field>
959960
</record>
961+
962+
<!-- testing to remove unused account -->
963+
<record id="field_property_company_id_test" model="ir.model.fields">
964+
<field name="ttype">many2one</field>
965+
<field name="copied" eval="True"/>
966+
<field name="field_description">Company</field>
967+
<field name="model_id" ref="model_meters"/>
968+
<field name="name">x_company_id</field>
969+
<field name="relation">res.company</field>
970+
</record>
971+
972+
<record id="field_property_company_test" model="ir.model.fields">
973+
<field name="ttype">many2one</field>
974+
<field name="copied" eval="True"/>
975+
<field name="field_description">Company</field>
976+
<field name="model_id" ref="property_line_58f38056-6793-42e3-8f7a-f3db6e3da145"/>
977+
<field name="name">x_company_id</field>
978+
<field name="relation">res.company</field>
979+
</record>
980+
960981
<record id="field_property_condominium" model="ir.model.fields">
961982
<field name="ttype">many2one</field>
962983
<field name="related">x_studio_company_id.partner_id</field>

condominium/data/ir_ui_view.xml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,12 @@
102102
<form>
103103
<header/>
104104
<sheet string="Buildings">
105-
<div name="button_box" class="oe_button_box">
105+
<!-- remove account smart button as savp said -->
106+
<!-- <div name="button_box" class="oe_button_box">
106107
<button class="oe_stat_button" icon="fa-home" type="action" name="%(props_build_act_window)d">
107108
<field widget="statinfo" name="x_x_building_account_analytic_account_count" string="Accounts"/>
108109
</button>
109-
</div>
110+
</div> -->
110111
<widget name="web_ribbon" text="Archived" bg_color="text-bg-danger" invisible="x_active"/>
111112
<field name="x_image" class="oe_avatar" widget="image"/>
112113
<div class="oe_title">
@@ -490,6 +491,8 @@
490491
<!-- <xpath expr="//button[@name='action_open_pricelist_report']" position="before">
491492
<button name="%(action_server_set_usage_meter_reading)d" string="Compute Ratios" type="action" class="btn-primary" />
492493
</xpath> -->
494+
495+
<!-- as remove the x_ratio field from pricelist  -->
493496
<xpath expr="//form[1]/sheet[1]/notebook[1]/page[1]" position="before">
494497
<page string="Ratios" name="studio_page_ratios">
495498
<field name="x_ratios">
@@ -507,6 +510,7 @@
507510
</field>
508511
</page>
509512
</xpath>
513+
510514
<xpath expr="//field[@name='x_sequence']" position="after">
511515
<field optional="show" name="x_studio_property" options="{'create_name_field': 'x_name'}"/>
512516
<xpath expr="//field[@name='x_owner']" position="move"/>
@@ -1825,7 +1829,7 @@
18251829
<field name="x_type" optional="show"/>
18261830
<field name="x_floor" optional="show"/>
18271831
<field name="x_area" sum="Sum of Area" optional="show"/>
1828-
<field name="x_ratio" sum="Sum of Ratio" optional="show" options="{'digits':[0,6]}"/>
1832+
<field name="x_ratio" sum="Sum of Ratio" optional="show" options="{'digits':[6,2]}"/>
18291833
</list>
18301834
</field>
18311835
</xpath>

condominium/data/x_meters.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@
33
<record id="x_meters_gas" model="x_meters">
44
<field name="x_name">Gas</field>
55
<field name="x_price">0.1</field>
6+
<field name="x_company_id" ref="res_company_2"/>
67
</record>
78
<record id="x_meters_elec" model="x_meters">
89
<field name="x_name">Electricity</field>
910
<field name="x_price">0.2</field>
11+
<field name="x_company_id" ref="res_company_2"/>
1012
</record>
1113
<record id="x_meters_water" model="x_meters">
1214
<field name="x_name">Water</field>
1315
<field name="x_price">1.2</field>
16+
<field name="x_company_id" ref="res_company_2"/>
1417
</record>
1518
</odoo>

condominium/data/x_property_line_019a4.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,51 +2,63 @@
22
<odoo noupdate="1">
33
<record id="x_property_line_019a4_1" model="x_property_line_019a4">
44
<field name="x_property_id" ref="x_property_1"/>
5+
<field name="x_company_id" ref="res_company_2"/>
56
<field name="x_studio_start_date" eval="datetime.today().date() - relativedelta(years=1, months=2, days=15)"/>
67
</record>
78
<record id="x_property_line_019a4_2" model="x_property_line_019a4">
89
<field name="x_property_id" ref="x_property_1"/>
10+
<field name="x_company_id" ref="res_company_2"/>
911
<field name="x_studio_start_date" eval="datetime.today().date() - relativedelta(years=2)"/>
1012
<field name="x_studio_end_date" eval="datetime.today().date() - relativedelta(years=1, months=2, days=15)"/>
1113
</record>
1214
<record id="x_property_line_019a4_3" model="x_property_line_019a4">
1315
<field name="x_property_id" ref="x_property_2"/>
16+
<field name="x_company_id" ref="res_company_2"/>
1417
<field name="x_studio_start_date" eval="datetime.today().date() - relativedelta(years=2)"/>
1518
</record>
1619
<record id="x_property_line_019a4_4" model="x_property_line_019a4">
1720
<field name="x_property_id" ref="x_property_3"/>
21+
<field name="x_company_id" ref="res_company_2"/>
1822
<field name="x_studio_start_date" eval="datetime.today().date() - relativedelta(years=2)"/>
1923
</record>
2024
<record id="x_property_line_019a4_5" model="x_property_line_019a4">
2125
<field name="x_property_id" ref="x_property_4"/>
26+
<field name="x_company_id" ref="res_company_2"/>
2227
<field name="x_studio_start_date" eval="datetime.today().date() - relativedelta(years=2)"/>
2328
</record>
2429
<record id="x_property_line_019a4_6" model="x_property_line_019a4">
2530
<field name="x_property_id" ref="x_property_5"/>
31+
<field name="x_company_id" ref="res_company_2"/>
2632
<field name="x_studio_start_date" eval="datetime.today().date() - relativedelta(years=2)"/>
2733
</record>
2834
<record id="x_property_line_019a4_7" model="x_property_line_019a4">
2935
<field name="x_property_id" ref="x_property_6"/>
36+
<field name="x_company_id" ref="res_company_2"/>
3037
<field name="x_studio_start_date" eval="datetime.today().date() - relativedelta(years=2)"/>
3138
</record>
3239
<record id="x_property_line_019a4_8" model="x_property_line_019a4">
3340
<field name="x_property_id" ref="x_property_7"/>
41+
<field name="x_company_id" ref="res_company_2"/>
3442
<field name="x_studio_start_date" eval="datetime.today().date() - relativedelta(years=2)"/>
3543
</record>
3644
<record id="x_property_line_019a4_9" model="x_property_line_019a4">
3745
<field name="x_property_id" ref="x_property_8"/>
46+
<field name="x_company_id" ref="res_company_2"/>
3847
<field name="x_studio_start_date" eval="datetime.today().date() - relativedelta(years=2)"/>
3948
</record>
4049
<record id="x_property_line_019a4_10" model="x_property_line_019a4">
4150
<field name="x_property_id" ref="x_property_9"/>
51+
<field name="x_company_id" ref="res_company_2"/>
4252
<field name="x_studio_start_date" eval="datetime.today().date() - relativedelta(years=2)"/>
4353
</record>
4454
<record id="x_property_line_019a4_11" model="x_property_line_019a4">
4555
<field name="x_property_id" ref="x_property_10"/>
56+
<field name="x_company_id" ref="res_company_2"/>
4657
<field name="x_studio_start_date" eval="datetime.today().date() - relativedelta(years=2)"/>
4758
</record>
4859
<record id="x_property_line_019a4_12" model="x_property_line_019a4">
4960
<field name="x_property_id" ref="x_property_11"/>
61+
<field name="x_company_id" ref="res_company_2"/>
5062
<field name="x_studio_start_date" eval="datetime.today().date() - relativedelta(years=2)"/>
5163
</record>
5264
<record id="x_property_line_019a4_13" model="x_property_line_019a4">
@@ -60,14 +72,17 @@
6072
</record>
6173
<record id="x_property_line_019a4_16" model="x_property_line_019a4">
6274
<field name="x_property_id" ref="x_property_15"/>
75+
<field name="x_company_id" ref="res_company_2"/>
6376
<field name="x_studio_start_date" eval="datetime.today().date() - relativedelta(years=2)"/>
6477
</record>
6578
<record id="x_property_line_019a4_17" model="x_property_line_019a4">
6679
<field name="x_property_id" ref="x_property_16"/>
80+
<field name="x_company_id" ref="res_company_2"/>
6781
<field name="x_studio_start_date" eval="datetime.today().date() - relativedelta(years=2)"/>
6882
</record>
6983
<record id="x_property_line_019a4_18" model="x_property_line_019a4">
7084
<field name="x_property_id" ref="x_property_17"/>
85+
<field name="x_company_id" ref="res_company_2"/>
7186
<field name="x_studio_start_date" eval="datetime.today().date() - relativedelta(years=2)"/>
7287
</record>
7388
</odoo>

condominium/demo/account_analytic_account.xml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo noupdate="1">
33
<record id="account_analytic_account_12" model="account.analytic.account">
4-
<field name="name">Apartment A0 - Charlotte M. Warren</field>
4+
<field name="name">Apartment A0</field>
55
<field name="company_id" ref="res_company_2"/>
66
<field name="partner_id" ref="res_partner_32"/>
77
<field name="x_tags" eval="[(6, 0, [ref('x_properties_tag_1')])]"/>
@@ -13,14 +13,14 @@
1313
<field name="x_floor">0</field>
1414
</record>
1515
<record id="account_analytic_account_1" model="account.analytic.account">
16-
<field name="name">Apartment A0 - Steven S. Jackson</field>
16+
<field name="name">Apartment A0</field>
1717
<field name="company_id" ref="res_company_2"/>
1818
<field name="partner_id" ref="res_partner_35"/>
1919
<field name="x_studio_owner_line" ref="x_property_line_019a4_1"/>
2020
<field name="x_studio_property" ref="x_property_1"/>
2121
</record>
2222
<record id="account_analytic_account_14" model="account.analytic.account">
23-
<field name="name">Apartment A1 - Harold J. Butler</field>
23+
<field name="name">Apartment A1</field>
2424
<field name="partner_id" ref="res_partner_34"/>
2525
<field name="x_building" ref="x_buildings_1"/>
2626
<field name="x_area">100.0</field>
@@ -31,8 +31,7 @@
3131
<field name="x_floor">1</field>
3232
</record>
3333
<record id="account_analytic_account_15" model="account.analytic.account">
34-
<!-- <field name="name">Apartment A2</field> -->
35-
<field name="name">Apartment A2 - Ronda V. Jones</field>
34+
<field name="name">Apartment A2</field>
3635
<field name="partner_id" ref="res_partner_38"/>
3736
<field name="x_building" ref="x_buildings_1"/>
3837
<field name="x_area">100.0</field>
@@ -43,7 +42,7 @@
4342
<field name="x_floor">2</field>
4443
</record>
4544
<record id="account_analytic_account_17" model="account.analytic.account">
46-
<field name="name">Apartment B0 - Margaret E. Lowe</field>
45+
<field name="name">Apartment B0</field>
4746
<field name="partner_id" ref="res_partner_20"/>
4847
<field name="x_building" ref="x_buildings_4"/>
4948
<field name="company_id" ref="res_company_2"/>
@@ -54,7 +53,7 @@
5453
<field name="x_floor">0</field>
5554
</record>
5655
<record id="account_analytic_account_19" model="account.analytic.account">
57-
<field name="name">Apartment B1.1 - Janet D. Halle</field>
56+
<field name="name">Apartment B1.1</field>
5857
<field name="partner_id" ref="res_partner_36"/>
5958
<field name="x_building" ref="x_buildings_4"/>
6059
<field name="x_area">100.0</field>
@@ -65,7 +64,7 @@
6564
<field name="company_id" ref="res_company_2"/>
6665
</record>
6766
<record id="account_analytic_account_18" model="account.analytic.account">
68-
<field name="name">Apartment B1.2 - Janet D. Halle</field>
67+
<field name="name">Apartment B1.2</field>
6968
<field name="partner_id" ref="res_partner_36"/>
7069
<field name="x_building" ref="x_buildings_4"/>
7170
<field name="company_id" ref="res_company_2"/>
@@ -76,7 +75,7 @@
7675
<field name="x_floor">1</field>
7776
</record>
7877
<record id="account_analytic_account_16" model="account.analytic.account">
79-
<field name="name">Basement AB - Harold J. Butler</field>
78+
<field name="name">Basement AB</field>
8079
<field name="partner_id" ref="res_partner_34"/>
8180
<field name="x_building" ref="x_buildings_1"/>
8281
<field name="company_id" ref="res_company_2"/>
@@ -88,7 +87,7 @@
8887
<field name="x_floor">-1</field>
8988
</record>
9089
<record id="account_analytic_account_13" model="account.analytic.account">
91-
<field name="name">Garage AG - Charlotte M. Warren</field>
90+
<field name="name">Garage AG</field>
9291
<field name="partner_id" ref="res_partner_32"/>
9392
<field name="x_building" ref="x_buildings_1"/>
9493
<field name="x_area">40.0</field>
@@ -100,7 +99,7 @@
10099
<field name="x_floor">-1</field>
101100
</record>
102101
<record id="account_analytic_account_20" model="account.analytic.account">
103-
<field name="name">House C1 - Steven S. Jackson</field>
102+
<field name="name">House C1</field>
104103
<field name="partner_id" ref="res_partner_35"/>
105104
<field name="x_building" ref="x_buildings_5"/>
106105
<field name="x_area">300.0</field>
@@ -111,7 +110,7 @@
111110
<field name="company_id" ref="res_company_2"/>
112111
</record>
113112
<record id="account_analytic_account_21" model="account.analytic.account">
114-
<field name="name">Parking CP - Steven S. Jackson</field>
113+
<field name="name">Parking CP</field>
115114
<field name="partner_id" ref="res_partner_35"/>
116115
<field name="x_building" ref="x_buildings_5"/>
117116
<field name="x_area">20.0</field>
@@ -123,7 +122,7 @@
123122
<field name="company_id" ref="res_company_2"/>
124123
</record>
125124
<record id="account_analytic_account_22" model="account.analytic.account">
126-
<field name="name">Studio CS - Steven S. Jackson</field>
125+
<field name="name">Studio CS</field>
127126
<field name="partner_id" ref="res_partner_35"/>
128127
<field name="x_building" ref="x_buildings_5"/>
129128
<field name="x_area">50.0</field>
@@ -139,23 +138,23 @@
139138
<field name="plan_id" ref="analytic.analytic_plan_projects"/>
140139
</record>
141140
<record id="account_analytic_account_36" model="account.analytic.account">
142-
<field name="name">Studio 101 - Micheal E. Rosales</field>
141+
<field name="name">Studio 101</field>
143142
<field name="partner_id" ref="res_partner_33"/>
144143
<field name="x_studio_property" ref="x_property_15"/>
145144
<field name="x_studio_owner_line" ref="x_property_line_019a4_16"/>
146145
<field name="x_building" ref="x_buildings_6"/>
147146
<field name="company_id" ref="res_company_3"/>
148147
</record>
149148
<record id="account_analytic_account_37" model="account.analytic.account">
150-
<field name="name">Studio 102 - Peter E. Lee</field>
149+
<field name="name">Studio 102</field>
151150
<field name="partner_id" ref="res_partner_39"/>
152151
<field name="company_id" ref="res_company_3"/>
153152
<field name="x_building" ref="x_buildings_6"/>
154153
<field name="x_studio_owner_line" ref="x_property_line_019a4_17"/>
155154
<field name="x_studio_property" ref="x_property_16"/>
156155
</record>
157156
<record id="account_analytic_account_38" model="account.analytic.account">
158-
<field name="name">Studio 201 - Todd S. Zimmerman</field>
157+
<field name="name">Studio 201</field>
159158
<field name="partner_id" ref="res_partner_42"/>
160159
<field name="company_id" ref="res_company_3"/>
161160
<field name="x_building" ref="x_buildings_7"/>

condominium/demo/calendar_event.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<field name="name">General Meeting 2025</field>
55
<field name="x_studio_voting_key" ref="x_distribution_key_4"/>
66
<field name="user_id" ref="base.user_admin"/>
7-
<field name="start" eval="(DateTime.now() + relativedelta(days=3)).strftime('%Y-%m-%d 10:00:00')" />
8-
<field name="stop" eval="(DateTime.now() + relativedelta(days=3)).strftime('%Y-%m-%d 12:00:00')" />
7+
<field name="start" eval="DateTime.now()" />
8+
<field name="stop" eval="DateTime.now()" />
99
<field name="duration">2.0</field>
1010
<!-- <field name="partner_ids" eval="[
1111
(6, 0, [ref('res_partner_32'), ref('res_partner_34'), ref('res_partner_36'), ref('res_partner_20'), ref('res_partner_33'), ref('base.partner_admin'), ref('res_partner_38'), ref('res_partner_35')])

condominium/demo/sale_order.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,12 +219,14 @@
219219
<field name="user_id" ref="base.user_admin"/>
220220
<field name="plan_id" ref="sale_subscription.subscription_plan_month"/>
221221
</record>
222-
<record id="sale_order_165" model="sale.order" forcecreate="1">
222+
223+
<!-- as SAVP say to delete -->
224+
<!-- <record id="sale_order_165" model="sale.order" forcecreate="1">
223225
<field name="partner_id" ref="res_partner_8"/>
224-
<!-- <field name="company_id" ref="res_company_3"/> -->
226+
<field name="company_id" ref="res_company_3"/>
225227
<field name="prepayment_percent">1.0</field>
226228
<field name="user_id" ref="base.user_admin"/>
227-
</record>
229+
</record> -->
228230
<record id="sale_order_144" model="sale.order" forcecreate="1">
229231
<field name="partner_id" ref="res_partner_7"/>
230232
<!-- <field name="company_id" ref="res_company_2"/> -->
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo noupdate="1">
33
<!--Update sale order stages-->
4-
<function model="sale.order" name="action_confirm" eval="[[ref('sale_order_118'),ref('sale_order_117'),ref('sale_order_116'),ref('sale_order_115'),ref('sale_order_114'),ref('sale_order_113'),ref('sale_order_111'),ref('sale_order_110'),ref('sale_order_109'),ref('sale_order_108'),ref('sale_order_107'),ref('sale_order_106'),ref('sale_order_98'),ref('condominium.sale_order_102')]]"/>
4+
<function model="sale.order" name="action_confirm" eval="[[ref('sale_order_166'),ref('sale_order_144'),ref('sale_order_118'),ref('sale_order_117'),ref('sale_order_116'),ref('sale_order_115'),ref('sale_order_114'),ref('sale_order_113'),ref('sale_order_111'),ref('sale_order_110'),ref('sale_order_109'),ref('sale_order_108'),ref('sale_order_107'),ref('sale_order_106'),ref('sale_order_98'),ref('condominium.sale_order_102')]]"/>
55
</odoo>

condominium/demo/sale_order_line.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -589,16 +589,18 @@ Approximately $80 per property per month, See Terms & Condition for further info
589589
<field name="product_uom_id" ref="uom.product_uom_unit"/>
590590
<field name="price_unit">80.0</field>
591591
</record>
592-
<record id="sale_order_line_365" model="sale.order.line">
592+
593+
<!-- as SAVP say to delete -->
594+
<!-- <record id="sale_order_line_365" model="sale.order.line">
593595
<field name="order_id" ref="sale_order_165"/>
594596
<field name="product_id" ref="product_product_15"/>
595-
<!-- <field name="company_id" ref="base.main_company"/> -->
596-
<!-- <field name="order_partner_id" ref="res_partner_8"/> -->
597+
<field name="company_id" ref="base.main_company"/>
598+
<field name="order_partner_id" ref="res_partner_8"/>
597599
<field name="name"><![CDATA[Monthly Service Fees
598600
Approximately $80 per property per month, See Terms & Condition for further information about the coverage of the Service Fees]]></field>
599601
<field name="product_uom_id" ref="uom.product_uom_unit"/>
600602
<field name="price_unit">80.0</field>
601-
</record>
603+
</record> -->
602604
<record id="sale_order_line_335" model="sale.order.line">
603605
<field name="order_id" ref="sale_order_144"/>
604606
<field name="product_id" ref="product_product_15"/>

0 commit comments

Comments
 (0)