Skip to content

Commit c523aef

Browse files
committed
[IMP] condominium: cleanup16
1 parent 869b9e4 commit c523aef

File tree

9 files changed

+194
-160
lines changed

9 files changed

+194
-160
lines changed

condominium/__manifest__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
'demo/x_calendar_event_line_a1bce.xml',
9696
'demo/x_property_line_019a4.xml',
9797
'demo/calendar_event_update_voting_key.xml',
98-
# 'demo/create_link.xml',
9998
],
10099
'license': 'OPL-1',
101100
'assets': {

condominium/data/ir_actions_server.xml

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -129,22 +129,36 @@ action['res_id'] = env.company.partner_id.id]]>
129129
</field>
130130
</record>
131131
<record id="ir_action_create_condominium" model="ir.actions.server">
132-
<field name="code"><![CDATA[env['res.company'].create({
133-
'partner_id': record.id,
134-
'name': record.name,
135-
'street': record.street,
136-
'street2': record.street2,
137-
'zip': record.zip,
138-
'city': record.city,
139-
'state_id': record.state_id.id,
140-
'country_id': record.country_id.id,
141-
'vat': record.vat,
142-
'phone': record.phone,
143-
'email': record.email,
144-
'website': record.website,
145-
'logo': record.image_1920,
146-
})
147-
action = {'type': 'ir.actions.client', 'tag': 'reload'}]]></field>
132+
<field name="code"><![CDATA[
133+
if not record.country_id:
134+
# Show a snackbar danger message and stop action
135+
action = {
136+
'type': 'ir.actions.client',
137+
'tag': 'display_notification',
138+
'params': {
139+
'title': 'Country is required for condominium creation.',
140+
'type': 'danger',
141+
'sticky': False,
142+
}
143+
}
144+
else:
145+
env['res.company'].create({
146+
'partner_id': record.id,
147+
'name': record.name,
148+
'street': record.street,
149+
'street2': record.street2,
150+
'zip': record.zip,
151+
'city': record.city,
152+
'state_id': record.state_id.id,
153+
'country_id': record.country_id.id,
154+
'vat': record.vat,
155+
'phone': record.phone,
156+
'email': record.email,
157+
'website': record.website,
158+
'logo': record.image_1920,
159+
})
160+
action = {'type': 'ir.actions.client', 'tag': 'reload'}
161+
]]></field>
148162
<field name="model_id" ref="base.model_res_partner"/>
149163
<field name="state">code</field>
150164
<field name="name">Condomnium: Create Condominium</field>

condominium/data/ir_model_fields.xml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,8 @@ for record in self:
259259
<record id="x_condominium_account_analytic_account_count" model="ir.model.fields">
260260
<field name="name">x_condominium_account_analytic_account_count</field>
261261
<field name="compute"><![CDATA[
262-
account_data = self.env['account.analytic.account']._read_group(domain=[('x_condominium', 'in', self.ids)], groupby=['x_condominium'], aggregates=['__count'])
263-
mapped_data = {partner.id: count for partner, count in account_data}
264-
for partner in self: partner['x_condominium_account_analytic_account_count'] = mapped_data.get(partner.id, 0)
262+
for record in self:
263+
record['x_condominium_account_analytic_account_count'] = self.env['account.analytic.account'].search_count([('partner_id', '=', record.id)])
265264
]]> </field>
266265
<field name="ttype">integer</field>
267266
<field name="field_description">Building Condominium count</field>
@@ -356,9 +355,8 @@ for record in self:
356355
<field name="model_id" ref="sale.model_sale_order"/>
357356
<field name="field_description">Source Sales Order count</field>
358357
<field name="compute"><![CDATA[
359-
order_data = self.env['sale.order']._read_group(domain=[('x_source_sales_order', 'in', self.ids)], groupby=['x_source_sales_order'], aggregates=['__count'])
360-
mapped_data = {order.id: count for order, count in order_data}
361-
for order in self: order['x_x_source_sales_order_sale_order_count'] = mapped_data.get(order.id, 0)
358+
for record in self:
359+
record['x_x_source_sales_order_sale_order_count'] = self.env['sale.order'].search_count([('x_source_sales_order', '=', record.id)])
362360
]]> </field>
363361
<field name="ttype">integer</field>
364362
<field name="selectable" eval="False"/>
@@ -450,6 +448,7 @@ for record in self:
450448
<field name="field_description">Ratio</field>
451449
<field name="model_id" ref="ratios_model" />
452450
<field name="name">x_ratio</field>
451+
<field name="digits" eval="(16, 6)"/> <!-- (total_digits, decimal_digits) -->
453452
</record>
454453

455454
<!-- not found -->

condominium/data/ir_rule.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,13 @@
2121
<field name="name">Distribution Key - Multi-Company</field>
2222
</record>
2323

24+
<!-- whenever we create a calendar.event 'x_studio_condominium' is become a empty so this rule give an access error -->
2425
<record id="calendar_event_multi_company" model="ir.rule">
2526
<field name="name">Calendar Event- multi_company</field>
2627
<field name="model_id" ref="calendar.model_calendar_event"/>
28+
<!-- <field name="domain_force">['|', ('x_studio_condominium', '=', False), ('x_studio_condominium', 'in', company_ids)]</field> -->
2729
<field name="domain_force">[('x_studio_condominium', 'in', company_ids)]</field>
30+
2831
<!-- <field name="groups" eval="[(4, ref('base.group_user'))]"/> -->
2932
</record>
3033
<record id="hr_employee_multi_company" model="ir.rule">

0 commit comments

Comments
 (0)