Skip to content

Commit 263fa17

Browse files
mega-odoomega-odoo
committed
[IMP] condominium: cleanup14
1 parent 7deebee commit 263fa17

18 files changed

+457
-200
lines changed

‎ale.subscription.pricing">‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
diff --git a/condominium/data/documents_folder.xml b/condominium/data/documents_folder.xml
2+
index 5b3190ef8..df790d1d4 100644
3+
--- a/condominium/data/documents_folder.xml
4+
+++ b/condominium/data/documents_folder.xml
5+
@@ -8,12 +8,10 @@
6+
<record id="documents_document_24" model="documents.document">
7+
<field name="name">Odoo Error - 2025-05-27 10:14:23.txt</field>
8+
<field name="file_extension">txt</field>
9+
- <field name="res_model">documents.document</field>
10+
- <!-- <field name="res_id" ref="documents_document_24"/> -->
11+
<field name="document_token">lQlGkhT1T72XvAea9Tm-_g</field>
12+
<field name="access_via_link">view</field>
13+
<field name="folder_id" ref="documents.document_support_folder"/>
14+
- </record>
15+
+</record>
16+
<!-- <record id="documents_document_21" model="documents.document">
17+
<field name="handler">spreadsheet</field>
18+
<field name="spreadsheet_snapshot" type="base64" file="studio_customization/static/src/binary/documents_document/21-spreadsheet_snapshot"/>
19+
@@ -121,7 +119,7 @@
20+
<field name="document_token">qbSX6yN-TlynzB2OHlprwA</field>
21+
<field name="access_internal">view</field>
22+
</record>
23+
- <record id="documents_hr.document_hr_folder" model="documents.document" forcecreate="1">
24+
+ <!-- <record id="documents_hr.document_hr_folder" model="documents.document" forcecreate="1">
25+
<field name="name">HR</field>
26+
<field name="type">folder</field>
27+
<field name="document_token">VuK8JAcvRaSovdJl5lHkIg</field>
28+
@@ -151,7 +149,7 @@
29+
<record id="documents.document_finance_folder" model="documents.document" forcecreate="1">
30+
<field name="name">Finance</field>
31+
<field name="type">folder</field>
32+
- <!-- <field name="partner_id" ref="res_partner_32"/> -->
33+
+ <field name="partner_id" ref="res_partner_32"/>
34+
<field name="document_token">809H2snSSO2GNRSCK_Bt8A</field>
35+
<field name="access_internal">edit</field>
36+
</record>
37+
@@ -159,5 +157,5 @@
38+
<field name="name">Administrator</field>
39+
<field name="type">folder</field>
40+
<field name="document_token">gHFeBoFRTjySNYFcK7n-2Q</field>
41+
- </record>
42+
-</odoo>
43+
+ </record> -->
44+
+</odoo>
45+
\ No newline at end of file
46+
diff --git a/condominium/data/ir_model_fields.xml b/condominium/data/ir_model_fields.xml
47+
index 30aae0988..10f60694f 100644
48+
--- a/condominium/data/ir_model_fields.xml
49+
+++ b/condominium/data/ir_model_fields.xml
50+
@@ -290,7 +290,6 @@ for record in self:
51+
<record id="partner_company_ids" model="ir.model.fields">
52+
<field name="name">x_companies</field>
53+
<field name="compute"><![CDATA[
54+
->>>>>>> 413a26e70 (Cleanup commit -1)
55+
for record in self:
56+
record['x_companies'] = [(6, 0, record.x_properties_ids.x_condominium.ref_company_ids.ids)]
57+
]]> </field>
58+
@@ -1892,4 +1891,50 @@ for rec in self:
59+
<field name="field_description">Account name test</field>
60+
<field name="model_id" ref="model_x_analytic_account_wizard_line"/>
61+
</record> -->
62+
-</odoo>
63+
+
64+
+ <!-- Account name test2 -->
65+
+ <record id="field_x_analytic_account_name_id" model="ir.model.fields">
66+
+ <field name="name">x_analytic_account_name_id</field>
67+
+ <field name="ttype">many2one</field>
68+
+ <field name="relation">account.analytic.account</field>
69+
+ <field name="field_description">Account</field>
70+
+ <field name="model_id" ref="model_x_analytic_account_wizard_line"/>
71+
+ </record>
72+
+ <record id="new_decimal_calendar_attending_ratio" model="ir.model.fields">
73+
+ <field name="compute"><![CDATA[for record in self:
74+
+ if len(record.attendee_ids) > 0 and record.x_studio_voting_key != False and record.x_studio_condominium != False :
75+
+ x_studio_attending_ratio = 0.0
76+
+ for attendee in record.attendee_ids:
77+
+ if attendee.x_studio_attending or attendee.x_studio_delegating: x_studio_attending_ratio += attendee.x_studio_ratio
78+
+ total_ratio = sum(
79+
+ x_studio_ratio.x_ratio for x_studio_ratio in record.x_studio_voting_key.x_studio_ratio_ids
80+
+ )
81+
+ if total_ratio > 0:
82+
+ record['x_studio_attending_ratio'] = x_studio_attending_ratio / total_ratio
83+
+ else:
84+
+ record['x_studio_attending_ratio'] = 1]]>
85+
+ </field>
86+
+ <field name="ttype">float</field>
87+
+ <field name="depends">attendee_ids,attendee_ids.x_studio_delegating, attendee_ids.x_studio_attending, attendee_ids.x_studio_ratio, x_studio_voting_key</field>
88+
+ <field name="field_description">Attending and Delegating Ratio</field>
89+
+ <field name="model_id" ref="calendar.model_calendar_event"/>
90+
+ <field name="name">x_studio_attending_ratio</field>
91+
+ <field name="readonly" eval="True"/>
92+
+ </record>
93+
+ <!-- <record id="new_decimal_calendar_attending_ratio_test" model="ir.model.fields">
94+
+ <field name="compute"><![CDATA[for record in self:
95+
+ if len(record.attendee_ids) > 0 and record.x_studio_voting_key != False and record.x_studio_condominium != False :
96+
+ x_studio_attending_ratio = 0.0
97+
+ for attendee in record.attendee_ids:
98+
+ if attendee.x_studio_attending or attendee.x_studio_delegating:
99+
+ x_studio_attending_ratio += attendee.x_studio_ratio
100+
+ record['x_studio_attending_ratio_copy'] = str(x_studio_attending_ratio)]]>
101+
+ </field>
102+
+ <field name="ttype">char</field>
103+
+ <field name="depends">attendee_ids, x_studio_voting_key</field>
104+
+ <field name="field_description">Attending and Delegating Ratio test</field>
105+
+ <field name="model_id" ref="calendar.model_calendar_event"/>
106+
+ <field name="name">x_studio_attending_ratio_copy</field>
107+
+ <field name="readonly" eval="True"/>
108+
+ </record> -->
109+
+</odoo>
110+
\ No newline at end of file
111+
diff --git a/condominium/data/res_config_settings.xml b/condominium/data/res_config_settings.xml
112+
index d34726524..739453022 100644
113+
--- a/condominium/data/res_config_settings.xml
114+
+++ b/condominium/data/res_config_settings.xml
115+
@@ -7,7 +7,9 @@
116+
<field name="portal_confirmation_sign" eval="1"/>
117+
<field name="module_account_payment" eval="1"/>
118+
<field name="module_hr_timesheet" eval="1"/>
119+
- <field name="group_project_recurring_tasks" eval="1"/>
120+
+
121+
+ <!-- change name in 19.0 -->
122+
+ <!-- <field name="group_project_recurring_tasks" eval="1"/> -->
123+
</record>
124+

125+
<function name="execute" model="res.config.settings">
126+
diff --git a/condominium/data/sale_subscription_pricing.xml b/condominium/data/sale_subscription_pricing.xml
127+
index 8f9170b00..e39a698db 100644
128+
--- a/condominium/data/sale_subscription_pricing.xml
129+
+++ b/condominium/data/sale_subscription_pricing.xml
130+
@@ -1,6 +1,6 @@
131+
<?xml version='1.0' encoding='UTF-8'?>
132+
<odoo noupdate="1">
133+
- <record id="sale_subscription_pricing_4" model="sale.subscription.pricing">
134+
+ <!-- <record id="sale_subscription_pricing_4" model="sale.subscription.pricing">
135+
<field name="product_template_id" ref="product_product_16_product_template"/>
136+
<field name="plan_id" ref="sale_subscription.subscription_plan_month"/>
137+
<field name="price">80.0</field>
138+
@@ -14,5 +14,5 @@
139+
<field name="product_template_id" ref="product_product_16_product_template"/>
140+
<field name="plan_id" ref="sale_subscription.subscription_plan_year"/>
141+
<field name="price">960.0</field>
142+
- </record>
143+
+ </record> -->
144+
</odoo>

0 commit comments

Comments
 (0)