Merge pull request #374 from OpenSPP/307-develop-a-new-module-to-replace-the-oca-dms-in-the-cr-module

Add DMS module and integrate with change request

Author: gonzalesedwin1123

requirements.txt

@@ -1,4 +1,5 @@
 # generated from manifests external_dependencies
+PIL
 PyLD
 bravado_core
 faker

spp_change_request/__manifest__.py

@@ -23,6 +23,7 @@
         "spp_service_points",
         "spp_area",
         "spp_scan_id_document",
+        "spp_dms",
         # "dms_field",
     ],
     "data": [
@@ -56,6 +57,3 @@
     "installable": True,
     "auto_install": False,
 }
-
-# "spp_idqueue",
-# "spp_event_data",

spp_change_request/data/dms.xml

@@ -4,32 +4,24 @@ Part of OpenSPP. See LICENSE file for full copyright and licensing details.
 -->
 <odoo noupdate="0">
 
-    <record id="dms_access_group" model="dms.access.group">
-        <field name="name">Change Request DMS Group</field>
-        <field
-            name="group_ids"
-            eval="[
-            (4, ref('g2p_registry_base.group_g2p_admin')),
-            (4, ref('spp_change_request.group_spp_change_request_administrator')),
-            (4, ref('spp_change_request.group_spp_change_request_validator')),
-            (4, ref('spp_change_request.group_spp_change_request_agent')),
-            (4, ref('spp_change_request.group_spp_change_request_hq_validator')),
-            (4, ref('spp_change_request.group_spp_change_request_local_validator')),
-            (4, ref('spp_change_request.group_spp_change_request_applicator'))
-        ]"
-        />
-        <field name="perm_create" eval="True" />
-        <field name="perm_write" eval="True" />
-        <field name="perm_unlink" eval="True" />
+    <!-- Common Categories -->
+    <record id="spp_dms_birth_certificate" model="spp.dms.category">
+        <field name="name">Birth Certificate</field>
     </record>
-    <record id="dms_change_request_storage" model="dms.storage">
-        <field name="name">Change Requests storage</field>
-        <field name="save_type">file</field>
-        <field name="field_default_group_id" ref="spp_change_request.dms_access_group" />
+
+    <record id="spp_dms_applicant_uid_card" model="spp.dms.category">
+        <field name="name">Applicant UID Card</field>
+    </record>
+
+    <record id="spp_dms_custody_certificate" model="spp.dms.category">
+        <field name="name">Custody Certificate</field>
+    </record>
+
+    <record id="spp_dms_uid_card" model="spp.dms.category">
+        <field name="name">UID Card</field>
     </record>
 
-    <!-- Parent Category -->
-    <record id="pds_dms_extra_documents" model="dms.category">
+    <record id="pds_dms_extra_documents" model="spp.dms.category">
         <field name="name">Extra Documents</field>
     </record>
 

spp_change_request/models/__init__.py

@@ -4,5 +4,6 @@
 from . import change_request
 from . import change_request_stage
 from . import dms_file
+from . import dms_directory
 from . import registry
 from . import mixins

spp_change_request/models/change_request.py

@@ -130,6 +130,14 @@ class ChangeRequestBase(models.Model):
 
     current_user_assigned = fields.Boolean(compute="_compute_current_user_assigned", default=False)
 
+    # DMS Directories
+    dms_directory_ids = fields.One2many(
+        "spp.dms.directory",
+        "change_request_id",
+        string="DMS Directories",
+        auto_join=True,
+    )
+
     @api.model
     def create(self, vals):
         """
@@ -672,15 +680,10 @@ def create_request_detail(self):
                 # Set the request_type_ref_id
                 res_model = rec.request_type
                 # Set the dms directory
-                _logger.info("Change Request: DMS Directory Creation (%s)" % len(self.dms_directory_ids))
-                storage = self.env.ref(self.env[res_model].DMS_STORAGE)
+                _logger.info("Change Request: DMS Directory Creation (%s)" % len(rec.dms_directory_ids))
                 dmsval = {
-                    "storage_id": storage.id,
-                    # "res_id": rec.id,
-                    "res_model": res_model,
                     "is_root_directory": True,
                     "name": rec.name,
-                    "group_ids": [(4, storage.field_default_group_id.id)],
                 }
 
                 # Prepare CR type model data
@@ -695,7 +698,7 @@ def create_request_detail(self):
                 ref_id = self.env[res_model].create(cr_type_vals)
                 directory_id = ref_id.dms_directory_ids[0].id
 
-                self.env["dms.directory"].create(
+                self.env["spp.dms.directory"].create(
                     {
                         "name": "Applicant",
                         "parent_id": directory_id,
@@ -932,7 +935,7 @@ def _compute_validation_group_id(self):
                 validation_stages = (
                     rec.request_type_ref_id.validation_ids
                     if rec.request_type_ref_id and rec.request_type_ref_id.validation_ids
-                    else self.env["validation.model"].browse()
+                    else self.env["spp.change.request.validation.sequence"].browse()
                 )  # Replace 'validation.model' with the actual model name
 
                 # Filter validation_stages based on validation_stage_ids, if any

spp_change_request/models/dms_directory.py

@@ -0,0 +1,7 @@
+from odoo import fields, models
+
+
+class SPPDMSDirectoryCustom(models.Model):
+    _inherit = "spp.dms.directory"
+
+    change_request_id = fields.Many2one("spp.change.request", "Change Request")

spp_change_request/models/dms_file.py

@@ -1,12 +1,25 @@
-from odoo import _, models
+import logging
+
+from odoo import _, fields, models
+
+_logger = logging.getLogger(__name__)
 
 
 class SPPDMSFileCustom(models.Model):
-    _inherit = "dms.file"
+    _inherit = "spp.dms.file"
+
+    change_request_id = fields.Many2one("spp.change.request", "Change Request")
+
+    def create(self, vals):
+        _logger.info("DEBUG vals: %s", vals)
+        return super().create(vals)
 
     def action_save_and_close(self):
         return {"type": "ir.actions.act_window_close"}
 
+    def action_close(self):
+        return {"type": "ir.actions.act_window_close"}
+
     def action_attach_documents(self):
         for rec in self:
             form_id = self.env.ref("spp_change_request.view_dms_file_spp_custom_form").id
@@ -15,7 +28,7 @@ def action_attach_documents(self):
                 "view_mode": "form",
                 "view_id": form_id,
                 "view_type": "form",
-                "res_model": "dms.file",
+                "res_model": "spp.dms.file",
                 "target": "new",
                 "res_id": rec.id,
             }

spp_change_request/models/mixins/source_mixin.py

@@ -1,8 +1,12 @@
 # Part of OpenSPP. See LICENSE file for full copyright and licensing details.
 
+import logging
+
 from odoo import Command, _, api, fields, models
 from odoo.exceptions import UserError, ValidationError
 
+_logger = logging.getLogger(__name__)
+
 
 class ChangeRequestSourceMixin(models.AbstractModel):
     """
@@ -35,9 +39,8 @@ class ChangeRequestAddChildren(models.Model):
     _description = "Change Request Data Source Mixin"
     _rec_name = "change_request_id"
 
-    REQUIRED_DOCUMENT_TYPE = []  # List of required document category `dms.category`
+    REQUIRED_DOCUMENT_TYPE = []  # List of required document category `spp.dms.category`
     VALIDATION_FORM = None
-    DMS_STORAGE = None
     AUTO_APPLY_CHANGES = True
 
     registrant_id = fields.Many2one("res.partner", "Registrant", domain=[("is_registrant", "=", True)])
@@ -65,23 +68,15 @@ class ChangeRequestAddChildren(models.Model):
 
     # DMS Field
     dms_directory_ids = fields.One2many(
-        "dms.directory",
-        "res_id",
+        "spp.dms.directory",
+        "change_request_id",
         string="DMS Directories",
-        domain=lambda self: [
-            ("res_model", "=", self._name),
-            ("storage_id.save_type", "!=", "attachment"),
-        ],
         auto_join=True,
     )
     dms_file_ids = fields.One2many(
-        "dms.file",
-        "res_id",
+        "spp.dms.file",
+        "change_request_id",
         string="DMS Files",
-        domain=lambda self: [
-            ("directory_id.res_model", "=", self._name),
-            ("storage_id.save_type", "!=", "attachment"),
-        ],
         auto_join=True,
     )
 
@@ -822,28 +817,33 @@ def action_attach_documents(self):
                     "view_mode": "form",
                     "view_id": form_id,
                     "view_type": "form",
-                    "res_model": "dms.file",
+                    "res_model": "spp.dms.file",
                     "target": "new",
                     "context": dms_context,
                 }
+                category_name = "Other Documents"
                 if self.env.context.get("category_id"):
                     category_id = self.env.context.get("category_id")
-                    category = self.env["dms.category"].search([("id", "=", category_id)])
+                    category = self.env["spp.dms.category"].search([("id", "=", category_id)])
                     if category:
                         dms_context.update(
                             {
-                                "default_category_id": category_id,
+                                "default_category_id": category.id,
                                 "category_readonly": True,
                             }
                         )
-                        action.update(
-                            {
-                                "name": _("Upload Document: %s", category.name),
-                                "context": dms_context,
-                            }
-                        )
+                        category_name = category.name
                     else:
                         raise UserError(_("The required document category is not configured."))
+
+                dms_context.update({"default_change_request_id": rec.id})
+                _logger.debug("action_attach_documents dms_context: %s", dms_context)
+                action.update(
+                    {
+                        "name": _("Upload Document: %s", category_name),
+                        "context": dms_context,
+                    }
+                )
                 return action
             else:
                 raise UserError(_("There are no directories defined for this change request."))

spp_change_request/security/ir.model.access.csv

@@ -33,11 +33,9 @@ spp_change_request_g2p_phone_number_validator,G2P Phone Number CR Validator Acce
 spp_change_request_g2p_reg_id_validator,G2P Registrant ID CR Validator Access,g2p_registry_base.model_g2p_reg_id,spp_change_request.group_spp_change_request_validator,1,1,1,0
 spp_change_request_cancel_wizard_validator,Change Request Cancel Validator Access,spp_change_request.model_spp_change_request_cancel_wizard,spp_change_request.group_spp_change_request_validator,1,1,1,1
 
-spp_dms_storage_validator,SPP DMS Storage Validator Access,dms.model_dms_storage,spp_change_request.group_spp_change_request_validator,1,0,0,0
-spp_dms_directory_validator,SPP DMS Directory Validator Access,dms.model_dms_directory,spp_change_request.group_spp_change_request_validator,1,0,0,0
-spp_dms_category_validator,SPP DMS Category Validator Access,dms.model_dms_category,spp_change_request.group_spp_change_request_validator,1,0,0,0
-spp_dms_tag_validator,SPP DMS Tag Validator Access,dms.model_dms_tag,spp_change_request.group_spp_change_request_validator,1,0,0,0
-spp_dms_file_validator,SPP DMS File Validator Access,dms.model_dms_file,spp_change_request.group_spp_change_request_validator,1,0,0,0
+spp_dms_directory_validator,SPP DMS Directory Validator Access,spp_dms.model_spp_dms_directory,spp_change_request.group_spp_change_request_validator,1,0,0,0
+spp_dms_category_validator,SPP DMS Category Validator Access,spp_dms.model_spp_dms_category,spp_change_request.group_spp_change_request_validator,1,0,0,0
+spp_dms_file_validator,SPP DMS File Validator Access,spp_dms.model_spp_dms_file,spp_change_request.group_spp_change_request_validator,1,0,0,0
 
 spp_res_partner_validator,SPP Contacts Validator Access,base.model_res_partner,spp_change_request.group_spp_change_request_validator,1,1,1,0
 spp_ir_model_validator,SPP IR Model Validator Access,base.model_ir_model,spp_change_request.group_spp_change_request_validator,1,0,0,0
@@ -60,11 +58,9 @@ spp_change_request_g2p_phone_number_hq_validator,G2P Phone Number CR HQ Validato
 spp_change_request_g2p_reg_id_hq_validator,G2P Registrant ID CR HQ Validator Access,g2p_registry_base.model_g2p_reg_id,spp_change_request.group_spp_change_request_hq_validator,1,1,1,0
 spp_change_request_cancel_wizard_hq_validator,Change Request Cancel HQ Validator Access,spp_change_request.model_spp_change_request_cancel_wizard,spp_change_request.group_spp_change_request_hq_validator,1,1,1,1
 
-spp_dms_storage_hq_validator,SPP DMS Storage HQ Validator Access,dms.model_dms_storage,spp_change_request.group_spp_change_request_hq_validator,1,0,0,0
-spp_dms_directory_hq_validator,SPP DMS Directory HQ Validator Access,dms.model_dms_directory,spp_change_request.group_spp_change_request_hq_validator,1,0,0,0
-spp_dms_category_hq_validator,SPP DMS Category HQ Validator Access,dms.model_dms_category,spp_change_request.group_spp_change_request_hq_validator,1,0,0,0
-spp_dms_tag_hq_validator,SPP DMS Tag HQ Validator Access,dms.model_dms_tag,spp_change_request.group_spp_change_request_hq_validator,1,0,0,0
-spp_dms_file_hq_validator,SPP DMS File HQ Validator Access,dms.model_dms_file,spp_change_request.group_spp_change_request_hq_validator,1,0,0,0
+spp_dms_directory_hq_validator,SPP DMS Directory HQ Validator Access,spp_dms.model_spp_dms_directory,spp_change_request.group_spp_change_request_hq_validator,1,0,0,0
+spp_dms_category_hq_validator,SPP DMS Category HQ Validator Access,spp_dms.model_spp_dms_category,spp_change_request.group_spp_change_request_hq_validator,1,0,0,0
+spp_dms_file_hq_validator,SPP DMS File HQ Validator Access,spp_dms.model_spp_dms_file,spp_change_request.group_spp_change_request_hq_validator,1,0,0,0
 
 spp_res_partner_hq_validator,SPP Contacts HQ Validator Access,base.model_res_partner,spp_change_request.group_spp_change_request_hq_validator,1,1,1,0
 spp_ir_model_hq_validator,SPP IR Model HQ Validator Access,base.model_ir_model,spp_change_request.group_spp_change_request_hq_validator,1,0,0,0
@@ -87,11 +83,9 @@ spp_change_request_g2p_phone_number_administrator,G2P Phone Number CR Administra
 spp_change_request_g2p_reg_id_administrator,G2P Registrant ID CR Administrator Access,g2p_registry_base.model_g2p_reg_id,spp_change_request.group_spp_change_request_administrator,1,1,1,0
 spp_change_request_cancel_wizard_administrator,Change Request Cancel Administrator Access,spp_change_request.model_spp_change_request_cancel_wizard,spp_change_request.group_spp_change_request_administrator,1,1,1,1
 
-spp_dms_storage_administrator,SPP DMS Storage Administrator Access,dms.model_dms_storage,spp_change_request.group_spp_change_request_administrator,1,1,1,0
-spp_dms_directory_administrator,SPP DMS Directory Administrator Access,dms.model_dms_directory,spp_change_request.group_spp_change_request_administrator,1,1,1,0
-spp_dms_category_administrator,SPP DMS Category Administrator Access,dms.model_dms_category,spp_change_request.group_spp_change_request_administrator,1,1,1,0
-spp_dms_tag_administrator,SPP DMS Tag Administrator Access,dms.model_dms_tag,spp_change_request.group_spp_change_request_administrator,1,1,1,0
-spp_dms_file_administrator,SPP DMS File Administrator Access,dms.model_dms_file,spp_change_request.group_spp_change_request_administrator,1,1,1,1
+spp_dms_directory_administrator,SPP DMS Directory Administrator Access,spp_dms.model_spp_dms_directory,spp_change_request.group_spp_change_request_administrator,1,1,1,0
+spp_dms_category_administrator,SPP DMS Category Administrator Access,spp_dms.model_spp_dms_category,spp_change_request.group_spp_change_request_administrator,1,1,1,0
+spp_dms_file_administrator,SPP DMS File Administrator Access,spp_dms.model_spp_dms_file,spp_change_request.group_spp_change_request_administrator,1,1,1,1
 
 spp_res_partner_administrator,SPP Contacts Administrator Access,base.model_res_partner,spp_change_request.group_spp_change_request_administrator,1,1,1,0
 spp_ir_model_administrator,SPP IR Model Administrator Access,base.model_ir_model,spp_change_request.group_spp_change_request_administrator,1,0,0,0
@@ -114,11 +108,9 @@ spp_change_request_g2p_phone_number_applicator,G2P Phone Number CR Applicator Ac
 spp_change_request_g2p_reg_id_applicator,G2P Registrant ID CR Applicator Access,g2p_registry_base.model_g2p_reg_id,spp_change_request.group_spp_change_request_applicator,1,1,1,0
 spp_change_request_cancel_wizard_applicator,Change Request Cancel Applicator Access,spp_change_request.model_spp_change_request_cancel_wizard,spp_change_request.group_spp_change_request_applicator,1,1,1,1
 
-spp_dms_storage_applicator,SPP DMS Storage Applicator Access,dms.model_dms_storage,spp_change_request.group_spp_change_request_applicator,1,0,0,0
-spp_dms_directory_applicator,SPP DMS Directory Applicator Access,dms.model_dms_directory,spp_change_request.group_spp_change_request_applicator,1,0,0,0
-spp_dms_category_applicator,SPP DMS Category Applicator Access,dms.model_dms_category,spp_change_request.group_spp_change_request_applicator,1,0,0,0
-spp_dms_tag_applicator,SPP DMS Tag Applicator Access,dms.model_dms_tag,spp_change_request.group_spp_change_request_applicator,1,0,0,0
-spp_dms_file_applicator,SPP DMS File Applicator Access,dms.model_dms_file,spp_change_request.group_spp_change_request_applicator,1,0,0,0
+spp_dms_directory_applicator,SPP DMS Directory Applicator Access,spp_dms.model_spp_dms_directory,spp_change_request.group_spp_change_request_applicator,1,0,0,0
+spp_dms_category_applicator,SPP DMS Category Applicator Access,spp_dms.model_spp_dms_category,spp_change_request.group_spp_change_request_applicator,1,0,0,0
+spp_dms_file_applicator,SPP DMS File Applicator Access,spp_dms.model_spp_dms_file,spp_change_request.group_spp_change_request_applicator,1,0,0,0
 
 spp_res_partner_applicator,SPP Contacts Applicator Access,base.model_res_partner,spp_change_request.group_spp_change_request_applicator,1,1,1,0
 spp_ir_model_applicator,SPP IR Model Applicator Access,base.model_ir_model,spp_change_request.group_spp_change_request_applicator,1,0,0,0
@@ -138,11 +130,9 @@ spp_change_request_g2p_reg_rel_agent,G2P Registry Relationship CR Agent Access,g
 spp_change_request_g2p_phone_number_agent,G2P Phone Number CR Agent Access,g2p_registry_base.model_g2p_phone_number,spp_change_request.group_spp_change_request_agent,1,0,0,0
 spp_change_request_g2p_reg_id_agent,G2P Registrant ID CR Agent Access,g2p_registry_base.model_g2p_reg_id,spp_change_request.group_spp_change_request_agent,1,0,0,0
 
-spp_dms_storage_agent,SPP DMS Storage Agent Access,dms.model_dms_storage,spp_change_request.group_spp_change_request_agent,1,1,1,0
-spp_dms_directory_agent,SPP DMS Directory Agent Access,dms.model_dms_directory,spp_change_request.group_spp_change_request_agent,1,1,1,0
-spp_dms_category_agent,SPP DMS Category Agent Access,dms.model_dms_category,spp_change_request.group_spp_change_request_agent,1,0,0,0
-spp_dms_tag_agent,SPP DMS Tag Agent Access,dms.model_dms_tag,spp_change_request.group_spp_change_request_agent,1,1,1,0
-spp_dms_file_agent,SPP DMS File Agent Access,dms.model_dms_file,spp_change_request.group_spp_change_request_agent,1,1,1,1
+spp_dms_directory_agent,SPP DMS Directory Agent Access,spp_dms.model_spp_dms_directory,spp_change_request.group_spp_change_request_agent,1,1,1,0
+spp_dms_category_agent,SPP DMS Category Agent Access,spp_dms.model_spp_dms_category,spp_change_request.group_spp_change_request_agent,1,0,0,0
+spp_dms_file_agent,SPP DMS File Agent Access,spp_dms.model_spp_dms_file,spp_change_request.group_spp_change_request_agent,1,1,1,1
 
 spp_res_partner_agent,SPP Contacts Agent Access,base.model_res_partner,spp_change_request.group_spp_change_request_agent,1,0,0,0
 spp_ir_model_agent,SPP IR Model Agent Access,base.model_ir_model,spp_change_request.group_spp_change_request_agent,1,0,0,0

spp_change_request/static/src/scss/change_request.scss

@@ -16,9 +16,11 @@
 
 .o_container_right {
     margin-left: 10px !important;
+    margin-right: 10px !important;
 }
 
 .o_container_left {
+    background: rgba(255, 255, 255, 0) !important;
     margin-left: 10px !important;
     margin-right: 10px !important;
 }