Skip to content

Commit 509f8ae

Browse files
mega-odoomega-odoo
committed
Cleanup commit -4
- demo
1 parent d26b14e commit 509f8ae

18 files changed

+2785
-1781
lines changed

‎condominium/__manifest__.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
'account_check_printing',
88
'account_followup',
99
'accountant',
10+
'appointment_account_payment',
1011
'calendar',
1112
'contacts',
1213
'documents_product',
1314
'documents_project_sale',
1415
'documents_spreadsheet',
16+
'l10n_be_reports_post_wizard',
1517
'helpdesk_sale_timesheet',
1618
'hr',
1719
'knowledge',
@@ -29,10 +31,11 @@
2931
'data/account_analytic_plan.xml',
3032
'data/ir_filters.xml',
3133
'data/ir_default.xml',
32-
'data/meter_view.xml',
34+
# 'data/meter_view.xml',
3335
'data/ir_actions_act_window.xml',
3436
'data/ir_actions_act_window_view.xml',
3537
'data/ir_ui_view.xml',
38+
'data/qweb_view.xml',
3639
'data/ir_ui_menu.xml',
3740
'data/ir_model_access.xml',
3841
'data/ir_rule.xml',
@@ -57,7 +60,6 @@
5760
'data/res_partner.xml',
5861
'data/res_company.xml',
5962
'data/x_distribution_key.xml',
60-
6163
'data/x_vote_criteria.xml',
6264
'data/x_calendar_event_line_a1bce.xml',
6365
'data/x_meters.xml',
@@ -67,7 +69,7 @@
6769
'data/x_buildings.xml',
6870
'data/x_property.xml',
6971
'data/x_property_line_019a4.xml',
70-
'demo/account_analytic_account.xml',
72+
'data/account_analytic_account.xml',
7173
'data/x_meter_reading.xml',
7274
'data/x_period.xml',
7375
'data/x_property_line_07bf7.xml',
@@ -91,6 +93,7 @@
9193
},
9294
'author': 'Odoo S.A.',
9395
"cloc_exclude": [
96+
'data/qweb_view.xml',
9497
"data/knowledge_article.xml",
9598
"static/src/js/my_tour.js",
9699
],

‎condominium/data/account_analytic_account.xml‎

Lines changed: 195 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,195 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<odoo noupdate="1">
3+
<record id="condominium_analytic_account_12" model="account.analytic.account">
4+
<field name="name">Apartment A0</field>
5+
<field name="partner_id" ref="res_partner_32"/>
6+
<field name="x_tags" eval="[(6, 0, [ref('x_properties_tag_1')])]"/>
7+
<field name="x_building" ref="x_buildings_1"/>
8+
<field name="x_area">100.0</field>
9+
<field name="x_type" ref="x_properties_types_1"/>
10+
<field name="x_floor">0</field>
11+
</record>
12+
<record id="condominium_analytic_account_14" model="account.analytic.account">
13+
<field name="name">Apartment A1</field>
14+
<field name="partner_id" ref="res_partner_34"/>
15+
<field name="x_building" ref="x_buildings_1"/>
16+
<field name="x_area">100.0</field>
17+
<field name="x_type" ref="x_properties_types_1"/>
18+
<field name="x_floor">1</field>
19+
</record>
20+
<record id="condominium_analytic_account_15" model="account.analytic.account">
21+
<field name="name">Apartment A2</field>
22+
<field name="partner_id" ref="res_partner_38"/>
23+
<field name="x_building" ref="x_buildings_1"/>
24+
<field name="x_area">100.0</field>
25+
<field name="x_type" ref="x_properties_types_1"/>
26+
<field name="x_floor">2</field>
27+
</record>
28+
<record id="condominium_analytic_account_17" model="account.analytic.account">
29+
<field name="name">Apartment B0</field>
30+
<field name="partner_id" ref="res_partner_20"/>
31+
<field name="x_building" ref="x_buildings_4"/>
32+
<field name="x_area">200.0</field>
33+
<field name="x_type" ref="x_properties_types_1"/>
34+
<field name="x_floor">0</field>
35+
</record>
36+
<record id="condominium_analytic_account_19" model="account.analytic.account">
37+
<field name="name">Apartment B1.1</field>
38+
<field name="partner_id" ref="res_partner_36"/>
39+
<field name="x_building" ref="x_buildings_4"/>
40+
<field name="x_area">100.0</field>
41+
<field name="x_type" ref="x_properties_types_1"/>
42+
<field name="x_floor">1</field>
43+
</record>
44+
<record id="condominium_analytic_account_18" model="account.analytic.account">
45+
<field name="name">Apartment B1.2</field>
46+
<field name="partner_id" ref="res_partner_36"/>
47+
<field name="x_building" ref="x_buildings_4"/>
48+
<field name="x_area">100.0</field>
49+
<field name="x_type" ref="x_properties_types_1"/>
50+
<field name="x_floor">1</field>
51+
</record>
52+
<record id="condominium_analytic_account_16" model="account.analytic.account">
53+
<field name="name">Basement AB</field>
54+
<field name="partner_id" ref="res_partner_34"/>
55+
<field name="x_building" ref="x_buildings_1"/>
56+
<field name="x_area">50.0</field>
57+
<field name="x_parent" ref="condominium_analytic_account_15"/>
58+
<field name="x_type" ref="x_properties_types_5"/>
59+
<field name="x_floor">-1</field>
60+
</record>
61+
<record id="condominium_analytic_account_13" model="account.analytic.account">
62+
<field name="name">Garage AG</field>
63+
<field name="partner_id" ref="res_partner_32"/>
64+
<field name="x_building" ref="x_buildings_1"/>
65+
<field name="x_area">40.0</field>
66+
<field name="x_parent" ref="condominium_analytic_account_12"/>
67+
<field name="x_type" ref="x_properties_types_4"/>
68+
<field name="x_floor">-1</field>
69+
</record>
70+
<record id="condominium_analytic_account_20" model="account.analytic.account">
71+
<field name="name">House C1</field>
72+
<field name="partner_id" ref="res_partner_35"/>
73+
<field name="x_building" ref="x_buildings_5"/>
74+
<field name="x_area">300.0</field>
75+
<field name="x_type" ref="x_properties_types_2"/>
76+
<field name="x_floor">0</field>
77+
</record>
78+
<record id="condominium_analytic_account_21" model="account.analytic.account">
79+
<field name="name">Parking CP</field>
80+
<field name="partner_id" ref="res_partner_35"/>
81+
<field name="x_building" ref="x_buildings_5"/>
82+
<field name="x_area">20.0</field>
83+
<field name="x_parent" ref="condominium_analytic_account_20"/>
84+
<field name="x_type" ref="x_properties_types_6"/>
85+
<field name="x_floor">0</field>
86+
</record>
87+
<record id="condominium_analytic_account_22" model="account.analytic.account">
88+
<field name="name">Studio CS</field>
89+
<field name="partner_id" ref="res_partner_35"/>
90+
<field name="x_building" ref="x_buildings_5"/>
91+
<field name="x_area">50.0</field>
92+
<field name="x_parent" ref="condominium_analytic_account_20"/>
93+
<field name="x_type" ref="x_properties_types_6"/>
94+
<field name="x_floor">0</field>
95+
</record>
96+
<record id="condominium_analytic_account_2" model="account.analytic.account">
97+
<field name="name">Kick-Off Template</field>
98+
<field name="plan_id" ref="analytic.analytic_plan_projects"/>
99+
</record>
100+
<record id="condominium_analytic_account_32" model="account.analytic.account">
101+
<field name="name">S00002 - Kick-Off Template</field>
102+
<field name="plan_id" ref="analytic.analytic_plan_projects"/>
103+
<field name="partner_id" ref="res_partner_7"/>
104+
</record>
105+
<record id="condominium_analytic_account_33" model="account.analytic.account">
106+
<field name="name">Apartment A0 - Charlotte M. Warren</field>
107+
<field name="partner_id" ref="res_partner_32"/>
108+
<field name="x_studio_owner_line" ref="x_property_line_019a4_2"/>
109+
<field name="x_studio_property" ref="x_property_1"/>
110+
</record>
111+
<record id="condominium_analytic_account_34" model="account.analytic.account">
112+
<field name="name">Apartment A0 - Steven S. Jackson</field>
113+
<field name="partner_id" ref="res_partner_35"/>
114+
<field name="x_studio_owner_line" ref="x_property_line_019a4_1"/>
115+
<field name="x_studio_property" ref="x_property_1"/>
116+
</record>
117+
<record id="condominium_analytic_account_35" model="account.analytic.account">
118+
<field name="name">Apartment A1 - Harold J. Butler</field>
119+
<field name="partner_id" ref="res_partner_34"/>
120+
<field name="x_studio_owner_line" ref="x_property_line_019a4_3"/>
121+
<field name="x_studio_property" ref="x_property_2"/>
122+
</record>
123+
<record id="condominium_analytic_account_23" model="account.analytic.account">
124+
<field name="name">Apartment A2 - Ronda V. Jones</field>
125+
<field name="partner_id" ref="res_partner_38"/>
126+
<field name="x_studio_owner_line" ref="x_property_line_019a4_4"/>
127+
<field name="x_studio_property" ref="x_property_3"/>
128+
</record>
129+
<record id="condominium_analytic_account_26" model="account.analytic.account">
130+
<field name="name">Apartment B0 - Margaret E. Lowe</field>
131+
<field name="partner_id" ref="res_partner_20"/>
132+
<field name="x_studio_owner_line" ref="x_property_line_019a4_7"/>
133+
<field name="x_studio_property" ref="x_property_6"/>
134+
</record>
135+
<record id="condominium_analytic_account_27" model="account.analytic.account">
136+
<field name="name">Apartment B1.1 - Janet D. Halle</field>
137+
<field name="partner_id" ref="res_partner_36"/>
138+
<field name="x_studio_owner_line" ref="x_property_line_019a4_8"/>
139+
<field name="x_studio_property" ref="x_property_7"/>
140+
</record>
141+
<record id="condominium_analytic_account_28" model="account.analytic.account">
142+
<field name="name">Apartment B1.2 - Janet D. Halle</field>
143+
<field name="partner_id" ref="res_partner_36"/>
144+
<field name="x_studio_owner_line" ref="x_property_line_019a4_9"/>
145+
<field name="x_studio_property" ref="x_property_8"/>
146+
</record>
147+
<record id="condominium_analytic_account_24" model="account.analytic.account">
148+
<field name="name">Basement AB - Harold J. Butler</field>
149+
<field name="partner_id" ref="res_partner_34"/>
150+
<field name="x_studio_owner_line" ref="x_property_line_019a4_5"/>
151+
<field name="x_studio_property" ref="x_property_4"/>
152+
</record>
153+
<record id="condominium_analytic_account_25" model="account.analytic.account">
154+
<field name="name">Garage AG - Charlotte M. Warren</field>
155+
<field name="partner_id" ref="res_partner_32"/>
156+
<field name="x_studio_owner_line" ref="x_property_line_019a4_6"/>
157+
<field name="x_studio_property" ref="x_property_5"/>
158+
</record>
159+
<record id="condominium_analytic_account_29" model="account.analytic.account">
160+
<field name="name">House C1 - Steven S. Jackson</field>
161+
<field name="partner_id" ref="res_partner_35"/>
162+
<field name="x_studio_owner_line" ref="x_property_line_019a4_10"/>
163+
<field name="x_studio_property" ref="x_property_9"/>
164+
</record>
165+
<record id="condominium_analytic_account_30" model="account.analytic.account">
166+
<field name="name">Parking CP - Steven S. Jackson</field>
167+
<field name="partner_id" ref="res_partner_35"/>
168+
<field name="x_studio_owner_line" ref="x_property_line_019a4_11"/>
169+
<field name="x_studio_property" ref="x_property_10"/>
170+
</record>
171+
<record id="condominium_analytic_account_36" model="account.analytic.account">
172+
<field name="name">Studio 101 - Micheal E. Rosales</field>
173+
<field name="partner_id" ref="res_partner_33"/>
174+
<field name="x_studio_owner_line" ref="x_property_line_019a4_16"/>
175+
<field name="x_studio_property" ref="x_property_15"/>
176+
</record>
177+
<record id="condominium_analytic_account_37" model="account.analytic.account">
178+
<field name="name">Studio 102 - Peter E. Lee</field>
179+
<field name="partner_id" ref="res_partner_39"/>
180+
<field name="x_studio_owner_line" ref="x_property_line_019a4_17"/>
181+
<field name="x_studio_property" ref="x_property_16"/>
182+
</record>
183+
<record id="condominium_analytic_account_38" model="account.analytic.account">
184+
<field name="name">Studio 201 - Todd S. Zimmerman</field>
185+
<field name="partner_id" ref="res_partner_42"/>
186+
<field name="x_studio_owner_line" ref="x_property_line_019a4_18"/>
187+
<field name="x_studio_property" ref="x_property_17"/>
188+
</record>
189+
<record id="condominium_analytic_account_31" model="account.analytic.account">
190+
<field name="name">Studio CS - Steven S. Jackson</field>
191+
<field name="partner_id" ref="res_partner_35"/>
192+
<field name="x_studio_owner_line" ref="x_property_line_019a4_12"/>
193+
<field name="x_studio_property" ref="x_property_11"/>
194+
</record>
195+
</odoo>

‎condominium/data/ir_actions_act_window.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,4 +461,7 @@
461461
<field name="res_model">account.analytic.line</field>
462462
<field name="view_mode">pivot,list,form,grid</field>
463463
</record>
464+
465+
<!-- solve -->
466+
<!-- Distribution Key and meter come twice -->
464467
</odoo>

‎condominium/data/ir_actions_server.xml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
records.action_confirm()
1010
]]> </field>
1111
</record>
12-
1312
<record id="confirm_analytic_account_item_split_action" model="ir.actions.server">
1413
<field name="name">Confirm</field>
1514
<field name="state">code</field>
@@ -28,12 +27,17 @@ if round(total_share) != 100:
2827
raise UserError(total_share)
2928
3029
for line in records.x_line_ids:
30+
project_plan, other_plans = line.x_analytic_line_id.env['account.analytic.plan']._get_all_plans()
31+
for plan in other_plans:
32+
if plan.name == 'Properties':
33+
fname = plan._column_name()
34+
3135
analytic_id = line.x_analytic_account_name_id
3236
analytic_name = analytic_id.name
3337
original_id = line.x_analytic_line_id.id
3438
3539
new_analytic_item_id = new_analytic_item.create({
36-
"x_plan2_id": analytic_id.id,
40+
fname: analytic_id.id or '',
3741
"name": analytic_id.name,
3842
"amount": line.x_amount
3943
})
@@ -68,7 +72,6 @@ for cell, new_analytic_lines in occupied_cells.items():
6872
new_analytic_line.write({"x_notes": note_html.strip()})
6973
7074
for Aid, values in note_details.items():
71-
raise UserError(values)
7275
note_html = f"""
7376
<i>{datetime.date.today().strftime("%d %B %Y")}</i><br/>
7477
<p><b>Analytic item splited</b><br/>
@@ -96,7 +99,6 @@ for record in records:
9699
97100
for _ in range(2):
98101
analytic_account_lines.append((0, 0, {
99-
"x_analytic_account_name_id": record.x_plan2_id.id,
100102
"x_analytic_line_id": record.id,
101103
"x_amount": split_amount
102104
}))
@@ -183,7 +185,7 @@ for mr in mrs:
183185
<field name="code"><![CDATA[for line in record.x_property_id.x_studio_owner_ids:
184186
if line.x_studio_end_date == False: record['x_property_id']['x_studio_current_owner'] = line.x_studio_owner
185187
account = env['account.analytic.account'].search([('x_studio_property','=',record.x_property_id.id),('partner_id','=',line.x_studio_owner.id)])
186-
if not account: line['x_studio_account'] = env['account.analytic.account'].create({ 'name': record.x_property_id.x_name + " - " + line.x_studio_owner.name, 'x_studio_property': record.x_property_id.id, 'partner_id': line.x_studio_owner.id, 'x_studio_owner_line': line.id}).id
188+
if not account: line['x_studio_account'] = env['account.analytic.account'].create({ 'name': str(record.x_property_id.x_name) + " - " + str(line.x_studio_owner.name), 'x_studio_property': record.x_property_id.id, 'partner_id': line.x_studio_owner.id, 'x_studio_owner_line': line.id}).id
187189
]]> </field>
188190
<field name="model_id" ref="property_line_58f38056-6793-42e3-8f7a-f3db6e3da145"/>
189191
<field name="state">code</field>

‎condominium/data/ir_default.xml‎

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'?>
2-
<odoo>
2+
<odoo noupdate="1">
33
<record id="active_property_f2e6c75f-ffb3-49b8-8c32-290acd2e6e42" model="ir.default">
44
<field name="field_id" ref="field_property_active"/>
55
<field name="json_value">true</field>

‎condominium/data/ir_model_fields.xml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1820,14 +1820,14 @@ for record in self: record['x_x_studio_condominium_x_property_count'] = self.env
18201820
<field name="model_id" ref="model_x_analytic_account_wizard_line"/>
18211821
<field name="relation">account.analytic.line</field>
18221822
</record>
1823-
<record id="field_x_analytic_account_name_id" model="ir.model.fields">
1823+
<!-- <record id="field_x_analytic_account_name_id" model="ir.model.fields">
18241824
<field name="name">x_analytic_account_name_id</field>
18251825
<field name="ttype">many2one</field>
18261826
<field name="relation">account.analytic.account</field>
18271827
<field name="field_description">Account name</field>
18281828
<field name="related">x_analytic_line_id.x_plan2_id</field>
18291829
<field name="model_id" ref="model_x_analytic_account_wizard_line"/>
1830-
</record>
1830+
</record> -->
18311831
<record id="field_x_currency_id" model="ir.model.fields">
18321832
<field name="name">x_currency_id</field>
18331833
<field name="ttype">many2one</field>
@@ -1882,5 +1882,21 @@ for line in self:
18821882
<field name="field_description">Notes</field>
18831883
<field name="model_id" ref="analytic.model_account_analytic_line"/>
18841884
</record>
1885+
<record id="field_x_analytic_account_name_id" model="ir.model.fields">
1886+
<field name="name">x_analytic_account_name_id</field>
1887+
<field name="compute"><![CDATA[
1888+
for rec in self:
1889+
project_plan, other_plans = rec.x_analytic_line_id.env['account.analytic.plan']._get_all_plans()
1890+
for plan in other_plans:
1891+
if plan.name == 'Properties':
1892+
fname = plan._column_name()
1893+
rec['x_analytic_account_name_id'] = rec.x_analytic_line_id[fname]
1894+
]]></field>
1895+
<field name="ttype">many2one</field>
1896+
<field name="relation">account.analytic.account</field>
1897+
<field name="depends">x_amount</field>
1898+
<field name="field_description">Account name test</field>
1899+
<field name="model_id" ref="model_x_analytic_account_wizard_line"/>
1900+
</record>
18851901

18861902
</odoo>

0 commit comments

Comments
 (0)