Skip to content

Commit 2f6c3ec

Browse files
Fixed error in DMS and Change Request integration
1 parent 192b04d commit 2f6c3ec

File tree

6 files changed

+34
-37
lines changed

6 files changed

+34
-37
lines changed

spp_change_request/data/dms.xml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,23 @@ Part of OpenSPP. See LICENSE file for full copyright and licensing details.
44
-->
55
<odoo noupdate="0">
66

7-
<!-- Parent Category -->
7+
<!-- Common Categories -->
8+
<record id="spp_dms_birth_certificate" model="spp.dms.category">
9+
<field name="name">Birth Certificate</field>
10+
</record>
11+
12+
<record id="spp_dms_applicant_uid_card" model="spp.dms.category">
13+
<field name="name">Applicant UID Card</field>
14+
</record>
15+
16+
<record id="spp_dms_custody_certificate" model="spp.dms.category">
17+
<field name="name">Custody Certificate</field>
18+
</record>
19+
20+
<record id="spp_dms_uid_card" model="spp.dms.category">
21+
<field name="name">UID Card</field>
22+
</record>
23+
824
<record id="pds_dms_extra_documents" model="spp.dms.category">
925
<field name="name">Extra Documents</field>
1026
</record>

spp_change_request/models/change_request.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -680,8 +680,7 @@ def create_request_detail(self):
680680
# Set the request_type_ref_id
681681
res_model = rec.request_type
682682
# Set the dms directory
683-
_logger.info("Change Request: DMS Directory Creation (%s)" % len(self.dms_directory_ids))
684-
self.env.ref(self.env[res_model].DMS_STORAGE)
683+
_logger.info("Change Request: DMS Directory Creation (%s)" % len(rec.dms_directory_ids))
685684
dmsval = {
686685
"is_root_directory": True,
687686
"name": rec.name,
@@ -935,8 +934,8 @@ def _compute_validation_group_id(self):
935934

936935
validation_stages = (
937936
rec.request_type_ref_id.validation_ids
938-
# if rec.request_type_ref_id and rec.request_type_ref_id.validation_ids
939-
# else self.env["validation.model"].browse()
937+
if rec.request_type_ref_id and rec.request_type_ref_id.validation_ids
938+
else self.env["spp.change.request.validation.sequence"].browse()
940939
) # Replace 'validation.model' with the actual model name
941940

942941
# Filter validation_stages based on validation_stage_ids, if any

spp_change_request/models/mixins/source_mixin.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@ class ChangeRequestAddChildren(models.Model):
3535
_description = "Change Request Data Source Mixin"
3636
_rec_name = "change_request_id"
3737

38-
REQUIRED_DOCUMENT_TYPE = [] # List of required document category `dms.category`
38+
REQUIRED_DOCUMENT_TYPE = [] # List of required document category `spp.dms.category`
3939
VALIDATION_FORM = None
40-
DMS_STORAGE = None
4140
AUTO_APPLY_CHANGES = True
4241

4342
registrant_id = fields.Many2one("res.partner", "Registrant", domain=[("is_registrant", "=", True)])
@@ -814,13 +813,13 @@ def action_attach_documents(self):
814813
"view_mode": "form",
815814
"view_id": form_id,
816815
"view_type": "form",
817-
"res_model": "dms.file",
816+
"res_model": "spp.dms.file",
818817
"target": "new",
819818
"context": dms_context,
820819
}
821820
if self.env.context.get("category_id"):
822821
category_id = self.env.context.get("category_id")
823-
category = self.env["dms.category"].search([("id", "=", category_id)])
822+
category = self.env["spp.dms.category"].search([("id", "=", category_id)])
824823
if category:
825824
dms_context.update(
826825
{
Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,9 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<odoo noupdate="0">
33

4-
<!-- Child Category Documents-->
4+
<!-- Category Documents-->
55
<record id="spp_dms_add_children" model="spp.dms.category">
66
<field name="name">Add Children Request Form</field>
77
</record>
88

9-
<record id="spp_dms_birth_certificate" model="spp.dms.category">
10-
<field name="name">Birth Certificate</field>
11-
</record>
12-
13-
<record id="spp_dms_applicant_uid_card" model="spp.dms.category">
14-
<field name="name">Applicant UID Card</field>
15-
</record>
16-
17-
<record id="spp_dms_custody_certificate" model="spp.dms.category">
18-
<field name="name">Custody Certificate</field>
19-
</record>
20-
21-
<record id="spp_dms_uid_card" model="spp.dms.category">
22-
<field name="name">UID Card</field>
23-
</record>
24-
259
</odoo>

spp_change_request_add_children_demo/models/change_request_add_children.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,14 @@ class ChangeRequestAddChildren(models.Model):
3636
_description = "Add Child/Member Change Request Type"
3737
_order = "id desc"
3838

39-
# Initialize DMS Storage
40-
DMS_STORAGE = "spp_change_request_add_children_demo.attachment_storage_add_children"
39+
# Initialize CR constants
4140
VALIDATION_FORM = "spp_change_request_add_children_demo.view_change_request_add_children_validation_form"
4241
REQUIRED_DOCUMENT_TYPE = [
43-
# "spp_change_request_add_children_demo.spp_dms_add_children",
44-
# "spp_change_request_add_children_demo.spp_dms_birth_certificate",
45-
# "spp_change_request_add_children_demo.spp_dms_applicant_spp_card",
46-
# "spp_change_request_add_children_demo.spp_dms_applicant_uid_card",
47-
# "spp_change_request_add_children_demo.spp_dms_custody_certificate",
42+
"spp_change_request_add_children_demo.spp_dms_add_children",
43+
# "spp_change_request.spp_dms_birth_certificate",
44+
# "spp_change_request.spp_dms_applicant_spp_card",
45+
# "spp_change_request.spp_dms_applicant_uid_card",
46+
# "spp_change_request.spp_dms_custody_certificate",
4847
]
4948

5049
# Mandatory initialize source and destination center areas

spp_change_request_add_children_demo/views/change_request_add_children_view.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,23 +224,23 @@
224224
</group>
225225
</group>
226226
</page>
227-
<page string="Attachments" invisible="1">
227+
<page string="Attachments">
228228
<!-- Attachment UI -->
229229
<header invisible="state != 'draft'">
230-
<!-- <button
230+
<button
231231
name="action_attach_documents"
232232
type="object"
233233
string="Request Form"
234234
class="btn-primary"
235235
context="{'category_id':%(spp_dms_add_children)d}"
236236
style="margin-left: 10px;"
237-
/> -->
237+
/>
238238
<button
239239
name="action_attach_documents"
240240
type="object"
241241
string="Birth Certificate"
242242
class="btn-primary"
243-
context="{'category_id':%(spp_dms_birth_certificate)d}"
243+
context="{'category_id':%(spp_change_request.spp_dms_birth_certificate)d}"
244244
style="margin-left: 10px;"
245245
/>
246246
<button

0 commit comments

Comments
 (0)