Skip to content

Commit 56fba1c

Browse files
jeremijeremi
committed
fix: resolve OCA hook failures for module checks and README generation
Fix all oca-checks-odoo-module violations: - Add missing files to manifests: security/ir.model.access.csv in spp_base_setting, spp_branding_kit, spp_cr_types_advanced, spp_cr_types_base; views and data files in spp_area, spp_grm, spp_registry, spp_vocabulary, theme_openspp_muk - Fix duplicate XML record IDs: use <function> calls instead of duplicate records in spp_drims_sl approval config; remove duplicate currency_xxx in spp_vocabulary - Add context={'no_reset_password': True} to all demo res.users records in spp_drims_sl and spp_mis_demo_v2 - Set priority >= 99 on inherited views using position="replace" in spp_gis_report, spp_programs, spp_user_roles
1 parent 0df50c2 commit 56fba1c

20 files changed

Lines changed: 71 additions & 57 deletions

File tree

‎spp_area/__manifest__.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343
"views/group_views.xml",
4444
"views/role.xml",
4545
"views/user.xml",
46+
"views/area.xml",
47+
"views/area_import.xml",
4648
],
4749
"assets": {},
4850
"demo": [],

‎spp_base_setting/__manifest__.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
"spp_registry",
1717
],
1818
"data": [
19+
"security/ir.model.access.csv",
1920
"views/country_office_views.xml",
20-
# "views/res_users_views.xml",
21+
"views/res_users_views.xml",
2122
],
2223
"assets": {},
2324
"demo": [],

‎spp_branding_kit/__manifest__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"theme_openspp_muk", # Required for OpenSPP styling
3838
],
3939
"data": [
40+
"security/ir.model.access.csv",
4041
# Default configuration data (order matters)
4142
"data/res_company_data.xml",
4243
"data/ir_config_parameter.xml",

‎spp_cr_types_advanced/__manifest__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"spp_change_request_v2",
1313
],
1414
"data": [
15-
# Security for detail models (models are defined in spp_change_request_v2)
15+
"security/ir.model.access.csv",
1616
# CR type data definitions with editability flags
1717
# Note: Detail models, views, and strategies are provided by spp_change_request_v2
1818
"data/cr_types.xml",

‎spp_cr_types_base/__manifest__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"spp_change_request_v2",
1313
],
1414
"data": [
15-
# Security for detail models (models are defined in spp_change_request_v2)
15+
"security/ir.model.access.csv",
1616
# CR type data definitions with editability flags
1717
# Note: Detail models, views, and strategies are provided by spp_change_request_v2
1818
"data/cr_types.xml",

‎spp_drims_sl/__manifest__.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
"data/demo_users.xml",
3737
# Approval workflow configuration
3838
"data/approval_config.xml",
39+
# Second pass: enable multitier (must load after tiers are created)
40+
"data/approval_config_multitier.xml",
3941
],
4042
"application": False,
4143
"installable": True,

‎spp_drims_sl/data/approval_config.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,4 @@
131131
<field name="approval_user_ids" eval="[(4, ref('user_approver_national'))]" />
132132
<field name="sla_hours">48</field>
133133
</record>
134-
135-
<!-- ==================== ENABLE MULTI-TIER ==================== -->
136-
<!-- Second pass: enable multitier now that tiers exist -->
137-
138-
<record id="approval_def_medium" model="spp.approval.definition">
139-
<field name="use_multitier">True</field>
140-
</record>
141-
142-
<record id="approval_def_large" model="spp.approval.definition">
143-
<field name="use_multitier">True</field>
144-
</record>
145134
</odoo>

‎spp_drims_sl/data/approval_config_multitier.xml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<odoo>
3+
<!--
4+
Enable multi-tier on approval definitions.
5+
6+
Uses <function> instead of duplicate record IDs to avoid
7+
OCA xml-duplicate-record-id lint errors. This file loads after
8+
approval_config.xml so that the tier records already exist,
9+
satisfying the _check_multitier_config constraint.
10+
-->
11+
12+
<function
13+
model="spp.approval.definition"
14+
name="write"
15+
eval="[[ref('approval_def_medium')], {'use_multitier': True}]"
16+
/>
17+
18+
<function
19+
model="spp.approval.definition"
20+
name="write"
21+
eval="[[ref('approval_def_large')], {'use_multitier': True}]"
22+
/>
23+
</odoo>

‎spp_drims_sl/data/demo_users.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
<!-- ==================== SUPER ADMIN ==================== -->
3232

33-
<record id="user_admin_dmc" model="res.users">
33+
<record id="user_admin_dmc" model="res.users" context="{'no_reset_password': True}">
3434
<field name="name">DMC Administrator</field>
3535
<field name="login">admin.dmc@drims.gov.lk</field>
3636
<field name="password">demo</field>
@@ -50,7 +50,7 @@
5050
<!-- These users can receive donations, manage inventory, and process dispatches -->
5151
<!-- They do NOT have manager/admin access -->
5252

53-
<record id="user_wh_staff_colombo" model="res.users">
53+
<record id="user_wh_staff_colombo" model="res.users" context="{'no_reset_password': True}">
5454
<field name="name">Warehouse Staff - Colombo</field>
5555
<field name="login">staff.colombo@drims.gov.lk</field>
5656
<field name="password">demo</field>
@@ -64,7 +64,7 @@
6464
<field name="company_id" ref="base.main_company" />
6565
</record>
6666

67-
<record id="user_wh_staff_kandy" model="res.users">
67+
<record id="user_wh_staff_kandy" model="res.users" context="{'no_reset_password': True}">
6868
<field name="name">Warehouse Staff - Kandy</field>
6969
<field name="login">staff.kandy@drims.gov.lk</field>
7070
<field name="password">demo</field>
@@ -81,7 +81,7 @@
8181
<!-- ==================== WAREHOUSE MANAGERS ==================== -->
8282
<!-- These users have full admin access to manage warehouse operations -->
8383

84-
<record id="user_wh_colombo" model="res.users">
84+
<record id="user_wh_colombo" model="res.users" context="{'no_reset_password': True}">
8585
<field name="name">Warehouse Manager - Colombo</field>
8686
<field name="login">wh.colombo@drims.gov.lk</field>
8787
<field name="password">demo</field>
@@ -96,7 +96,7 @@
9696
<field name="company_id" ref="base.main_company" />
9797
</record>
9898

99-
<record id="user_wh_kandy" model="res.users">
99+
<record id="user_wh_kandy" model="res.users" context="{'no_reset_password': True}">
100100
<field name="name">Warehouse Manager - Kandy</field>
101101
<field name="login">wh.kandy@drims.gov.lk</field>
102102
<field name="password">demo</field>
@@ -113,7 +113,7 @@
113113

114114
<!-- ==================== APPROVERS ==================== -->
115115

116-
<record id="user_approver_national" model="res.users">
116+
<record id="user_approver_national" model="res.users" context="{'no_reset_password': True}">
117117
<field name="name">National Approver (DMC)</field>
118118
<field name="login">approver.national@drims.gov.lk</field>
119119
<field name="password">demo</field>
@@ -127,7 +127,7 @@
127127
<field name="company_id" ref="base.main_company" />
128128
</record>
129129

130-
<record id="user_approver_western" model="res.users">
130+
<record id="user_approver_western" model="res.users" context="{'no_reset_password': True}">
131131
<field name="name">Western Province Approver</field>
132132
<field name="login">approver.western@drims.gov.lk</field>
133133
<field name="password">demo</field>
@@ -141,7 +141,7 @@
141141
<field name="company_id" ref="base.main_company" />
142142
</record>
143143

144-
<record id="user_approver_central" model="res.users">
144+
<record id="user_approver_central" model="res.users" context="{'no_reset_password': True}">
145145
<field name="name">Central Province Approver</field>
146146
<field name="login">approver.central@drims.gov.lk</field>
147147
<field name="password">demo</field>
@@ -158,7 +158,7 @@
158158
<!-- ==================== FIELD OFFICERS ==================== -->
159159
<!-- Field officers can create requests and confirm deliveries in assigned areas -->
160160

161-
<record id="user_officer_colombo" model="res.users">
161+
<record id="user_officer_colombo" model="res.users" context="{'no_reset_password': True}">
162162
<field name="name">Field Officer - Colombo District</field>
163163
<field name="login">officer.colombo@drims.gov.lk</field>
164164
<field name="password">demo</field>
@@ -172,7 +172,7 @@
172172
<field name="company_id" ref="base.main_company" />
173173
</record>
174174

175-
<record id="user_officer_gampaha" model="res.users">
175+
<record id="user_officer_gampaha" model="res.users" context="{'no_reset_password': True}">
176176
<field name="name">Field Officer - Gampaha District</field>
177177
<field name="login">officer.gampaha@drims.gov.lk</field>
178178
<field name="password">demo</field>
@@ -186,7 +186,7 @@
186186
<field name="company_id" ref="base.main_company" />
187187
</record>
188188

189-
<record id="user_officer_kandy" model="res.users">
189+
<record id="user_officer_kandy" model="res.users" context="{'no_reset_password': True}">
190190
<field name="name">Field Officer - Kandy District</field>
191191
<field name="login">officer.kandy@drims.gov.lk</field>
192192
<field name="password">demo</field>
@@ -200,7 +200,7 @@
200200
<field name="company_id" ref="base.main_company" />
201201
</record>
202202

203-
<record id="user_officer_galle" model="res.users">
203+
<record id="user_officer_galle" model="res.users" context="{'no_reset_password': True}">
204204
<field name="name">Field Officer - Galle District</field>
205205
<field name="login">officer.galle@drims.gov.lk</field>
206206
<field name="password">demo</field>
@@ -216,7 +216,7 @@
216216

217217
<!-- ==================== VIEWERS / LEADERSHIP ==================== -->
218218

219-
<record id="user_viewer_secretary" model="res.users">
219+
<record id="user_viewer_secretary" model="res.users" context="{'no_reset_password': True}">
220220
<field name="name">Secretary - Ministry of Disaster Management</field>
221221
<field name="login">secretary@drims.gov.lk</field>
222222
<field name="password">demo</field>
@@ -230,7 +230,7 @@
230230
<field name="company_id" ref="base.main_company" />
231231
</record>
232232

233-
<record id="user_viewer_director" model="res.users">
233+
<record id="user_viewer_director" model="res.users" context="{'no_reset_password': True}">
234234
<field name="name">Director - DMC</field>
235235
<field name="login">director@drims.gov.lk</field>
236236
<field name="password">demo</field>

‎spp_gis_report/views/data_layer_ext_views.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Part of OpenSPP. See LICENSE file for full copyright and licensing details.
1010
<field name="name">spp.gis.data.layer.form.report.ext</field>
1111
<field name="model">spp.gis.data.layer</field>
1212
<field name="inherit_id" ref="spp_gis.spp_gis_data_layer_form" />
13+
<field name="priority">99</field>
1314
<field name="arch" type="xml">
1415
<!-- Add source type at the top -->
1516
<xpath expr="//sheet/group[1]" position="before">

0 commit comments

Comments
 (0)