From b17a746dd17d1f26d2a0fc4003ea130f33eaec70 Mon Sep 17 00:00:00 2001 From: emjay0921 Date: Tue, 10 Feb 2026 11:25:03 +0800 Subject: [PATCH 1/3] feat(spp_drims): promote to Beta with view improvements - Promote spp_drims development_status from Alpha to Beta - Replace inherited alert views with standalone views matching DRIMS style - Fix Request Justification field to span full width (col=2, colspan=2) - Fix Return Reason field to span full width (col=2, colspan=2) --- spp_drims/__manifest__.py | 2 +- spp_drims/views/alert_views.xml | 435 ++++++++++++---- spp_drims/views/request_views.xml | 797 +++++++++++++++++++----------- spp_drims/views/return_views.xml | 441 +++++++++++------ 4 files changed, 1127 insertions(+), 548 deletions(-) diff --git a/spp_drims/__manifest__.py b/spp_drims/__manifest__.py index 3687543..f2ed0fd 100644 --- a/spp_drims/__manifest__.py +++ b/spp_drims/__manifest__.py @@ -10,7 +10,7 @@ "author": "OpenSPP.org", "website": "https://github.com/OpenSPP/OpenSPP2", "license": "LGPL-3", - "development_status": "Alpha", + "development_status": "Beta", "maintainers": ["jeremi", "gonzalesedwin1123"], "depends": [ "base", diff --git a/spp_drims/views/alert_views.xml b/spp_drims/views/alert_views.xml index ceb61f5..06020af 100644 --- a/spp_drims/views/alert_views.xml +++ b/spp_drims/views/alert_views.xml @@ -1,126 +1,361 @@ - + - - - + spp.drims.alert.list spp.drims.alert - + - - - - - - - + + + + + + + + + + + + + + - + spp.drims.alert.form spp.drims.alert - + - - - - - - - - - - - - - - - - - - -
- + + +
- - + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + spp.drims.alert.search spp.drims.alert - + - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + - - - - - + + + + + + + + + - + Alerts spp.drims.alert @@ -142,8 +377,8 @@ Acknowledge Selected - - + + list,kanban code @@ -154,8 +389,8 @@ if records: Resolve Selected - - + + list,kanban code diff --git a/spp_drims/views/request_views.xml b/spp_drims/views/request_views.xml index 2562c46..82c5ff4 100644 --- a/spp_drims/views/request_views.xml +++ b/spp_drims/views/request_views.xml @@ -7,37 +7,63 @@ spp.drims.request.list spp.drims.request - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -52,177 +78,248 @@
-
-
- - - + + +

- +

- +

- - - - - + + + + + - - - - - - + + + + + + - - + + - + - - - + + + - - - - - - + + + + + + - - + + -
+
- +
Changes Requested

@@ -234,12 +331,17 @@

-
+
- +
-
Approved - Ready to Allocate
+
Approved - Ready to Allocate

This request has been approved. Items can now be allocated and dispatched.

@@ -250,45 +352,68 @@ - + - - - - - - - - - - + + + + + + + + + + - - + +
- + Timeline of approvals and reviews for this request.
- + - + - + @@ -303,81 +428,168 @@ - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + @@ -390,57 +602,77 @@ spp.drims.request.kanban spp.drims.request - - - - - - - - - - - - + + + + + + + + + + + +
- + - + URGENT
- - + +
- - + +
- - + +
- - + +
-
+
- - + + - items + items
@@ -458,15 +690,15 @@ spp.drims.request.line - - - - - - - - - + + + + + + + + + @@ -479,7 +711,7 @@ spp.drims.request - + @@ -490,10 +722,10 @@ spp.drims.request - - - - + + + + @@ -508,7 +740,7 @@ drims-requests spp.drims.request list,kanban,graph,pivot,form - +

No requests found @@ -525,7 +757,7 @@ my-drims-requests spp.drims.request list,kanban,form - + {'search_default_my_requests': 1}

@@ -540,7 +772,7 @@ pending-drims-requests spp.drims.request list,kanban,form - + {'search_default_pending': 1}

@@ -555,7 +787,7 @@ top-priority-requests spp.drims.request list,form - + [('approval_state', 'in', ['pending', 'approved'])] { 'search_default_pending': 1, @@ -572,5 +804,4 @@

- diff --git a/spp_drims/views/return_views.xml b/spp_drims/views/return_views.xml index 25075ca..55e181d 100644 --- a/spp_drims/views/return_views.xml +++ b/spp_drims/views/return_views.xml @@ -1,29 +1,34 @@ - + spp.drims.return.list spp.drims.return - - - - - - - - - - - + + + + + + + + + + + @@ -35,124 +40,185 @@
-
-
- - + +

- +

- - - - + + + + - - - + + + - - + + - - - - - - - - - - - + + + + + + + + + + + - - + + - +
@@ -165,48 +231,95 @@ - - - + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - + + - - - - + + + + @@ -218,23 +331,23 @@ spp.drims.return - - - - - - + + + + + + - - - + + +
- items + items - +
@@ -249,7 +362,7 @@ spp.drims.return - + @@ -260,11 +373,11 @@ spp.drims.return - - - - - + + + + + @@ -293,15 +406,15 @@ spp.drims.return.line - - - - - - - - - + + + + + + + + + From 031b30586103b36c3b65a96f2aff2d0653d0c60a Mon Sep 17 00:00:00 2001 From: emjay0921 Date: Tue, 10 Feb 2026 13:28:08 +0800 Subject: [PATCH 2/3] fix(spp_drims): fix 3 critical audit issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add missing data/approval_definitions.xml to manifest - Fix alert search filters: alert_type → alert_type_id.code - Add @api.depends("sla_due_datetime") to _compute_sla_hours_remaining --- spp_drims/__manifest__.py | 1 + spp_drims/models/request.py | 1 + spp_drims/views/alert_views.xml | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/spp_drims/__manifest__.py b/spp_drims/__manifest__.py index f2ed0fd..a66a113 100644 --- a/spp_drims/__manifest__.py +++ b/spp_drims/__manifest__.py @@ -43,6 +43,7 @@ "data/audit_rules.xml", "data/config_defaults.xml", "data/gis_report_templates.xml", + "data/approval_definitions.xml", # Reports (before views, as views may reference report actions) "report/waybill_template.xml", "views/dashboard_views.xml", diff --git a/spp_drims/models/request.py b/spp_drims/models/request.py index a82d443..1ed549b 100644 --- a/spp_drims/models/request.py +++ b/spp_drims/models/request.py @@ -348,6 +348,7 @@ def _compute_sla_status(self): rec.sla_due_datetime = False rec.sla_status = False + @api.depends("sla_due_datetime") def _compute_sla_hours_remaining(self): """Compute hours remaining until SLA breach.""" now = fields.Datetime.now() diff --git a/spp_drims/views/alert_views.xml b/spp_drims/views/alert_views.xml index 06020af..5e18c11 100644 --- a/spp_drims/views/alert_views.xml +++ b/spp_drims/views/alert_views.xml @@ -289,17 +289,17 @@ From 505b4bf8aa0fe306135175363857ad3758115be4 Mon Sep 17 00:00:00 2001 From: emjay0921 Date: Tue, 10 Feb 2026 13:33:29 +0800 Subject: [PATCH 3/3] fix(spp_drims): add required approval_type and group to definitions Missing approval_type and approval_group_id caused ParseError on install. --- spp_drims/data/approval_definitions.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/spp_drims/data/approval_definitions.xml b/spp_drims/data/approval_definitions.xml index 3ad8630..8da6a89 100644 --- a/spp_drims/data/approval_definitions.xml +++ b/spp_drims/data/approval_definitions.xml @@ -14,6 +14,10 @@ True 0 1 + group + + True + True @@ -23,6 +27,9 @@ True 1 10 + group + + True @@ -32,6 +39,10 @@ True 2 20 + group + + True + True @@ -41,5 +52,9 @@ True 3 30 + group + + True + True