Skip to content

Commit c7d9690

Browse files
committed
[IMP] condominium: cleanup11
1 parent bcd7c4e commit c7d9690

File tree

9 files changed

+76
-72
lines changed

9 files changed

+76
-72
lines changed

condominium/__manifest__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
'data/ir_ui_menu.xml',
4040
'data/ir_model_access.xml',
4141
'data/ir_rule.xml',
42-
'data/res_company.xml',
4342
'data/res_partner.xml',
43+
'data/res_company.xml',
4444
'data/project_task_type.xml',
4545
'data/documents_folder.xml',
4646
'data/project_project.xml',

condominium/data/ir_actions_act_window.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
top right corner (you can also customize this help message there).
171171
</p>
172172
]]></field>
173-
<field name="name">Propertys</field>
173+
<field name="name">properties</field>
174174
<field name="domain">[('x_studio_company_id', 'in', allowed_company_ids)]</field>
175175
<field name="res_model">x_property</field>
176176
<field name="view_mode">kanban,list,form</field>

condominium/data/ir_actions_server.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,12 @@ for plan in other_plans:
3232
for line in records.x_line_ids:
3333
original_analytic = line.x_analytic_line_id or original_analytic
3434
analytic_id = line.x_analytic_account_name_id
35-
analytic_name = analytic_id.name
35+
original_analytic_name = original_analytic.name
3636
original_analytic_id = original_analytic.id
3737
3838
if original_analytic:
3939
new_analytic_item_id = original_analytic.copy({
4040
fname: analytic_id.id or '',
41-
"name": analytic_name,
4241
"amount": line.x_amount
4342
})
4443
@@ -49,11 +48,11 @@ for line in records.x_line_ids:
4948
5049
if original_analytic_id in note_details:
5150
analytic_url = f"/odoo/analytic-items/{new_analytic_item_id.id}"
52-
note_line = f"- {line.x_share:.2f}% on <a href='{analytic_url}' target='_blank'>{analytic_name}</a>"
51+
note_line = f"- {line.x_share:.2f}% on <a href='{analytic_url}' target='_blank'>{original_analytic_name}</a>"
5352
note_details[original_analytic_id].add(note_line)
5453
else:
5554
analytic_url = f"/odoo/analytic-items/{new_analytic_item_id.id}"
56-
note_line = {f"- {line.x_share:.2f}% on <a href='{analytic_url}' target='_blank'>{analytic_name}</a>"}
55+
note_line = {f"- {line.x_share:.2f}% on <a href='{analytic_url}' target='_blank'>{original_analytic_name}</a>"}
5756
note_details.update({original_analytic_id: set(note_line)})
5857
5958
for original_id, new_lines in occupied_cells.items():

condominium/data/ir_model_fields.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1345,15 +1345,15 @@ for record in self: record['x_x_studio_condominium_x_property_count'] = self.env
13451345
</record>
13461346

13471347

1348-
<record id="new_many2one_journal_allocation" model="ir.model.fields">
1348+
<!-- <record id="new_many2one_journal_allocation" model="ir.model.fields">
13491349
<field name="ttype">many2one</field>
13501350
<field name="copied" eval="True"/>
13511351
<field name="field_description">Allocation</field>
13521352
<field name="model_id" ref="account.model_account_move"/>
13531353
<field name="name">x_studio_analytic_category</field>
13541354
<field name="relation">account.report.line</field>
1355-
</record>
1356-
<record id="new_related_field_analytic_category" model="ir.model.fields">
1355+
</record> -->
1356+
<!-- <record id="new_related_field_analytic_category" model="ir.model.fields">
13571357
<field name="ttype">many2one</field>
13581358
<field name="related">move_id.x_studio_analytic_category</field>
13591359
<field name="field_description">Analytic Category</field>
@@ -1362,8 +1362,8 @@ for record in self: record['x_x_studio_condominium_x_property_count'] = self.env
13621362
<field name="readonly" eval="True"/>
13631363
<field name="relation">account.report.line</field>
13641364
<field name="store" eval="False"/>
1365-
</record>
1366-
<record id="field_analytic_category" model="ir.model.fields">
1365+
</record> -->
1366+
<!-- <record id="field_analytic_category" model="ir.model.fields">
13671367
<field name="ttype">many2one</field>
13681368
<field name="related">move_line_id.x_studio_analytic_category</field>
13691369
<field name="field_description">Analytic Category</field>
@@ -1372,7 +1372,7 @@ for record in self: record['x_x_studio_condominium_x_property_count'] = self.env
13721372
<field name="readonly" eval="True"/>
13731373
<field name="relation">account.report.line</field>
13741374
<field name="store" eval="False"/>
1375-
</record>
1375+
</record> -->
13761376

13771377

13781378

condominium/data/ir_ui_view.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,8 @@
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">
374-
<field widget="statinfo" name="x_x_studio_condominium_x_property_count" string="Properties" />
373+
<button class="oe_stat_button" icon="fa-home" type="action" name="%(owner_properties_contact_smart_button)d">
374+
<field widget="statinfo" name="x_x_studio_current_owner_x_property_count" string="Properties" />
375375
</button>
376376
</xpath>
377377
<xpath expr="//field[@name='property_product_pricelist']" position="after">
@@ -887,7 +887,7 @@
887887
</header>
888888
</xpath>
889889
<xpath expr="//form[1]/sheet[1]/group[1]/group[@name='analytic_item']/field[@name='company_id']" position="after">
890-
<field name="x_studio_analytic_category"/>
890+
<!-- <field name="x_studio_analytic_category"/> -->
891891
<field name="x_notes"/>
892892
</xpath>
893893
<xpath expr="//field[@name='product_id']" position="after">
@@ -1464,7 +1464,7 @@
14641464
<field name="priority">99</field>
14651465
<field name="type">form</field>
14661466
</record>
1467-
<record id="odoo_studio_account__39a436dc-4f7c-45a2-89e1-1fb49e992db8" model="ir.ui.view">
1467+
<!-- <record id="odoo_studio_account__39a436dc-4f7c-45a2-89e1-1fb49e992db8" model="ir.ui.view">
14681468
<field name="arch" type="xml">
14691469
<data>
14701470
<xpath expr="//field[@name='ref']" position="after">
@@ -1479,12 +1479,12 @@
14791479
<field name="name">account.move.list customization</field>
14801480
<field name="priority">160</field>
14811481
<field name="type">list</field>
1482-
</record>
1482+
</record> -->
14831483
<record id="odoo_studio_account__485a4437-0359-4b73-bb01-ede38aa91f99" model="ir.ui.view">
14841484
<field name="arch" type="xml">
14851485
<data>
14861486
<xpath expr="//field[@name='move_name']" position="after">
1487-
<field optional="show" name="x_studio_analytic_category"/>
1487+
<!-- <field optional="show" name="x_studio_analytic_category"/> -->
14881488
<field name="account_type" optional="show"/>
14891489
</xpath>
14901490
</data>
@@ -1497,7 +1497,7 @@
14971497
<field name="priority">160</field>
14981498
<field name="type">list</field>
14991499
</record>
1500-
<record id="odoo_studio_account__f41a914d-a260-473c-8e27-102eec57eb14" model="ir.ui.view">
1500+
<!-- <record id="odoo_studio_account__f41a914d-a260-473c-8e27-102eec57eb14" model="ir.ui.view">
15011501
<field name="arch" type="xml">
15021502
<data>
15031503
<xpath expr="//field[@name='date']" position="after">
@@ -1512,7 +1512,7 @@
15121512
<field name="name">account.analytic.line.list customization</field>
15131513
<field name="priority">160</field>
15141514
<field name="type">list</field>
1515-
</record>
1515+
</record> -->
15161516
<record id="default_list_view_fo_62ecbeef-9397-4032-9b25-469b8c8e9c4d" model="ir.ui.view">
15171517
<field name="arch" type="xml">
15181518
<list>
@@ -1661,7 +1661,7 @@
16611661
</xpath>
16621662
<xpath expr="//field[@name='x_studio_distribution_key']" position="before">
16631663
<field name="status_in_payment" position="move"/>
1664-
<field name="x_studio_analytic_category" optional="show" readonly="True"/>
1664+
<!-- <field name="x_studio_analytic_category" optional="show" readonly="True"/> -->
16651665
</xpath>
16661666
</data>
16671667
</field>
@@ -1692,19 +1692,19 @@
16921692
<xpath expr="//field[@name='journal_group_id']" position="replace"/>
16931693
<xpath expr="//field[@name='journal_id']" position="replace"/>
16941694
<xpath expr="//filter[@name='salesperson']" position="after">
1695-
<filter name="studio_group_by_g8_1iqqi7ti8" string="Allocation" context="{'group_by': 'x_studio_analytic_category'}"/>
1695+
<!-- <filter name="studio_group_by_g8_1iqqi7ti8" string="Allocation" context="{'group_by': 'x_studio_analytic_category'}"/> -->
16961696
<filter name="studio_group_by_5c1_1iqqi93k0" string="Distribution Key" context="{'group_by': 'x_distribution_key'}"/>
16971697
<filter name="studio_group_by_7oi_1iqqibl90" string="Meter" context="{'group_by': 'x_studio_meter'}"/>
16981698
</xpath>
16991699
<xpath expr="//filter[@name='myinvoices']" position="after">
1700-
<filter domain="[('x_studio_analytic_category', '=', False)]" name="unallocated" help="Unallocated"/>
1700+
<!-- <filter domain="[('x_studio_analytic_category', '=', False)]" name="unallocated" help="Unallocated"/> -->
17011701
<filter domain="[('x_distribution_key', '=', False), ('x_studio_meter', '=', False)]" name="undistributed" help="Without distribution"/>
17021702
<!-- <filter domain="[('x_studio_to_distribute', '=', True)]" name="undistributed" help="To distribute"/> -->
17031703
<separator/>
17041704
</xpath>
1705-
<xpath expr="//search[1]/field[@name='name']" position="before">
1705+
<!-- <xpath expr="//search[1]/field[@name='name']" position="before">
17061706
<field name="x_studio_analytic_category"/>
1707-
</xpath>
1707+
</xpath> -->
17081708
</data>
17091709
</field>
17101710
<field name="inherit_id" ref="account.view_account_invoice_filter"/>
@@ -1966,13 +1966,13 @@
19661966
<field name="x_studio_period_start" invisible="False" help="Used to distribute costs by meter; closest meter reading date used"/>
19671967
<field name="x_studio_period_end" invisible="False" help="Used to distribute costs by meter; closest meter reading date used"/>
19681968
</group>
1969-
<group name="studio_group_8lb_right" string="Allocation">
1969+
<!-- <group name="studio_group_8lb_right" string="Allocation">
19701970
<field name="x_studio_analytic_category" domain="[(&quot;x_studio_used_for_categorization&quot;, &quot;=&quot;, True)]" string="Allocation"/>
1971-
</group>
1971+
</group> -->
19721972
</group>
19731973
</page>
19741974
</xpath>
1975-
<xpath expr="//group[@name='studio_group_8lb_right']" position="replace"/>
1975+
<!-- <xpath expr="//group[@name='studio_group_8lb_right']" position="replace"/> -->
19761976
<!-- this xpath come from 'account_peppol' -->
19771977
<xpath expr="//button[@name='action_cancel_peppol_documents']" position="after">
19781978
<button string="Distribute Costs" name="%(distribute_costs)d" type="action"/>

condominium/data/qweb_view.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
</h4>
191191
<p t-field="motion.x_studio_notes" />
192192
<p>
193-
Votes (need<t t-out="motion.x_studio_vote_criteria.x_name" />):
193+
Votes (need <t t-out="motion.x_studio_vote_criteria.x_name" />):
194194
</p>
195195
<t t-if="motion.x_studio_abstention != 0">
196196
<li>

condominium/data/res_company.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,27 @@
22
<odoo noupdate="1">
33
<record id="base.main_company" model="res.company" forcecreate="1">
44
<field name="name">My Company</field>
5+
<field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
6+
<field name="partner_id" ref="base.main_partner"/>
57
<field name="logo" type="base64" file="condominium/static/src/binary/res_company/4-logo"/>
68
<field name="email">[email protected]</field>
79
</record>
810
<record id="res_company_4" model="res.company">
911
<field name="name">Bells Beach Condominum</field>
12+
<field name="partner_id" ref="res_partner_43"/>
13+
<field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
1014
<field name="logo" type="base64" file="condominium/static/src/binary/res_company/Bells Beach Condominum"/>
1115
</record>
1216
<record id="res_company_3" model="res.company">
1317
<field name="name">Dominican Condominium</field>
18+
<field name="partner_id" ref="res_partner_8"/>
19+
<field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
1420
<field name="logo" type="base64" file="condominium/static/src/binary/res_company/3-logo"/>
1521
</record>
1622
<record id="res_company_2" model="res.company">
1723
<field name="name">Green Island Condominium</field>
24+
<field name="user_ids" eval="[Command.link(ref('base.user_admin'))]"/>
25+
<field name="partner_id" ref="res_partner_7"/>
1826
<field name="logo" type="base64" file="condominium/static/src/binary/res_company/2-logo"/>
1927
</record>
2028
<function model="account.chart.template" name="try_loading">

0 commit comments

Comments
 (0)