Skip to content

Commit 7deebee

Browse files
committed
[IMP] condominium: cleanup13
1 parent 5685fbb commit 7deebee

11 files changed

+76
-207
lines changed

condominium/__manifest__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@
105105
},
106106
'author': 'Odoo S.A.',
107107
"cloc_exclude": [
108+
'data/ir_actions_server.xml',
108109
'data/qweb_view.xml',
109110
"data/knowledge_article.xml",
110111
"static/src/js/my_tour.js",

condominium/data/ir_actions_act_window.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
<field name="res_model">x_period</field>
138138
</record>
139139
<record id="property_96b9dd0b-5897-447e-ba68-019707a9681f" model="ir.actions.act_window">
140-
<field name="name">properties</field>
140+
<field name="name">Properties</field>
141141
<field name="domain">[('x_studio_company_id', 'in', allowed_company_ids)]</field>
142142
<field name="res_model">x_property</field>
143143
<field name="view_mode">kanban,list,form</field>

condominium/data/ir_actions_server.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ record['state'] = 'cancel'
170170
]]> </field>
171171
<field name="model_id" ref="sale.model_sale_order"/>
172172
<field name="state">code</field>
173-
<field name="name">Split SO per Owner</field>
173+
<field name="name">Industry: Split SO per Owner</field>
174174
</record>
175175
<record id="action_server_set_usage_meter_reading" model="ir.actions.server">
176176
<field name="code"><![CDATA[mrs = env['x_meter_reading'].search([('id', 'in', record.x_studio_property.x_studio_meter_reading_ids.ids), ('x_meter_id', '=', record.x_meter_id.id)], order='x_date')
@@ -182,7 +182,7 @@ for mr in mrs:
182182
]]> </field>
183183
<field name="model_id" ref="model_meter_reading"/>
184184
<field name="state">code</field>
185-
<field name="name">Compute Meter Reading Consumption</field>
185+
<field name="name">Industry: Compute Meter Reading Consumption</field>
186186
</record>
187187
<record id="industry_update_curr_9c379c6b-889a-4235-af2e-df6e3dcfaa6d" model="ir.actions.server">
188188
<field name="code"><![CDATA[for line in record.x_property_id.x_studio_owner_ids:
@@ -192,7 +192,7 @@ for mr in mrs:
192192
]]> </field>
193193
<field name="model_id" ref="property_line_58f38056-6793-42e3-8f7a-f3db6e3da145"/>
194194
<field name="state">code</field>
195-
<field name="name">Update Property Current Owner</field>
195+
<field name="name">Industry: Update Property Current Owner</field>
196196
<field name="usage">base_automation</field>
197197
</record>
198198
<record id="industry_archive_rel_1116b329-ad32-4a7f-b31c-59702e264ec1" model="ir.actions.server">
@@ -202,7 +202,7 @@ for mr in mrs:
202202
]]> </field>
203203
<field name="model_id" ref="property_9abd67e7-492e-4fac-9aef-812e565e196e"/>
204204
<field name="state">code</field>
205-
<field name="name">Archive related accounts</field>
205+
<field name="name">Industry: Archive related accounts</field>
206206
<field name="usage">base_automation</field>
207207
</record>
208208
<record id="industry_populate_vo_154b8787-f5ce-4bea-931b-a6edbc80a723" model="ir.actions.server">
@@ -217,7 +217,7 @@ record['x_studio_attendee_vote_ids'] = env['x_calendar_event_line_a1bce_line_a3f
217217
]]> </field>
218218
<field name="model_id" ref="calendar_event_line_c0871dc9-8843-41a1-8c07-bbfd5c053508"/>
219219
<field name="state">code</field>
220-
<field name="name">Populate Voters</field>
220+
<field name="name">Industry: Populate Voters</field>
221221
<field name="usage">base_automation</field>
222222
</record>
223223
<record id="industry_set_votes_a_73342a03-85fc-4775-afd2-800be099d3aa" model="ir.actions.server">
@@ -227,7 +227,7 @@ record['x_studio_attendee_vote_ids'] = env['x_calendar_event_line_a1bce_line_a3f
227227
]]> </field>
228228
<field name="model_id" ref="calendar_event_line_c0871dc9-8843-41a1-8c07-bbfd5c053508"/>
229229
<field name="state">code</field>
230-
<field name="name">Set Votes as All Against</field>
230+
<field name="name">Industry: Set Votes as All Against</field>
231231
</record>
232232
<record id="industry_set_votes_a_d3b6fd79-aef3-4619-9279-4ec49d90559d" model="ir.actions.server">
233233
<field name="binding_model_id" ref="calendar_event_line_c0871dc9-8843-41a1-8c07-bbfd5c053508"/>
@@ -236,7 +236,7 @@ record['x_studio_attendee_vote_ids'] = env['x_calendar_event_line_a1bce_line_a3f
236236
]]> </field>
237237
<field name="model_id" ref="calendar_event_line_c0871dc9-8843-41a1-8c07-bbfd5c053508"/>
238238
<field name="state">code</field>
239-
<field name="name">Set Votes as All In Favor</field>
239+
<field name="name">Industry: Set Votes as All In Favor</field>
240240
</record>
241241
<record id="industry_send_genera_2c1dc29b-783e-4233-89c4-0ad81f20c6eb" model="ir.actions.server">
242242
<field name="binding_model_id" ref="calendar.model_calendar_event"/>
@@ -250,7 +250,7 @@ record['x_studio_attendee_vote_ids'] = env['x_calendar_event_line_a1bce_line_a3f
250250
<field name="model_id" ref="calendar.model_calendar_event"/>
251251
<field name="template_id" ref="mail_template_52"/>
252252
<field name="state">mail_post</field>
253-
<field name="name">Send General Meeting Agenda</field>
253+
<field name="name">Industry: Send General Meeting Agenda</field>
254254
</record>
255255
<record id="distribute_costs" model="ir.actions.server">
256256
<field name="binding_model_id" ref="account.model_account_move"/>
@@ -312,7 +312,7 @@ else:
312312
]]> </field>
313313
<field name="model_id" ref="account.model_account_move"/>
314314
<field name="state">code</field>
315-
<field name="name">Distribute Costs</field>
315+
<field name="name">Industry: Distribute Costs</field>
316316
</record>
317317
<record id="industry_populate_di_1bcb08fe-f6dc-4ea0-9ffc-d4607055470e" model="ir.actions.server">
318318
<field name="binding_model_id" ref="distribution_key_ebf70cee-4475-4921-a5f1-85e747bc5842"/>
@@ -325,7 +325,7 @@ else:
325325
]]> </field>
326326
<field name="model_id" ref="distribution_key_ebf70cee-4475-4921-a5f1-85e747bc5842"/>
327327
<field name="state">code</field>
328-
<field name="name">Populate Distribution Key</field>
328+
<field name="name">Industry: Populate Distribution Key</field>
329329
</record>
330330
<record id="industry_compute_dis_a81d25a4-1a4e-4e6d-94d2-cd9ed915b36f" model="ir.actions.server">
331331
<field name="binding_model_id" ref="distribution_key_ebf70cee-4475-4921-a5f1-85e747bc5842"/>
@@ -341,15 +341,15 @@ else:
341341
if server_action: server_action.run()]]></field>
342342
<field name="model_id" ref="account.model_account_move"/>
343343
<field name="state">code</field>
344-
<field name="name">Call Distribute Costs on UI update</field>
344+
<field name="name">Industry: Call Distribute Costs on UI update</field>
345345
<field name="usage">base_automation</field>
346346
</record>
347347
<record id="industry_call_distri_1dff37c7-1c90-46cd-be7e-0d935c31d7a6" model="ir.actions.server">
348348
<field name="code"><![CDATA[server_action = env['ir.actions.server'].search([('name','=','Industry: Distribute Costs')])
349349
if server_action: server_action.run()]]></field>
350350
<field name="model_id" ref="account.model_account_move"/>
351351
<field name="state">code</field>
352-
<field name="name">Call Distribute Costs on save</field>
352+
<field name="name">Industry: Call Distribute Costs on save</field>
353353
<field name="usage">base_automation</field>
354354
</record>
355355
<record id="industry_create_task_47e0cf69-8b12-4e53-b7d5-794639319f20" model="ir.actions.server">
@@ -358,6 +358,6 @@ if server_action: server_action.run()]]></field>
358358
action = { 'type': 'ir.actions.act_window', 'name': 'Create Task', 'res_model': 'project.task', 'view_mode': 'form', 'view_type': 'form', 'target': 'new', 'context': { 'default_project_id': env['project.project'].search([('partner_id', '=', customer_id)]).id, 'default_name': record.x_name, 'default_user_ids': [env.user.id], 'default_partner_id': customer_id } }]]></field>
359359
<field name="model_id" ref="calendar_event_line_c0871dc9-8843-41a1-8c07-bbfd5c053508"/>
360360
<field name="state">code</field>
361-
<field name="name">Create Task from Motion</field>
361+
<field name="name">Industry: Create Task from Motion</field>
362362
</record>
363363
</odoo>

condominium/data/ir_model_fields.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -452,14 +452,14 @@ for record in self:
452452
</record>
453453

454454
<!-- not found -->
455-
<record id="x_distribution_key_field" model="ir.model.fields">
455+
<!-- <record id="x_distribution_key_field" model="ir.model.fields">
456456
<field name="name">x_distribution_key</field>
457457
<field name="ttype">many2one</field>
458458
<field name="copied" eval="True" />
459459
<field name="field_description">X Distribution Key</field>
460460
<field name="model_id" ref="account.model_account_move" />
461461
<field name="relation">product.pricelist</field>
462-
</record>
462+
</record> -->
463463
<record id="field_meter_reading_meter_id" model="ir.model.fields">
464464
<field name="name">x_meter_id</field>
465465
<field name="field_description">Meter</field>
@@ -1422,14 +1422,14 @@ for record in self: record['x_x_studio_condominium_x_property_count'] = self.env
14221422
<field name="model_id" ref="period_f8169273-7f99-4a0f-9efe-77709295f0d2"/>
14231423
<field name="name">x_studio_end_date</field>
14241424
</record>
1425-
<record id="field_account_move_meter" model="ir.model.fields">
1425+
<!-- <record id="field_account_move_meter" model="ir.model.fields">
14261426
<field name="ttype">many2one</field>
14271427
<field name="copied" eval="True"/>
14281428
<field name="field_description">Meter</field>
14291429
<field name="model_id" ref="account.model_account_move"/>
14301430
<field name="name">x_studio_meter</field>
14311431
<field name="relation">x_meters</field>
1432-
</record>
1432+
</record> -->
14331433
<record id="field_account_move_period" model="ir.model.fields">
14341434
<field name="ttype">many2one</field>
14351435
<field name="copied" eval="True"/>

condominium/data/ir_ui_view.xml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@
370370
</header>
371371
</xpath>
372372
<xpath expr="//button[@name='action_open_employees']" position="after">
373-
<button class="oe_stat_button" icon="fa-home" type="action" name="%(properties_bcdebf3d-1009-4ec1-b263-329f31ab8376)d">
373+
<button class="oe_stat_button" icon="fa-home" type="action" name="%(properties_bcdebf3d-1009-4ec1-b263-329f31ab8376)d" invisible="not x_x_studio_condominium_x_property_count">
374374
<field widget="statinfo" name="x_x_studio_condominium_x_property_count" string="Properties" />
375375
</button>
376376
</xpath>
@@ -1649,7 +1649,7 @@
16491649
<xpath expr="//list[1]/field[@name='amount_total_in_currency_signed']" position="move"/>
16501650
<!-- <field name="invoice_line_ids" optional="show" widget="many2many_tags" readonly="True"/> -->
16511651
<field name="x_studio_distribution_key" optional="show"/>
1652-
<field name="x_studio_meter" optional="show"/>
1652+
<!-- <field name="x_studio_meter" optional="show"/> -->
16531653
<field name="x_studio_period_start" optional="show"/>
16541654
<field name="x_studio_period_end" optional="show"/>
16551655
</xpath>
@@ -1693,12 +1693,18 @@
16931693
<xpath expr="//field[@name='journal_id']" position="replace"/>
16941694
<xpath expr="//filter[@name='salesperson']" position="after">
16951695
<!-- <filter name="studio_group_by_g8_1iqqi7ti8" string="Allocation" context="{'group_by': 'x_studio_analytic_category'}"/> -->
1696-
<filter name="studio_group_by_5c1_1iqqi93k0" string="Distribution Key" context="{'group_by': 'x_distribution_key'}"/>
1697-
<filter name="studio_group_by_7oi_1iqqibl90" string="Meter" context="{'group_by': 'x_studio_meter'}"/>
1696+
1697+
<filter name="studio_group_by_5c1_1iqqi93k0" string="Distribution Key" context="{'group_by': 'x_studio_distribution_key'}"/>
1698+
<!-- <filter name="studio_group_by_7oi_1iqqibl90" string="Meter" context="{'group_by': 'x_studio_meter'}"/> -->
16981699
</xpath>
16991700
<xpath expr="//filter[@name='myinvoices']" position="after">
17001701
<!-- <filter domain="[('x_studio_analytic_category', '=', False)]" name="unallocated" help="Unallocated"/> -->
1701-
<filter domain="[('x_distribution_key', '=', False), ('x_studio_meter', '=', False)]" name="undistributed" help="Without distribution"/>
1702+
1703+
<!-- both filter are same but we delete x_studio_meter -->
1704+
<!-- <filter domain="[('x_distribution_key', '=', False), ('x_studio_meter', '=', False)]" name="undistributed" help="Without distribution"/> -->
1705+
<filter domain="[('x_studio_distribution_key', '=', False)]" name="undistributed" help="Without distribution"/>
1706+
1707+
17021708
<!-- <filter domain="[('x_studio_to_distribute', '=', True)]" name="undistributed" help="To distribute"/> -->
17031709
<separator/>
17041710
</xpath>

condominium/data/x_meter_reading.xml

Lines changed: 0 additions & 141 deletions
This file was deleted.

0 commit comments

Comments
 (0)