fix(drims): DRIMS issues and improvements (#651)

spp_base_common/__manifest__.py

@@ -38,6 +38,7 @@
             "spp_base_common/static/src/xml/custom_list_create_template.xml",
             "spp_base_common/static/src/js/filterable_radio_field.js",
             "spp_base_common/static/src/xml/filterable_radio_field.xml",
+            "spp_base_common/static/src/js/integer_positive_required.js",
             "spp_base_common/static/src/xml/pager_hide_single.xml",
             "spp_base_common/static/src/scss/pager_hide_single.scss",
         ],

spp_base_common/static/src/js/integer_positive_required.js

@@ -0,0 +1,59 @@
+/** @odoo-module **/
+/*
+ * `integer_positive_required` field widget — a reusable Integer field that
+ * treats 0 as invalid when the field is required.
+ *
+ * Why: Odoo 19's `_checkValidity` (web/static/src/model/relational_model/
+ * record.js) explicitly skips numeric field types (`boolean`, `float`,
+ * `integer`, `monetary`) from the required-empty validation. That means
+ * a required Integer with value 0 is NEVER added to `_invalidFields`,
+ * the `o_field_invalid` class is NEVER applied, and the user gets no
+ * visual cue (asterisk on label / pink highlight on input) that the
+ * field is unfilled. The model-side validation still rejects 0 on save,
+ * but the form is silent until then.
+ *
+ * `fieldVisualFeedback` calls `field.isValid(record, fieldName, fieldInfo)`
+ * BEFORE falling back to `record.isFieldInvalid(...)`. So a widget can
+ * override `isValid` to plug its own check into the visual-feedback
+ * pipeline. We use that hook to mark the field invalid when value <= 0
+ * AND `required` evaluates true.
+ *
+ * Usage:
+ *   <field name="beneficiary_count"
+ *          widget="integer_positive_required"
+ *          required="..."/>
+ */
+
+import {evaluateBooleanExpr} from "@web/core/py_js/py";
+import {registry} from "@web/core/registry";
+import {integerField} from "@web/views/fields/integer/integer_field";
+
+export const integerPositiveRequiredField = {
+    ...integerField,
+    isEmpty: (record, fieldName) => {
+        const value = record.data[fieldName];
+        return value === false || value === 0;
+    },
+    isValid: (record, fieldName, fieldInfo) => {
+        const value = record.data[fieldName];
+        // Field is valid if value is a positive integer.
+        if (typeof value === "number" && value > 0) {
+            return true;
+        }
+        // 0, false (unset), or non-numeric — only valid when field is not
+        // required. Evaluate the required modifier against the record's
+        // eval context (it may be a dynamic expression like
+        // `drims_type == 'request_dispatch'`). `fieldInfo.required` is
+        // undefined for fields with no required modifier; guard against it
+        // so `evaluateBooleanExpr` is never handed `undefined` (which throws
+        // and crashes the form view).
+        const required = fieldInfo.required
+            ? evaluateBooleanExpr(fieldInfo.required, record.evalContextWithVirtualIds)
+            : false;
+        return !required;
+    },
+};
+
+registry
+    .category("fields")
+    .add("integer_positive_required", integerPositiveRequiredField);

spp_drims/__manifest__.py

@@ -17,6 +17,7 @@
         "mail",
         "stock",
         "spp_alerts",
+        "spp_base_common",
         "spp_security",
         "spp_vocabulary",
         "spp_area",
@@ -51,6 +52,7 @@
         "views/menu_structure.xml",
         # Wizards (before views, as views may reference wizard actions)
         "wizard/bulk_approve_wizard.xml",
+        "wizard/request_reject_wizard_views.xml",
         "wizard/report_4w_wizard_views.xml",
         "wizard/stock_adjustment_wizard_views.xml",
         "wizard/inter_warehouse_transfer_wizard_views.xml",
@@ -79,7 +81,15 @@
         # Menus with actions (loaded last, after all views define their actions)
         "views/menus.xml",
     ],
-    "assets": {},
+    "assets": {
+        "web.assets_backend": [
+            "spp_drims/static/src/js/hide_dispatch_form_create.js",
+            "spp_drims/static/src/js/inspection_list_renderer.js",
+            "spp_drims/static/src/js/qty_split_progress_field.js",
+            "spp_drims/static/src/xml/qty_split_progress_field.xml",
+            "spp_drims/static/src/css/inspection_wizard.css",
+        ],
+    },
     "application": True,
     "installable": True,
     "auto_install": False,

spp_drims/data/vocabulary_codes.xml

@@ -155,12 +155,20 @@
         <field name="display">Submitted</field>
         <field name="sequence">20</field>
     </record>
-    <record id="code_drims_request_approved" model="spp.vocabulary.code">
-        <field name="vocabulary_id" ref="vocab_drims_request_state" />
-        <field name="code">approved</field>
-        <field name="display">Approved</field>
-        <field name="sequence">30</field>
-    </record>
+    <!--
+        OP#969: relabel `approved` so the post-approval queue is obvious.
+        Wrapped in noupdate=0 so the renamed `display` propagates on every
+        module upgrade (the outer odoo element has noupdate=1, which would
+        otherwise skip the rewrite on already-installed databases).
+    -->
+    <data noupdate="0">
+        <record id="code_drims_request_approved" model="spp.vocabulary.code">
+            <field name="vocabulary_id" ref="vocab_drims_request_state" />
+            <field name="code">approved</field>
+            <field name="display">Ready for Allocation</field>
+            <field name="sequence">30</field>
+        </record>
+    </data>
     <record id="code_drims_request_rejected" model="spp.vocabulary.code">
         <field name="vocabulary_id" ref="vocab_drims_request_state" />
         <field name="code">rejected</field>
@@ -173,12 +181,15 @@
         <field name="display">Fulfilled</field>
         <field name="sequence">50</field>
     </record>
-    <record id="code_drims_request_allocated" model="spp.vocabulary.code">
-        <field name="vocabulary_id" ref="vocab_drims_request_state" />
-        <field name="code">allocated</field>
-        <field name="display">Allocated</field>
-        <field name="sequence">35</field>
-    </record>
+    <!-- OP#969: relabel `allocated` — see note on `approved` above. -->
+    <data noupdate="0">
+        <record id="code_drims_request_allocated" model="spp.vocabulary.code">
+            <field name="vocabulary_id" ref="vocab_drims_request_state" />
+            <field name="code">allocated</field>
+            <field name="display">Ready for Dispatch</field>
+            <field name="sequence">35</field>
+        </record>
+    </data>
     <record id="code_drims_request_dispatched" model="spp.vocabulary.code">
         <field name="vocabulary_id" ref="vocab_drims_request_state" />
         <field name="code">dispatched</field>