diff --git a/spp_drims/__manifest__.py b/spp_drims/__manifest__.py
index 3687543..a66a113 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",
@@ -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/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 @@
         <field name="active">True</field>
         <field name="sla_days">0</field>
         <field name="sequence">1</field>
+        <field name="approval_type">group</field>
+        <field name="approval_group_id" ref="group_drims_manager"/>
+        <field name="is_emergency_bypass_allowed">True</field>
+        <field name="notify_on_submit">True</field>
     </record>
 
     <!-- Standard Approval (Small Value) -->
@@ -23,6 +27,9 @@
         <field name="active">True</field>
         <field name="sla_days">1</field>
         <field name="sequence">10</field>
+        <field name="approval_type">group</field>
+        <field name="approval_group_id" ref="group_drims_approver"/>
+        <field name="notify_on_submit">True</field>
     </record>
 
     <!-- Medium Value Approval -->
@@ -32,6 +39,10 @@
         <field name="active">True</field>
         <field name="sla_days">2</field>
         <field name="sequence">20</field>
+        <field name="approval_type">group</field>
+        <field name="approval_group_id" ref="group_drims_approver"/>
+        <field name="is_require_comment">True</field>
+        <field name="notify_on_submit">True</field>
     </record>
 
     <!-- Large Value Approval -->
@@ -41,5 +52,9 @@
         <field name="active">True</field>
         <field name="sla_days">3</field>
         <field name="sequence">30</field>
+        <field name="approval_type">group</field>
+        <field name="approval_group_id" ref="group_drims_manager"/>
+        <field name="is_require_comment">True</field>
+        <field name="notify_on_submit">True</field>
     </record>
 </odoo>
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 ceb61f5..5e18c11 100644
--- a/spp_drims/views/alert_views.xml
+++ b/spp_drims/views/alert_views.xml
@@ -1,126 +1,361 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <!--
-    DRIMS Alert Views - Inherit and extend base spp.alert views
-    These views add DRIMS-specific fields (incident, warehouse, product, request)
-    to the base alert views provided by spp_alerts module.
-    -->
-
-    <!-- Alert List View - Inherit base and add DRIMS fields -->
+    <!-- ══════════════════════════════════════════════════════════════════════════
+         DRIMS ALERT LIST VIEW
+         ══════════════════════════════════════════════════════════════════════════ -->
     <record id="spp_drims_alert_view_list" model="ir.ui.view">
         <field name="name">spp.drims.alert.list</field>
         <field name="model">spp.drims.alert</field>
-        <field name="inherit_id" ref="spp_alerts.spp_alert_view_list"/>
+        <field name="inherit_id" eval="False" />
         <field name="arch" type="xml">
-            <!-- Add DRIMS-specific fields after state -->
-            <field name="state" position="after">
-                <field name="incident_id" optional="show"/>
-                <field name="warehouse_id" optional="hide"/>
-                <field name="product_id" optional="hide"/>
-                <field name="request_id" optional="hide"/>
-            </field>
+            <list
+                decoration-danger="priority == 'critical'"
+                decoration-warning="priority == 'high'"
+                decoration-muted="state == 'resolved'"
+                sample="1"
+            >
+                <field name="reference" decoration-bf="1" />
+                <field name="title" />
+                <field name="alert_type_id" />
+                <field name="incident_id" />
+                <field
+                    name="priority"
+                    widget="badge"
+                    decoration-danger="priority == 'critical'"
+                    decoration-warning="priority == 'high'"
+                    decoration-info="priority == 'medium'"
+                />
+                <field
+                    name="state"
+                    widget="badge"
+                    decoration-danger="state == 'active'"
+                    decoration-warning="state == 'acknowledged'"
+                    decoration-success="state == 'resolved'"
+                />
+                <field name="warehouse_id" optional="show" />
+                <field name="product_id" optional="show" />
+                <field name="request_id" optional="hide" />
+                <field
+                    name="assigned_to_id"
+                    widget="many2one_avatar_user"
+                    optional="show"
+                />
+                <field
+                    name="create_date"
+                    string="Created"
+                    widget="datetime"
+                    optional="hide"
+                />
+                <field
+                    name="company_id"
+                    optional="hide"
+                    groups="base.group_multi_company"
+                />
+            </list>
         </field>
     </record>
 
-    <!-- Alert Form View - Inherit base and add DRIMS fields -->
+    <!-- ══════════════════════════════════════════════════════════════════════════
+         DRIMS ALERT FORM VIEW
+         ══════════════════════════════════════════════════════════════════════════ -->
     <record id="spp_drims_alert_view_form" model="ir.ui.view">
         <field name="name">spp.drims.alert.form</field>
         <field name="model">spp.drims.alert</field>
-        <field name="inherit_id" ref="spp_alerts.spp_alert_view_form"/>
+        <field name="inherit_id" eval="False" />
         <field name="arch" type="xml">
-            <!-- Add DRIMS-specific fields after priority in first group -->
-            <field name="priority" position="after">
-                <field name="incident_id"/>
-            </field>
-            <!-- Replace the second group to add DRIMS-specific fields -->
-            <xpath expr="//group[1]/group[2]" position="replace">
-                <group>
-                    <field name="warehouse_id"/>
-                    <field name="product_id"/>
-                    <field name="request_id"/>
-                    <field name="current_value"/>
-                    <field name="threshold_value"/>
-                    <field name="days_until"/>
-                </group>
-            </xpath>
-            <!-- Add quick action links (GAP-ALT-003) -->
-            <xpath expr="//sheet" position="inside">
-                <group string="Quick Actions" invisible="not incident_id and not warehouse_id and not product_id and not request_id">
-                    <div class="d-flex gap-2">
-                        <button name="action_view_incident"
-                                string="View Incident"
-                                type="object"
-                                class="btn btn-link"
-                                icon="fa-exclamation-triangle"
-                                invisible="not incident_id"/>
-                        <button name="action_view_warehouse"
-                                string="View Warehouse"
-                                type="object"
-                                class="btn btn-link"
-                                icon="fa-home"
-                                invisible="not warehouse_id"/>
-                        <button name="action_view_product"
-                                string="View Product"
-                                type="object"
-                                class="btn btn-link"
-                                icon="fa-cube"
-                                invisible="not product_id"/>
-                        <button name="action_view_request"
-                                string="View Request"
-                                type="object"
-                                class="btn btn-link"
-                                icon="fa-file-text"
-                                invisible="not request_id"/>
+            <form string="Alert">
+                <header>
+                    <button
+                        name="action_acknowledge"
+                        type="object"
+                        string="Acknowledge"
+                        class="btn-primary"
+                        invisible="state != 'active'"
+                        data-hotkey="a"
+                    />
+                    <button
+                        name="action_resolve"
+                        type="object"
+                        string="Resolve"
+                        class="btn-success"
+                        invisible="state == 'resolved'"
+                        data-hotkey="r"
+                    />
+                    <field
+                        name="state"
+                        widget="statusbar"
+                        statusbar_visible="active,acknowledged,resolved"
+                    />
+                </header>
+                <sheet>
+                    <!-- Button Box -->
+                    <div class="oe_button_box" name="button_box">
+                        <button
+                            name="action_view_incident"
+                            type="object"
+                            class="oe_stat_button"
+                            icon="fa-exclamation-triangle"
+                            invisible="not incident_id"
+                        >
+                            <field
+                                name="incident_id"
+                                widget="statinfo"
+                                string="Incident"
+                            />
+                        </button>
+                        <button
+                            name="action_view_warehouse"
+                            type="object"
+                            class="oe_stat_button"
+                            icon="fa-home"
+                            invisible="not warehouse_id"
+                        >
+                            <field
+                                name="warehouse_id"
+                                widget="statinfo"
+                                string="Warehouse"
+                            />
+                        </button>
+                        <button
+                            name="action_view_product"
+                            type="object"
+                            class="oe_stat_button"
+                            icon="fa-cube"
+                            invisible="not product_id"
+                        >
+                            <field
+                                name="product_id"
+                                widget="statinfo"
+                                string="Product"
+                            />
+                        </button>
+                        <button
+                            name="action_view_request"
+                            type="object"
+                            class="oe_stat_button"
+                            icon="fa-file-text"
+                            invisible="not request_id"
+                        >
+                            <field
+                                name="request_id"
+                                widget="statinfo"
+                                string="Request"
+                            />
+                        </button>
                     </div>
-                </group>
-            </xpath>
+
+                    <!-- Title -->
+                    <div class="oe_title">
+                        <label for="reference" />
+                        <h1>
+                            <field name="reference" readonly="1" />
+                        </h1>
+                        <h2>
+                            <field name="title" placeholder="Alert Title" />
+                        </h2>
+                    </div>
+
+                    <!-- Main Info Groups (Two Column Layout) -->
+                    <group>
+                        <group string="Alert Details">
+                            <field name="alert_type_id" options="{'no_create': True}" />
+                            <field name="priority" />
+                            <field name="incident_id" options="{'no_create': True}" />
+                            <field name="assigned_to_id" />
+                            <field
+                                name="company_id"
+                                groups="base.group_multi_company"
+                            />
+                        </group>
+                        <group string="Monitoring">
+                            <field name="warehouse_id" options="{'no_create': True}" />
+                            <field name="product_id" options="{'no_create': True}" />
+                            <field name="request_id" options="{'no_create': True}" />
+                            <field name="current_value" readonly="1" />
+                            <field name="threshold_value" readonly="1" />
+                            <field name="days_until" readonly="1" />
+                        </group>
+                    </group>
+
+                    <!-- Notebook with Tabs -->
+                    <notebook>
+                        <page string="Details" name="details">
+                            <field
+                                name="description"
+                                placeholder="Description of the alert condition..."
+                            />
+                        </page>
+                        <page
+                            string="Resolution"
+                            name="resolution"
+                            invisible="state == 'active'"
+                        >
+                            <group>
+                                <group>
+                                    <field name="resolved_by_id" readonly="1" />
+                                    <field name="resolved_at" readonly="1" />
+                                </group>
+                            </group>
+                            <separator string="Resolution Notes" />
+                            <field
+                                name="resolution_notes"
+                                placeholder="Notes about how this alert was resolved..."
+                            />
+                        </page>
+                    </notebook>
+                </sheet>
+                <chatter />
+            </form>
         </field>
     </record>
 
-    <!-- Alert Search View - Inherit base and add DRIMS-specific filters -->
+    <!-- ══════════════════════════════════════════════════════════════════════════
+         DRIMS ALERT SEARCH VIEW
+         ══════════════════════════════════════════════════════════════════════════ -->
     <record id="spp_drims_alert_view_search" model="ir.ui.view">
         <field name="name">spp.drims.alert.search</field>
         <field name="model">spp.drims.alert</field>
-        <field name="inherit_id" ref="spp_alerts.spp_alert_view_search"/>
+        <field name="inherit_id" eval="False" />
         <field name="arch" type="xml">
-            <!-- Add incident to searchpanel -->
-            <searchpanel position="inside">
-                <field name="incident_id" icon="fa-exclamation-triangle" enable_counters="1"/>
-            </searchpanel>
+            <search string="Search Alerts">
+                <!-- Searchpanel for quick filtering -->
+                <searchpanel>
+                    <field
+                        name="incident_id"
+                        icon="fa-exclamation-triangle"
+                        enable_counters="1"
+                    />
+                    <field
+                        name="state"
+                        select="multi"
+                        icon="fa-tasks"
+                        enable_counters="1"
+                    />
+                    <field
+                        name="priority"
+                        select="multi"
+                        icon="fa-flag"
+                        enable_counters="1"
+                    />
+                    <field
+                        name="alert_type_id"
+                        select="multi"
+                        icon="fa-bell"
+                        enable_counters="1"
+                    />
+                </searchpanel>
+
+                <field name="reference" />
+                <field name="title" />
+                <field name="alert_type_id" />
+                <field name="incident_id" />
+                <field name="warehouse_id" />
+                <field name="product_id" />
+                <field name="request_id" />
+                <separator />
+
+                <!-- State Filters -->
+                <filter
+                    name="filter_active"
+                    string="Active"
+                    domain="[('state', '=', 'active')]"
+                />
+                <filter
+                    name="filter_acknowledged"
+                    string="Acknowledged"
+                    domain="[('state', '=', 'acknowledged')]"
+                />
+                <filter
+                    name="filter_resolved"
+                    string="Resolved"
+                    domain="[('state', '=', 'resolved')]"
+                />
+                <separator />
 
-            <!-- Add DRIMS-specific search fields -->
-            <field name="title" position="after">
-                <field name="incident_id"/>
-                <field name="warehouse_id"/>
-                <field name="product_id"/>
-                <field name="request_id"/>
-            </field>
+                <!-- Priority Filters -->
+                <filter
+                    name="filter_critical"
+                    string="Critical"
+                    domain="[('priority', '=', 'critical')]"
+                />
+                <filter
+                    name="filter_high"
+                    string="High Priority"
+                    domain="[('priority', '=', 'high')]"
+                />
+                <separator />
+
+                <!-- Type Filters -->
+                <filter
+                    name="filter_low_stock"
+                    string="Low Stock"
+                    domain="[('alert_type_id.code', '=', 'low_stock')]"
+                />
+                <filter
+                    name="filter_expiry"
+                    string="Expiry"
+                    domain="[('alert_type_id.code', '=', 'expiry')]"
+                />
+                <filter
+                    name="filter_sla"
+                    string="SLA"
+                    domain="[('alert_type_id.code', 'in', ['sla_warning', 'sla_breach'])]"
+                />
+                <separator />
 
-            <!-- Add DRIMS-specific filters for alert types -->
-            <filter name="filter_high" position="after">
-                <separator/>
-                <filter name="filter_low_stock" string="Low Stock" domain="[('alert_type', '=', 'low_stock')]"/>
-                <filter name="filter_expiry" string="Expiry" domain="[('alert_type', '=', 'expiry')]"/>
-                <filter name="filter_sla" string="SLA" domain="[('alert_type', 'in', ['sla_warning', 'sla_breach'])]"/>
-                <separator/>
                 <!-- Date Presets -->
-                <filter name="last_24h" string="Last 24 Hours"
-                        domain="[('create_date', '&gt;=', (context_today() - datetime.timedelta(days=1)).strftime('%Y-%m-%d'))]"/>
-                <filter name="last_7d" string="Last 7 Days"
-                        domain="[('create_date', '&gt;=', (context_today() - datetime.timedelta(days=7)).strftime('%Y-%m-%d'))]"/>
-                <filter name="last_30d" string="Last 30 Days"
-                        domain="[('create_date', '&gt;=', (context_today() - datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]"/>
-            </filter>
+                <filter
+                    name="last_24h"
+                    string="Last 24 Hours"
+                    domain="[('create_date', '&gt;=', (context_today() - datetime.timedelta(days=1)).strftime('%Y-%m-%d'))]"
+                />
+                <filter
+                    name="last_7d"
+                    string="Last 7 Days"
+                    domain="[('create_date', '&gt;=', (context_today() - datetime.timedelta(days=7)).strftime('%Y-%m-%d'))]"
+                />
+                <filter
+                    name="last_30d"
+                    string="Last 30 Days"
+                    domain="[('create_date', '&gt;=', (context_today() - datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]"
+                />
+                <separator />
 
-            <!-- Add DRIMS-specific groupby options -->
-            <filter name="groupby_type" position="after">
-                <filter name="groupby_incident" string="Incident" context="{'group_by': 'incident_id'}"/>
-                <filter name="groupby_warehouse" string="Warehouse" context="{'group_by': 'warehouse_id'}"/>
-            </filter>
+                <!-- Group By -->
+                <group>
+                    <filter
+                        name="groupby_state"
+                        string="State"
+                        context="{'group_by': 'state'}"
+                    />
+                    <filter
+                        name="groupby_priority"
+                        string="Priority"
+                        context="{'group_by': 'priority'}"
+                    />
+                    <filter
+                        name="groupby_type"
+                        string="Type"
+                        context="{'group_by': 'alert_type_id'}"
+                    />
+                    <filter
+                        name="groupby_incident"
+                        string="Incident"
+                        context="{'group_by': 'incident_id'}"
+                    />
+                    <filter
+                        name="groupby_warehouse"
+                        string="Warehouse"
+                        context="{'group_by': 'warehouse_id'}"
+                    />
+                </group>
+            </search>
         </field>
     </record>
 
-    <!-- Alert Action -->
+    <!-- ══════════════════════════════════════════════════════════════════════════
+         DRIMS ALERT ACTION
+         ══════════════════════════════════════════════════════════════════════════ -->
     <record id="action_spp_drims_alert" model="ir.actions.act_window">
         <field name="name">Alerts</field>
         <field name="res_model">spp.drims.alert</field>
@@ -142,8 +377,8 @@
     <!-- Bulk Actions -->
     <record id="action_bulk_acknowledge_alerts" model="ir.actions.server">
         <field name="name">Acknowledge Selected</field>
-        <field name="model_id" ref="model_spp_drims_alert"/>
-        <field name="binding_model_id" ref="model_spp_drims_alert"/>
+        <field name="model_id" ref="model_spp_drims_alert" />
+        <field name="binding_model_id" ref="model_spp_drims_alert" />
         <field name="binding_view_types">list,kanban</field>
         <field name="state">code</field>
         <field name="code">
@@ -154,8 +389,8 @@ if records:
 
     <record id="action_bulk_resolve_alerts" model="ir.actions.server">
         <field name="name">Resolve Selected</field>
-        <field name="model_id" ref="model_spp_drims_alert"/>
-        <field name="binding_model_id" ref="model_spp_drims_alert"/>
+        <field name="model_id" ref="model_spp_drims_alert" />
+        <field name="binding_model_id" ref="model_spp_drims_alert" />
         <field name="binding_view_types">list,kanban</field>
         <field name="state">code</field>
         <field name="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 @@
         <field name="name">spp.drims.request.list</field>
         <field name="model">spp.drims.request</field>
         <field name="arch" type="xml">
-            <list decoration-danger="is_life_threatening"
-                  decoration-warning="priority_id and priority_id.code == 'high'"
-                  decoration-muted="state == 'rejected'"
-                  decoration-success="state == 'approved'"
-                  sample="1">
-                <field name="reference" decoration-bf="1"/>
-                <field name="incident_id"/>
-                <field name="cluster_id" optional="hide"/>
-                <field name="destination_area_id"/>
-                <field name="priority_id" widget="badge"
-                       decoration-danger="priority_id.code == 'critical'"
-                       decoration-warning="priority_id.code == 'high'"
-                       decoration-info="priority_id.code == 'medium'"/>
-                <field name="is_life_threatening" widget="boolean_toggle" optional="hide"/>
-                <field name="date_needed"/>
-                <field name="date_requested" optional="hide"/>
-                <field name="affected_population" optional="hide"/>
-                <field name="line_count" string="Items" optional="hide"/>
-                <field name="total_value" sum="Total Value" optional="hide"/>
-                <field name="state" invisible="1"/>
-                <field name="approval_state" widget="badge"
-                       decoration-info="approval_state == 'draft'"
-                       decoration-warning="approval_state in ('pending', 'revision')"
-                       decoration-success="approval_state == 'approved'"
-                       decoration-danger="approval_state == 'rejected'"/>
-                <field name="sla_status" widget="badge" optional="show"
-                       decoration-success="sla_status == 'on_time'"
-                       decoration-warning="sla_status == 'warning'"
-                       decoration-danger="sla_status == 'breached'"/>
-                <field name="create_uid" string="Requested By" widget="many2one_avatar_user" optional="hide"/>
-                <field name="create_date" string="Created" widget="datetime" optional="hide"/>
+            <list
+                decoration-danger="is_life_threatening"
+                decoration-warning="priority_id and priority_id.code == 'high'"
+                decoration-muted="state == 'rejected'"
+                decoration-success="state == 'approved'"
+                sample="1"
+            >
+                <field name="reference" decoration-bf="1" />
+                <field name="incident_id" />
+                <field name="cluster_id" optional="hide" />
+                <field name="destination_area_id" />
+                <field
+                    name="priority_id"
+                    widget="badge"
+                    decoration-danger="priority_id.code == 'critical'"
+                    decoration-warning="priority_id.code == 'high'"
+                    decoration-info="priority_id.code == 'medium'"
+                />
+                <field
+                    name="is_life_threatening"
+                    widget="boolean_toggle"
+                    optional="hide"
+                />
+                <field name="date_needed" />
+                <field name="date_requested" optional="hide" />
+                <field name="affected_population" optional="hide" />
+                <field name="line_count" string="Items" optional="hide" />
+                <field name="total_value" sum="Total Value" optional="hide" />
+                <field name="state" invisible="1" />
+                <field
+                    name="approval_state"
+                    widget="badge"
+                    decoration-info="approval_state == 'draft'"
+                    decoration-warning="approval_state in ('pending', 'revision')"
+                    decoration-success="approval_state == 'approved'"
+                    decoration-danger="approval_state == 'rejected'"
+                />
+                <field
+                    name="sla_status"
+                    widget="badge"
+                    optional="show"
+                    decoration-success="sla_status == 'on_time'"
+                    decoration-warning="sla_status == 'warning'"
+                    decoration-danger="sla_status == 'breached'"
+                />
+                <field
+                    name="create_uid"
+                    string="Requested By"
+                    widget="many2one_avatar_user"
+                    optional="hide"
+                />
+                <field
+                    name="create_date"
+                    string="Created"
+                    widget="datetime"
+                    optional="hide"
+                />
             </list>
         </field>
     </record>
@@ -52,177 +78,248 @@
             <form>
                 <header>
                     <!-- Draft Actions -->
-                    <button name="action_submit"
-                            string="Submit for Approval"
-                            type="object"
-                            class="btn-primary"
-                            invisible="approval_state != 'draft'"
-                            data-hotkey="s"/>
+                    <button
+                        name="action_submit"
+                        string="Submit for Approval"
+                        type="object"
+                        class="btn-primary"
+                        invisible="approval_state != 'draft'"
+                        data-hotkey="s"
+                    />
 
                     <!-- Pending Actions (Approver) -->
-                    <button name="action_approve"
-                            string="Approve"
-                            type="object"
-                            class="btn-success"
-                            invisible="approval_state != 'pending'"
-                            groups="spp_drims.group_drims_approver"
-                            confirm="Approve this request? Items will be ready for allocation."
-                            data-hotkey="a"/>
-                    <button name="action_request_revision"
-                            string="Request Changes"
-                            type="object"
-                            class="btn-secondary"
-                            invisible="approval_state != 'pending'"
-                            groups="spp_drims.group_drims_approver"/>
-                    <button name="action_reject"
-                            string="Reject"
-                            type="object"
-                            class="btn-outline-danger"
-                            invisible="approval_state != 'pending'"
-                            groups="spp_drims.group_drims_approver"
-                            confirm="Reject this request? This action cannot be undone."/>
+                    <button
+                        name="action_approve"
+                        string="Approve"
+                        type="object"
+                        class="btn-success"
+                        invisible="approval_state != 'pending'"
+                        groups="spp_drims.group_drims_approver"
+                        confirm="Approve this request? Items will be ready for allocation."
+                        data-hotkey="a"
+                    />
+                    <button
+                        name="action_request_revision"
+                        string="Request Changes"
+                        type="object"
+                        class="btn-secondary"
+                        invisible="approval_state != 'pending'"
+                        groups="spp_drims.group_drims_approver"
+                    />
+                    <button
+                        name="action_reject"
+                        string="Reject"
+                        type="object"
+                        class="btn-outline-danger"
+                        invisible="approval_state != 'pending'"
+                        groups="spp_drims.group_drims_approver"
+                        confirm="Reject this request? This action cannot be undone."
+                    />
 
                     <!-- Revision Actions -->
-                    <button name="action_submit"
-                            string="Resubmit for Approval"
-                            type="object"
-                            class="btn-primary"
-                            invisible="approval_state != 'revision'"/>
+                    <button
+                        name="action_submit"
+                        string="Resubmit for Approval"
+                        type="object"
+                        class="btn-primary"
+                        invisible="approval_state != 'revision'"
+                    />
 
                     <!-- Reset to Draft (for rejected) -->
-                    <button name="action_reset_to_draft"
-                            string="Reset to Draft"
-                            type="object"
-                            class="btn-secondary"
-                            invisible="approval_state != 'rejected'"
-                            confirm="This will clear review history and return to draft. Continue?"/>
+                    <button
+                        name="action_reset_to_draft"
+                        string="Reset to Draft"
+                        type="object"
+                        class="btn-secondary"
+                        invisible="approval_state != 'rejected'"
+                        confirm="This will clear review history and return to draft. Continue?"
+                    />
 
                     <!-- Fulfillment Actions (GAP-REQ-002, GAP-REQ-003, GAP-DIS-001) -->
-                    <button name="action_open_allocation_wizard"
-                            string="Allocate Stock"
-                            type="object"
-                            class="btn-primary"
-                            invisible="approval_state != 'approved' or state == 'allocated'"
-                            data-hotkey="l"/>
-                    <button name="action_create_dispatch"
-                            string="Create Dispatch"
-                            type="object"
-                            class="btn-primary"
-                            invisible="state != 'allocated'"
-                            data-hotkey="d"/>
-
-                    <field name="approval_state" widget="statusbar"
-                           statusbar_visible="draft,pending,approved"/>
+                    <button
+                        name="action_open_allocation_wizard"
+                        string="Allocate Stock"
+                        type="object"
+                        class="btn-primary"
+                        invisible="approval_state != 'approved' or state == 'allocated'"
+                        data-hotkey="l"
+                    />
+                    <button
+                        name="action_create_dispatch"
+                        string="Create Dispatch"
+                        type="object"
+                        class="btn-primary"
+                        invisible="state != 'allocated'"
+                        data-hotkey="d"
+                    />
+
+                    <field
+                        name="approval_state"
+                        widget="statusbar"
+                        statusbar_visible="draft,pending,approved"
+                    />
                 </header>
 
                 <sheet>
                     <!-- Button Box -->
                     <div class="oe_button_box" name="button_box">
-                        <button name="action_view_pickings"
-                                type="object"
-                                class="oe_stat_button"
-                                icon="fa-truck"
-                                invisible="picking_count == 0">
-                            <field name="picking_count" widget="statinfo" string="Dispatches"/>
+                        <button
+                            name="action_view_pickings"
+                            type="object"
+                            class="oe_stat_button"
+                            icon="fa-truck"
+                            invisible="picking_count == 0"
+                        >
+                            <field
+                                name="picking_count"
+                                widget="statinfo"
+                                string="Dispatches"
+                            />
                         </button>
                     </div>
 
                     <!-- Ribbons for terminal states -->
-                    <widget name="web_ribbon" title="Approved" bg_color="text-bg-success"
-                            invisible="approval_state != 'approved'"/>
-                    <widget name="web_ribbon" title="Rejected" bg_color="text-bg-danger"
-                            invisible="approval_state != 'rejected'"/>
-                    <widget name="web_ribbon" title="LIFE-THREATENING" bg_color="text-bg-danger"
-                            invisible="not is_life_threatening"/>
+                    <widget
+                        name="web_ribbon"
+                        title="Approved"
+                        bg_color="text-bg-success"
+                        invisible="approval_state != 'approved'"
+                    />
+                    <widget
+                        name="web_ribbon"
+                        title="Rejected"
+                        bg_color="text-bg-danger"
+                        invisible="approval_state != 'rejected'"
+                    />
+                    <widget
+                        name="web_ribbon"
+                        title="LIFE-THREATENING"
+                        bg_color="text-bg-danger"
+                        invisible="not is_life_threatening"
+                    />
 
                     <!-- Title -->
                     <div class="oe_title">
                         <h1>
-                            <field name="reference" readonly="1"/>
+                            <field name="reference" readonly="1" />
                         </h1>
                         <h2>
-                            <field name="name" invisible="1"/>
+                            <field name="name" invisible="1" />
                         </h2>
                     </div>
 
                     <!-- Main Info Groups (Two Column Layout) -->
                     <group>
                         <group string="Request Details">
-                            <field name="incident_id"
-                                   readonly="approval_state not in ('draft', 'revision')"
-                                   options="{'no_create': True}"/>
-                            <field name="cluster_id"
-                                   readonly="approval_state not in ('draft', 'revision')"
-                                   options="{'no_create': True}"/>
-                            <field name="destination_area_id"
-                                   readonly="approval_state not in ('draft', 'revision')"
-                                   options="{'no_create': True}"/>
-                            <field name="service_point_id"
-                                   readonly="approval_state not in ('draft', 'revision')"
-                                   options="{'no_create': True}"/>
-                            <field name="affected_population"
-                                   readonly="approval_state not in ('draft', 'revision')"/>
+                            <field
+                                name="incident_id"
+                                readonly="approval_state not in ('draft', 'revision')"
+                                options="{'no_create': True}"
+                            />
+                            <field
+                                name="cluster_id"
+                                readonly="approval_state not in ('draft', 'revision')"
+                                options="{'no_create': True}"
+                            />
+                            <field
+                                name="destination_area_id"
+                                readonly="approval_state not in ('draft', 'revision')"
+                                options="{'no_create': True}"
+                            />
+                            <field
+                                name="service_point_id"
+                                readonly="approval_state not in ('draft', 'revision')"
+                                options="{'no_create': True}"
+                            />
+                            <field
+                                name="affected_population"
+                                readonly="approval_state not in ('draft', 'revision')"
+                            />
                         </group>
                         <group string="Priority and Dates">
-                            <field name="priority_id"
-                                   readonly="approval_state not in ('draft', 'revision')"
-                                   widget="badge"
-                                   decoration-danger="priority_id.code == 'critical'"
-                                   decoration-warning="priority_id.code == 'high'"
-                                   decoration-info="priority_id.code == 'medium'"/>
-                            <field name="is_life_threatening"
-                                   readonly="approval_state not in ('draft', 'revision')"
-                                   widget="boolean_toggle"/>
-                            <field name="date_requested" readonly="1"/>
-                            <field name="date_needed"
-                                   readonly="approval_state not in ('draft', 'revision')"/>
-                            <field name="state_id" invisible="1"/>
-                            <field name="state" invisible="1"/>
+                            <field
+                                name="priority_id"
+                                readonly="approval_state not in ('draft', 'revision')"
+                                widget="badge"
+                                decoration-danger="priority_id.code == 'critical'"
+                                decoration-warning="priority_id.code == 'high'"
+                                decoration-info="priority_id.code == 'medium'"
+                            />
+                            <field
+                                name="is_life_threatening"
+                                readonly="approval_state not in ('draft', 'revision')"
+                                widget="boolean_toggle"
+                            />
+                            <field name="date_requested" readonly="1" />
+                            <field
+                                name="date_needed"
+                                readonly="approval_state not in ('draft', 'revision')"
+                            />
+                            <field name="state_id" invisible="1" />
+                            <field name="state" invisible="1" />
                         </group>
                     </group>
 
                     <!-- Contact Info -->
                     <group string="Contact Information">
                         <group>
-                            <field name="contact_name"
-                                   readonly="approval_state not in ('draft', 'revision')"/>
-                            <field name="contact_phone"
-                                   readonly="approval_state not in ('draft', 'revision')"/>
+                            <field
+                                name="contact_name"
+                                readonly="approval_state not in ('draft', 'revision')"
+                            />
+                            <field
+                                name="contact_phone"
+                                readonly="approval_state not in ('draft', 'revision')"
+                            />
                         </group>
                     </group>
 
                     <!-- Fulfillment - visible after approval (GAP-REQ-001, GAP-REQ-006) -->
-                    <group string="Fulfillment" invisible="approval_state != 'approved'">
+                    <group
+                        string="Fulfillment"
+                        invisible="approval_state != 'approved'"
+                    >
                         <group>
-                            <field name="source_warehouse_id"
-                                   options="{'no_create': True}"
-                                   required="approval_state == 'approved' and state not in ('allocated', 'dispatched', 'delivered')"/>
-                            <field name="destination_warehouse_id"
-                                   options="{'no_create': True}"/>
-                            <field name="state" string="Status" readonly="1"/>
+                            <field
+                                name="source_warehouse_id"
+                                options="{'no_create': True}"
+                                required="approval_state == 'approved' and state not in ('allocated', 'dispatched', 'delivered')"
+                            />
+                            <field
+                                name="destination_warehouse_id"
+                                options="{'no_create': True}"
+                            />
+                            <field name="state" string="Status" readonly="1" />
                         </group>
                         <group string="Progress">
-                            <field name="total_quantity" string="Requested"/>
-                            <field name="total_allocated"/>
-                            <field name="allocation_pct" widget="progressbar"/>
-                            <field name="total_dispatched"/>
-                            <field name="total_delivered"/>
-                            <field name="fulfillment_pct" widget="progressbar"/>
+                            <field name="total_quantity" string="Requested" />
+                            <field name="total_allocated" />
+                            <field name="allocation_pct" widget="progressbar" />
+                            <field name="total_dispatched" />
+                            <field name="total_delivered" />
+                            <field name="fulfillment_pct" widget="progressbar" />
                         </group>
                     </group>
 
                     <!-- Justification -->
-                    <group string="Justification">
-                        <field name="justification" nolabel="1"
-                               placeholder="Explain why this request is needed and how it will help the affected population..."
-                               readonly="approval_state not in ('draft', 'revision')"/>
+                    <group string="Justification" col="2">
+                        <field
+                            name="justification"
+                            nolabel="1"
+                            colspan="2"
+                            placeholder="Explain why this request is needed and how it will help the affected population..."
+                            readonly="approval_state not in ('draft', 'revision')"
+                        />
                     </group>
 
                     <!-- Revision Needed Banner -->
-                    <div class="alert alert-warning" role="status"
-                         invisible="approval_state != 'revision'">
+                    <div
+                        class="alert alert-warning"
+                        role="status"
+                        invisible="approval_state != 'revision'"
+                    >
                         <div class="d-flex align-items-center">
-                            <i class="fa fa-edit fa-2x me-3" title="Edit"/>
+                            <i class="fa fa-edit fa-2x me-3" title="Edit" />
                             <div>
                                 <h5 class="alert-heading mb-1">Changes Requested</h5>
                                 <p class="mb-0">
@@ -234,12 +331,17 @@
                     </div>
 
                     <!-- Ready to Allocate Banner -->
-                    <div class="alert alert-success" role="status"
-                         invisible="approval_state != 'approved'">
+                    <div
+                        class="alert alert-success"
+                        role="status"
+                        invisible="approval_state != 'approved'"
+                    >
                         <div class="d-flex align-items-center">
-                            <i class="fa fa-check-circle fa-2x me-3" title="Approved"/>
+                            <i class="fa fa-check-circle fa-2x me-3" title="Approved" />
                             <div>
-                                <h5 class="alert-heading mb-1">Approved - Ready to Allocate</h5>
+                                <h5
+                                    class="alert-heading mb-1"
+                                >Approved - Ready to Allocate</h5>
                                 <p class="mb-0">
                                     This request has been approved. Items can now be allocated and dispatched.
                                 </p>
@@ -250,45 +352,68 @@
                     <!-- Notebook with Tabs -->
                     <notebook>
                         <page string="Requested Items" name="items">
-                            <field name="line_ids"
-                                   readonly="approval_state not in ('draft', 'revision')">
+                            <field
+                                name="line_ids"
+                                readonly="approval_state not in ('draft', 'revision')"
+                            >
                                 <list editable="bottom">
-                                    <field name="sequence" widget="handle"/>
-                                    <field name="product_id"/>
-                                    <field name="quantity_requested"/>
-                                    <field name="uom_id" groups="uom.group_uom"/>
-                                    <field name="unit_value" optional="show"/>
-                                    <field name="value" sum="Total Value" optional="show"/>
-                                    <field name="quantity_allocated" optional="show"/>
-                                    <field name="quantity_delivered" optional="show"/>
-                                    <field name="fulfillment_pct" widget="progressbar" optional="show"/>
-                                    <field name="notes" optional="hide"/>
+                                    <field name="sequence" widget="handle" />
+                                    <field name="product_id" />
+                                    <field name="quantity_requested" />
+                                    <field name="uom_id" groups="uom.group_uom" />
+                                    <field name="unit_value" optional="show" />
+                                    <field
+                                        name="value"
+                                        sum="Total Value"
+                                        optional="show"
+                                    />
+                                    <field name="quantity_allocated" optional="show" />
+                                    <field name="quantity_delivered" optional="show" />
+                                    <field
+                                        name="fulfillment_pct"
+                                        widget="progressbar"
+                                        optional="show"
+                                    />
+                                    <field name="notes" optional="hide" />
                                 </list>
                             </field>
                             <group class="oe_subtotal_footer oe_right" colspan="2">
-                                <field name="total_quantity" string="Total Quantity Requested"/>
-                                <field name="total_value" string="Total Estimated Value"/>
+                                <field
+                                    name="total_quantity"
+                                    string="Total Quantity Requested"
+                                />
+                                <field
+                                    name="total_value"
+                                    string="Total Estimated Value"
+                                />
                             </group>
                         </page>
 
                         <page string="Approval History" name="approval_history">
                             <div class="text-muted mb-3">
-                                <i class="fa fa-info-circle me-1"/>
+                                <i class="fa fa-info-circle me-1" />
                                 Timeline of approvals and reviews for this request.
                             </div>
-                            <field name="approval_review_ids" readonly="1" nolabel="1"/>
+                            <field
+                                name="approval_review_ids"
+                                readonly="1"
+                                nolabel="1"
+                            />
                         </page>
 
                         <page string="Notes" name="notes">
-                            <field name="notes" nolabel="1"
-                                   placeholder="Internal notes (not visible to requester)..."
-                                   readonly="approval_state not in ('draft', 'revision', 'pending')"/>
+                            <field
+                                name="notes"
+                                nolabel="1"
+                                placeholder="Internal notes (not visible to requester)..."
+                                readonly="approval_state not in ('draft', 'revision', 'pending')"
+                            />
                         </page>
                     </notebook>
                 </sheet>
 
                 <!-- Chatter -->
-                <chatter/>
+                <chatter />
             </form>
         </field>
     </record>
@@ -303,81 +428,168 @@
             <search>
                 <!-- Searchpanel for quick filtering -->
                 <searchpanel>
-                    <field name="incident_id" icon="fa-exclamation-triangle" enable_counters="1"/>
-                    <field name="destination_area_id" icon="fa-map-marker" enable_counters="1" hierarchize="1"/>
-                    <field name="cluster_id" select="multi" icon="fa-users" enable_counters="1"/>
-                    <field name="approval_state" select="multi" icon="fa-tasks" enable_counters="1"/>
-                    <field name="priority_id" select="multi" icon="fa-flag" enable_counters="1"/>
+                    <field
+                        name="incident_id"
+                        icon="fa-exclamation-triangle"
+                        enable_counters="1"
+                    />
+                    <field
+                        name="destination_area_id"
+                        icon="fa-map-marker"
+                        enable_counters="1"
+                        hierarchize="1"
+                    />
+                    <field
+                        name="cluster_id"
+                        select="multi"
+                        icon="fa-users"
+                        enable_counters="1"
+                    />
+                    <field
+                        name="approval_state"
+                        select="multi"
+                        icon="fa-tasks"
+                        enable_counters="1"
+                    />
+                    <field
+                        name="priority_id"
+                        select="multi"
+                        icon="fa-flag"
+                        enable_counters="1"
+                    />
                 </searchpanel>
 
-                <field name="reference"/>
-                <field name="incident_id"/>
-                <field name="cluster_id"/>
-                <field name="destination_area_id"/>
-                <field name="priority_id"/>
-                <field name="contact_name"/>
-                <separator/>
+                <field name="reference" />
+                <field name="incident_id" />
+                <field name="cluster_id" />
+                <field name="destination_area_id" />
+                <field name="priority_id" />
+                <field name="contact_name" />
+                <separator />
 
                 <!-- Priority Filters -->
-                <filter name="life_threatening" string="Life-Threatening"
-                        domain="[('is_life_threatening', '=', True)]"/>
-                <filter name="critical" string="Critical"
-                        domain="[('priority_id.code', '=', 'critical')]"/>
-                <filter name="high" string="High Priority"
-                        domain="[('priority_id.code', '=', 'high')]"/>
-                <separator/>
+                <filter
+                    name="life_threatening"
+                    string="Life-Threatening"
+                    domain="[('is_life_threatening', '=', True)]"
+                />
+                <filter
+                    name="critical"
+                    string="Critical"
+                    domain="[('priority_id.code', '=', 'critical')]"
+                />
+                <filter
+                    name="high"
+                    string="High Priority"
+                    domain="[('priority_id.code', '=', 'high')]"
+                />
+                <separator />
 
                 <!-- State Filters -->
-                <filter name="draft" string="Draft"
-                        domain="[('approval_state', '=', 'draft')]"/>
-                <filter name="pending" string="Pending Approval"
-                        domain="[('approval_state', '=', 'pending')]"/>
-                <filter name="revision" string="Needs Changes"
-                        domain="[('approval_state', '=', 'revision')]"/>
-                <filter name="approved" string="Approved"
-                        domain="[('approval_state', '=', 'approved')]"/>
-                <filter name="rejected" string="Rejected"
-                        domain="[('approval_state', '=', 'rejected')]"/>
-                <separator/>
+                <filter
+                    name="draft"
+                    string="Draft"
+                    domain="[('approval_state', '=', 'draft')]"
+                />
+                <filter
+                    name="pending"
+                    string="Pending Approval"
+                    domain="[('approval_state', '=', 'pending')]"
+                />
+                <filter
+                    name="revision"
+                    string="Needs Changes"
+                    domain="[('approval_state', '=', 'revision')]"
+                />
+                <filter
+                    name="approved"
+                    string="Approved"
+                    domain="[('approval_state', '=', 'approved')]"
+                />
+                <filter
+                    name="rejected"
+                    string="Rejected"
+                    domain="[('approval_state', '=', 'rejected')]"
+                />
+                <separator />
 
                 <!-- Date Filters - Needed By -->
-                <filter name="urgent" string="Urgent (Needed Today)"
-                        domain="[('date_needed', '&lt;=', context_today().strftime('%Y-%m-%d'))]"/>
-                <filter name="this_week" string="Needed This Week"
-                        domain="[('date_needed', '&lt;=', (context_today() + datetime.timedelta(days=7)).strftime('%Y-%m-%d'))]"/>
-                <separator/>
+                <filter
+                    name="urgent"
+                    string="Urgent (Needed Today)"
+                    domain="[('date_needed', '&lt;=', context_today().strftime('%Y-%m-%d'))]"
+                />
+                <filter
+                    name="this_week"
+                    string="Needed This Week"
+                    domain="[('date_needed', '&lt;=', (context_today() + datetime.timedelta(days=7)).strftime('%Y-%m-%d'))]"
+                />
+                <separator />
 
                 <!-- Date Filters - Requested Date Presets -->
-                <filter name="last_24h" string="Last 24 Hours"
-                        domain="[('date_requested', '&gt;=', (context_today() - datetime.timedelta(days=1)).strftime('%Y-%m-%d'))]"/>
-                <filter name="last_7d" string="Last 7 Days"
-                        domain="[('date_requested', '&gt;=', (context_today() - datetime.timedelta(days=7)).strftime('%Y-%m-%d'))]"/>
-                <filter name="last_30d" string="Last 30 Days"
-                        domain="[('date_requested', '&gt;=', (context_today() - datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]"/>
-                <separator/>
+                <filter
+                    name="last_24h"
+                    string="Last 24 Hours"
+                    domain="[('date_requested', '&gt;=', (context_today() - datetime.timedelta(days=1)).strftime('%Y-%m-%d'))]"
+                />
+                <filter
+                    name="last_7d"
+                    string="Last 7 Days"
+                    domain="[('date_requested', '&gt;=', (context_today() - datetime.timedelta(days=7)).strftime('%Y-%m-%d'))]"
+                />
+                <filter
+                    name="last_30d"
+                    string="Last 30 Days"
+                    domain="[('date_requested', '&gt;=', (context_today() - datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]"
+                />
+                <separator />
 
                 <!-- User Filters -->
-                <filter name="my_requests" string="My Requests"
-                        domain="[('create_uid', '=', uid)]"/>
-                <filter name="needs_approval" string="Needs My Approval"
-                        domain="[('approval_state', '=', 'pending')]"
-                        groups="spp_drims.group_drims_approver"/>
-                <separator/>
+                <filter
+                    name="my_requests"
+                    string="My Requests"
+                    domain="[('create_uid', '=', uid)]"
+                />
+                <filter
+                    name="needs_approval"
+                    string="Needs My Approval"
+                    domain="[('approval_state', '=', 'pending')]"
+                    groups="spp_drims.group_drims_approver"
+                />
+                <separator />
 
                 <!-- Group By -->
                 <group>
-                    <filter name="group_incident" string="Incident"
-                            context="{'group_by': 'incident_id'}"/>
-                    <filter name="group_cluster" string="Cluster"
-                            context="{'group_by': 'cluster_id'}"/>
-                    <filter name="group_area" string="Area"
-                            context="{'group_by': 'destination_area_id'}"/>
-                    <filter name="group_priority" string="Priority"
-                            context="{'group_by': 'priority_id'}"/>
-                    <filter name="group_state" string="Approval Status"
-                            context="{'group_by': 'approval_state'}"/>
-                    <filter name="group_date_needed" string="Date Needed"
-                            context="{'group_by': 'date_needed'}"/>
+                    <filter
+                        name="group_incident"
+                        string="Incident"
+                        context="{'group_by': 'incident_id'}"
+                    />
+                    <filter
+                        name="group_cluster"
+                        string="Cluster"
+                        context="{'group_by': 'cluster_id'}"
+                    />
+                    <filter
+                        name="group_area"
+                        string="Area"
+                        context="{'group_by': 'destination_area_id'}"
+                    />
+                    <filter
+                        name="group_priority"
+                        string="Priority"
+                        context="{'group_by': 'priority_id'}"
+                    />
+                    <filter
+                        name="group_state"
+                        string="Approval Status"
+                        context="{'group_by': 'approval_state'}"
+                    />
+                    <filter
+                        name="group_date_needed"
+                        string="Date Needed"
+                        context="{'group_by': 'date_needed'}"
+                    />
                 </group>
             </search>
         </field>
@@ -390,57 +602,77 @@
         <field name="name">spp.drims.request.kanban</field>
         <field name="model">spp.drims.request</field>
         <field name="arch" type="xml">
-            <kanban default_group_by="approval_state" class="o_kanban_small_column"
-                    quick_create="false" sample="1">
-                <field name="reference"/>
-                <field name="incident_id"/>
-                <field name="cluster_id"/>
-                <field name="destination_area_id"/>
-                <field name="priority_id"/>
-                <field name="is_life_threatening"/>
-                <field name="approval_state"/>
-                <field name="date_needed"/>
-                <field name="line_count"/>
-                <field name="total_value"/>
-                <progressbar field="approval_state"
-                             colors='{"draft": "secondary", "pending": "warning", "revision": "info", "approved": "success", "rejected": "danger"}'/>
+            <kanban
+                default_group_by="approval_state"
+                class="o_kanban_small_column"
+                quick_create="false"
+                sample="1"
+            >
+                <field name="reference" />
+                <field name="incident_id" />
+                <field name="cluster_id" />
+                <field name="destination_area_id" />
+                <field name="priority_id" />
+                <field name="is_life_threatening" />
+                <field name="approval_state" />
+                <field name="date_needed" />
+                <field name="line_count" />
+                <field name="total_value" />
+                <progressbar
+                    field="approval_state"
+                    colors='{"draft": "secondary", "pending": "warning", "revision": "info", "approved": "success", "rejected": "danger"}'
+                />
                 <templates>
                     <t t-name="card">
                         <div class="o_kanban_card_content">
                             <div class="o_kanban_primary_left">
                                 <strong>
-                                    <field name="reference"/>
+                                    <field name="reference" />
                                 </strong>
-                                <span t-if="record.is_life_threatening.raw_value" class="badge text-bg-danger ms-2">
+                                <span
+                                    t-if="record.is_life_threatening.raw_value"
+                                    class="badge text-bg-danger ms-2"
+                                >
                                     URGENT
                                 </span>
                             </div>
                             <div class="text-muted mb-1">
-                                <i class="fa fa-warning me-1" title="Incident"/>
-                                <field name="incident_id"/>
+                                <i class="fa fa-warning me-1" title="Incident" />
+                                <field name="incident_id" />
                             </div>
                             <div class="mb-1" t-if="record.cluster_id.raw_value">
-                                <i class="fa fa-users me-1 text-muted" title="Cluster"/>
-                                <field name="cluster_id"/>
+                                <i
+                                    class="fa fa-users me-1 text-muted"
+                                    title="Cluster"
+                                />
+                                <field name="cluster_id" />
                             </div>
                             <div class="mb-1">
-                                <i class="fa fa-map-marker me-1 text-muted" title="Area"/>
-                                <field name="destination_area_id"/>
+                                <i
+                                    class="fa fa-map-marker me-1 text-muted"
+                                    title="Area"
+                                />
+                                <field name="destination_area_id" />
                             </div>
                             <div class="d-flex align-items-center mb-2">
-                                <span t-if="record.priority_id.raw_value" class="badge me-2"
-                                      t-att-class="record.priority_id.value === 'Critical' ? 'text-bg-danger' :
-                                                   record.priority_id.value === 'High' ? 'text-bg-warning' : 'text-bg-info'">
-                                    <field name="priority_id"/>
+                                <span
+                                    t-if="record.priority_id.raw_value"
+                                    class="badge me-2"
+                                    t-att-class="record.priority_id.value === 'Critical' ? 'text-bg-danger' :
+                                                   record.priority_id.value === 'High' ? 'text-bg-warning' : 'text-bg-info'"
+                                >
+                                    <field name="priority_id" />
                                 </span>
                             </div>
-                            <div class="mt-2 d-flex justify-content-between align-items-center">
+                            <div
+                                class="mt-2 d-flex justify-content-between align-items-center"
+                            >
                                 <span class="text-muted small">
-                                    <i class="fa fa-calendar me-1" title="Needed"/>
-                                    <field name="date_needed"/>
+                                    <i class="fa fa-calendar me-1" title="Needed" />
+                                    <field name="date_needed" />
                                 </span>
                                 <span class="badge text-bg-secondary">
-                                    <field name="line_count"/> items
+                                    <field name="line_count" /> items
                                 </span>
                             </div>
                         </div>
@@ -458,15 +690,15 @@
         <field name="model">spp.drims.request.line</field>
         <field name="arch" type="xml">
             <list>
-                <field name="sequence" widget="handle"/>
-                <field name="product_id"/>
-                <field name="quantity_requested"/>
-                <field name="uom_id" groups="uom.group_uom"/>
-                <field name="unit_value"/>
-                <field name="value" sum="Total Value"/>
-                <field name="quantity_allocated"/>
-                <field name="quantity_delivered"/>
-                <field name="fulfillment_pct" widget="progressbar"/>
+                <field name="sequence" widget="handle" />
+                <field name="product_id" />
+                <field name="quantity_requested" />
+                <field name="uom_id" groups="uom.group_uom" />
+                <field name="unit_value" />
+                <field name="value" sum="Total Value" />
+                <field name="quantity_allocated" />
+                <field name="quantity_delivered" />
+                <field name="fulfillment_pct" widget="progressbar" />
             </list>
         </field>
     </record>
@@ -479,7 +711,7 @@
         <field name="model">spp.drims.request</field>
         <field name="arch" type="xml">
             <graph string="Request Status Distribution" type="pie" sample="1">
-                <field name="approval_state"/>
+                <field name="approval_state" />
             </graph>
         </field>
     </record>
@@ -490,10 +722,10 @@
         <field name="model">spp.drims.request</field>
         <field name="arch" type="xml">
             <pivot string="Request Analysis" sample="1">
-                <field name="incident_id" type="row"/>
-                <field name="approval_state" type="col"/>
-                <field name="total_value" type="measure"/>
-                <field name="line_count" type="measure"/>
+                <field name="incident_id" type="row" />
+                <field name="approval_state" type="col" />
+                <field name="total_value" type="measure" />
+                <field name="line_count" type="measure" />
             </pivot>
         </field>
     </record>
@@ -508,7 +740,7 @@
         <field name="path">drims-requests</field>
         <field name="res_model">spp.drims.request</field>
         <field name="view_mode">list,kanban,graph,pivot,form</field>
-        <field name="search_view_id" ref="spp_drims_request_search"/>
+        <field name="search_view_id" ref="spp_drims_request_search" />
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
                 No requests found
@@ -525,7 +757,7 @@
         <field name="path">my-drims-requests</field>
         <field name="res_model">spp.drims.request</field>
         <field name="view_mode">list,kanban,form</field>
-        <field name="search_view_id" ref="spp_drims_request_search"/>
+        <field name="search_view_id" ref="spp_drims_request_search" />
         <field name="context">{'search_default_my_requests': 1}</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
@@ -540,7 +772,7 @@
         <field name="path">pending-drims-requests</field>
         <field name="res_model">spp.drims.request</field>
         <field name="view_mode">list,kanban,form</field>
-        <field name="search_view_id" ref="spp_drims_request_search"/>
+        <field name="search_view_id" ref="spp_drims_request_search" />
         <field name="context">{'search_default_pending': 1}</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
@@ -555,7 +787,7 @@
         <field name="path">top-priority-requests</field>
         <field name="res_model">spp.drims.request</field>
         <field name="view_mode">list,form</field>
-        <field name="search_view_id" ref="spp_drims_request_search"/>
+        <field name="search_view_id" ref="spp_drims_request_search" />
         <field name="domain">[('approval_state', 'in', ['pending', 'approved'])]</field>
         <field name="context">{
             'search_default_pending': 1,
@@ -572,5 +804,4 @@
             </p>
         </field>
     </record>
-
 </odoo>
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 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <!-- Return List View -->
     <record id="spp_drims_return_view_list" model="ir.ui.view">
         <field name="name">spp.drims.return.list</field>
         <field name="model">spp.drims.return</field>
         <field name="arch" type="xml">
-            <list decoration-info="state == 'draft'"
-                  decoration-warning="state in ('confirmed', 'received')"
-                  decoration-success="state == 'restocked'"
-                  decoration-muted="state == 'cancelled'">
-                <field name="reference"/>
-                <field name="incident_id"/>
-                <field name="original_request_id" optional="hide"/>
-                <field name="warehouse_id"/>
-                <field name="return_date"/>
-                <field name="returned_by" optional="hide"/>
-                <field name="line_count" string="Items" optional="hide"/>
-                <field name="total_quantity"/>
-                <field name="total_value" sum="Total Value"/>
-                <field name="state" widget="badge"
-                       decoration-info="state == 'draft'"
-                       decoration-warning="state in ('confirmed', 'received')"
-                       decoration-primary="state == 'inspected'"
-                       decoration-success="state == 'restocked'"
-                       decoration-muted="state == 'cancelled'"/>
+            <list
+                decoration-info="state == 'draft'"
+                decoration-warning="state in ('confirmed', 'received')"
+                decoration-success="state == 'restocked'"
+                decoration-muted="state == 'cancelled'"
+            >
+                <field name="reference" />
+                <field name="incident_id" />
+                <field name="original_request_id" optional="hide" />
+                <field name="warehouse_id" />
+                <field name="return_date" />
+                <field name="returned_by" optional="hide" />
+                <field name="line_count" string="Items" optional="hide" />
+                <field name="total_quantity" />
+                <field name="total_value" sum="Total Value" />
+                <field
+                    name="state"
+                    widget="badge"
+                    decoration-info="state == 'draft'"
+                    decoration-warning="state in ('confirmed', 'received')"
+                    decoration-primary="state == 'inspected'"
+                    decoration-success="state == 'restocked'"
+                    decoration-muted="state == 'cancelled'"
+                />
             </list>
         </field>
     </record>
@@ -35,124 +40,185 @@
         <field name="arch" type="xml">
             <form string="Item Return">
                 <header>
-                    <button name="action_confirm"
-                            string="Confirm Return"
-                            type="object"
-                            class="btn-primary"
-                            invisible="state != 'draft'"/>
-                    <button name="action_receive"
-                            string="Mark Received"
-                            type="object"
-                            class="btn-primary"
-                            invisible="state != 'confirmed'"/>
-                    <button name="action_inspect"
-                            string="Mark Inspected"
-                            type="object"
-                            class="btn-primary"
-                            invisible="state != 'received'"/>
-                    <button name="action_restock"
-                            string="Restock Items"
-                            type="object"
-                            class="btn-success"
-                            invisible="state != 'inspected'"
-                            confirm="This will add returned items back to warehouse inventory. Continue?"/>
-                    <button name="action_cancel"
-                            string="Cancel"
-                            type="object"
-                            class="btn-secondary"
-                            invisible="state in ('restocked', 'cancelled')"/>
-                    <button name="action_reset_to_draft"
-                            string="Reset to Draft"
-                            type="object"
-                            class="btn-secondary"
-                            invisible="state != 'cancelled'"/>
-                    <field name="state" widget="statusbar"
-                           statusbar_visible="draft,confirmed,received,inspected,restocked"/>
+                    <button
+                        name="action_confirm"
+                        string="Confirm Return"
+                        type="object"
+                        class="btn-primary"
+                        invisible="state != 'draft'"
+                    />
+                    <button
+                        name="action_receive"
+                        string="Mark Received"
+                        type="object"
+                        class="btn-primary"
+                        invisible="state != 'confirmed'"
+                    />
+                    <button
+                        name="action_inspect"
+                        string="Mark Inspected"
+                        type="object"
+                        class="btn-primary"
+                        invisible="state != 'received'"
+                    />
+                    <button
+                        name="action_restock"
+                        string="Restock Items"
+                        type="object"
+                        class="btn-success"
+                        invisible="state != 'inspected'"
+                        confirm="This will add returned items back to warehouse inventory. Continue?"
+                    />
+                    <button
+                        name="action_cancel"
+                        string="Cancel"
+                        type="object"
+                        class="btn-secondary"
+                        invisible="state in ('restocked', 'cancelled')"
+                    />
+                    <button
+                        name="action_reset_to_draft"
+                        string="Reset to Draft"
+                        type="object"
+                        class="btn-secondary"
+                        invisible="state != 'cancelled'"
+                    />
+                    <field
+                        name="state"
+                        widget="statusbar"
+                        statusbar_visible="draft,confirmed,received,inspected,restocked"
+                    />
                 </header>
                 <sheet>
                     <div class="oe_button_box" name="button_box">
-                        <button name="action_view_pickings"
-                                type="object"
-                                class="oe_stat_button"
-                                icon="fa-truck"
-                                invisible="picking_count == 0">
-                            <field name="picking_count" widget="statinfo" string="Receipts"/>
+                        <button
+                            name="action_view_pickings"
+                            type="object"
+                            class="oe_stat_button"
+                            icon="fa-truck"
+                            invisible="picking_count == 0"
+                        >
+                            <field
+                                name="picking_count"
+                                widget="statinfo"
+                                string="Receipts"
+                            />
                         </button>
                     </div>
 
                     <!-- Ribbons -->
-                    <widget name="web_ribbon" title="Restocked" bg_color="text-bg-success"
-                            invisible="state != 'restocked'"/>
-                    <widget name="web_ribbon" title="Cancelled" bg_color="text-bg-secondary"
-                            invisible="state != 'cancelled'"/>
+                    <widget
+                        name="web_ribbon"
+                        title="Restocked"
+                        bg_color="text-bg-success"
+                        invisible="state != 'restocked'"
+                    />
+                    <widget
+                        name="web_ribbon"
+                        title="Cancelled"
+                        bg_color="text-bg-secondary"
+                        invisible="state != 'cancelled'"
+                    />
 
                     <div class="oe_title">
                         <h1>
-                            <field name="reference" readonly="1"/>
+                            <field name="reference" readonly="1" />
                         </h1>
                     </div>
 
                     <group>
                         <group string="Return Details">
-                            <field name="incident_id"
-                                   readonly="state != 'draft'"
-                                   options="{'no_create': True}"
-                                   help="The disaster incident this return is associated with"/>
-                            <field name="original_picking_id"
-                                   readonly="state != 'draft'"
-                                   options="{'no_create': True}"
-                                   help="The original dispatch from which items are being returned"/>
-                            <field name="original_request_id" readonly="1"
-                                   help="The relief request that initiated the original dispatch"/>
-                            <field name="warehouse_id"
-                                   readonly="state != 'draft'"
-                                   options="{'no_create': True}"
-                                   help="The warehouse where returned items will be restocked"/>
+                            <field
+                                name="incident_id"
+                                readonly="state != 'draft'"
+                                options="{'no_create': True}"
+                                help="The disaster incident this return is associated with"
+                            />
+                            <field
+                                name="original_picking_id"
+                                readonly="state != 'draft'"
+                                options="{'no_create': True}"
+                                help="The original dispatch from which items are being returned"
+                            />
+                            <field
+                                name="original_request_id"
+                                readonly="1"
+                                help="The relief request that initiated the original dispatch"
+                            />
+                            <field
+                                name="warehouse_id"
+                                readonly="state != 'draft'"
+                                options="{'no_create': True}"
+                                help="The warehouse where returned items will be restocked"
+                            />
                         </group>
                         <group string="Return Information">
-                            <field name="return_date" readonly="state != 'draft'"/>
-                            <field name="returned_by" readonly="state != 'draft'"
-                                   help="Name of the person physically returning the items"/>
-                            <field name="returned_by_phone" readonly="state != 'draft'"/>
+                            <field name="return_date" readonly="state != 'draft'" />
+                            <field
+                                name="returned_by"
+                                readonly="state != 'draft'"
+                                help="Name of the person physically returning the items"
+                            />
+                            <field
+                                name="returned_by_phone"
+                                readonly="state != 'draft'"
+                            />
                         </group>
                     </group>
 
-                    <group string="Return Reason">
-                        <field name="return_reason" nolabel="1"
-                               placeholder="Explain why items are being returned..."
-                               readonly="state != 'draft'"/>
+                    <group string="Return Reason" col="2">
+                        <field
+                            name="return_reason"
+                            nolabel="1"
+                            colspan="2"
+                            placeholder="Explain why items are being returned..."
+                            readonly="state != 'draft'"
+                        />
                     </group>
 
                     <notebook>
                         <page string="Return Items" name="items">
                             <field name="line_ids" readonly="state != 'draft'">
                                 <list editable="bottom">
-                                    <field name="sequence" widget="handle"/>
-                                    <field name="product_id" options="{'no_create_edit': True}"/>
-                                    <field name="quantity_dispatched" readonly="1"/>
-                                    <field name="quantity_returned"/>
-                                    <field name="uom_id" readonly="1"/>
-                                    <field name="condition_id" optional="show"
-                                           options="{'no_create': True}"/>
-                                    <field name="disposition" widget="badge"
-                                           help="Restock: Return to inventory. Repair: Send for fixing. Dispose: Write off damaged items."
-                                           decoration-success="disposition == 'restock'"
-                                           decoration-warning="disposition == 'repair'"
-                                           decoration-danger="disposition == 'dispose'"/>
-                                    <field name="unit_value" readonly="1" optional="show"/>
-                                    <field name="value" sum="Total Value"/>
-                                    <field name="disposition_notes" optional="hide"/>
-                                    <field name="notes" optional="hide"/>
+                                    <field name="sequence" widget="handle" />
+                                    <field
+                                        name="product_id"
+                                        options="{'no_create_edit': True}"
+                                    />
+                                    <field name="quantity_dispatched" readonly="1" />
+                                    <field name="quantity_returned" />
+                                    <field name="uom_id" readonly="1" />
+                                    <field
+                                        name="condition_id"
+                                        optional="show"
+                                        options="{'no_create': True}"
+                                    />
+                                    <field
+                                        name="disposition"
+                                        widget="badge"
+                                        help="Restock: Return to inventory. Repair: Send for fixing. Dispose: Write off damaged items."
+                                        decoration-success="disposition == 'restock'"
+                                        decoration-warning="disposition == 'repair'"
+                                        decoration-danger="disposition == 'dispose'"
+                                    />
+                                    <field
+                                        name="unit_value"
+                                        readonly="1"
+                                        optional="show"
+                                    />
+                                    <field name="value" sum="Total Value" />
+                                    <field name="disposition_notes" optional="hide" />
+                                    <field name="notes" optional="hide" />
                                 </list>
                             </field>
                             <group class="oe_subtotal_footer oe_right" colspan="2">
-                                <field name="total_quantity" string="Total Quantity"/>
-                                <field name="total_value" string="Total Value"/>
+                                <field name="total_quantity" string="Total Quantity" />
+                                <field name="total_value" string="Total Value" />
                             </group>
                         </page>
                     </notebook>
                 </sheet>
-                <chatter/>
+                <chatter />
             </form>
         </field>
     </record>
@@ -165,48 +231,95 @@
             <search string="Search Returns">
                 <!-- Searchpanel -->
                 <searchpanel>
-                    <field name="incident_id" icon="fa-exclamation-triangle" enable_counters="1"/>
-                    <field name="state" select="multi" icon="fa-tasks" enable_counters="1"/>
-                    <field name="warehouse_id" select="multi" icon="fa-warehouse" enable_counters="1"/>
+                    <field
+                        name="incident_id"
+                        icon="fa-exclamation-triangle"
+                        enable_counters="1"
+                    />
+                    <field
+                        name="state"
+                        select="multi"
+                        icon="fa-tasks"
+                        enable_counters="1"
+                    />
+                    <field
+                        name="warehouse_id"
+                        select="multi"
+                        icon="fa-warehouse"
+                        enable_counters="1"
+                    />
                 </searchpanel>
 
-                <field name="reference"/>
-                <field name="incident_id"/>
-                <field name="original_request_id"/>
-                <field name="warehouse_id"/>
-                <field name="returned_by"/>
-                <separator/>
+                <field name="reference" />
+                <field name="incident_id" />
+                <field name="original_request_id" />
+                <field name="warehouse_id" />
+                <field name="returned_by" />
+                <separator />
 
                 <!-- State Filters -->
-                <filter name="filter_draft" string="Draft"
-                        domain="[('state', '=', 'draft')]"/>
-                <filter name="filter_confirmed" string="Confirmed"
-                        domain="[('state', '=', 'confirmed')]"/>
-                <filter name="filter_received" string="Received"
-                        domain="[('state', '=', 'received')]"/>
-                <filter name="filter_inspected" string="Inspected"
-                        domain="[('state', '=', 'inspected')]"/>
-                <filter name="filter_restocked" string="Restocked"
-                        domain="[('state', '=', 'restocked')]"/>
-                <filter name="filter_cancelled" string="Cancelled"
-                        domain="[('state', '=', 'cancelled')]"/>
-                <separator/>
+                <filter
+                    name="filter_draft"
+                    string="Draft"
+                    domain="[('state', '=', 'draft')]"
+                />
+                <filter
+                    name="filter_confirmed"
+                    string="Confirmed"
+                    domain="[('state', '=', 'confirmed')]"
+                />
+                <filter
+                    name="filter_received"
+                    string="Received"
+                    domain="[('state', '=', 'received')]"
+                />
+                <filter
+                    name="filter_inspected"
+                    string="Inspected"
+                    domain="[('state', '=', 'inspected')]"
+                />
+                <filter
+                    name="filter_restocked"
+                    string="Restocked"
+                    domain="[('state', '=', 'restocked')]"
+                />
+                <filter
+                    name="filter_cancelled"
+                    string="Cancelled"
+                    domain="[('state', '=', 'cancelled')]"
+                />
+                <separator />
 
                 <!-- Pending Filter -->
-                <filter name="filter_pending" string="Pending Processing"
-                        domain="[('state', 'in', ('draft', 'confirmed', 'received', 'inspected'))]"/>
-                <separator/>
+                <filter
+                    name="filter_pending"
+                    string="Pending Processing"
+                    domain="[('state', 'in', ('draft', 'confirmed', 'received', 'inspected'))]"
+                />
+                <separator />
 
                 <!-- Group By -->
                 <group>
-                    <filter name="groupby_incident" string="Incident"
-                            context="{'group_by': 'incident_id'}"/>
-                    <filter name="groupby_warehouse" string="Warehouse"
-                            context="{'group_by': 'warehouse_id'}"/>
-                    <filter name="groupby_state" string="State"
-                            context="{'group_by': 'state'}"/>
-                    <filter name="groupby_date" string="Return Date"
-                            context="{'group_by': 'return_date'}"/>
+                    <filter
+                        name="groupby_incident"
+                        string="Incident"
+                        context="{'group_by': 'incident_id'}"
+                    />
+                    <filter
+                        name="groupby_warehouse"
+                        string="Warehouse"
+                        context="{'group_by': 'warehouse_id'}"
+                    />
+                    <filter
+                        name="groupby_state"
+                        string="State"
+                        context="{'group_by': 'state'}"
+                    />
+                    <filter
+                        name="groupby_date"
+                        string="Return Date"
+                        context="{'group_by': 'return_date'}"
+                    />
                 </group>
             </search>
         </field>
@@ -218,23 +331,23 @@
         <field name="model">spp.drims.return</field>
         <field name="arch" type="xml">
             <kanban default_group_by="state" class="o_kanban_mobile">
-                <field name="reference"/>
-                <field name="state"/>
-                <field name="incident_id"/>
-                <field name="warehouse_id"/>
-                <field name="total_quantity"/>
-                <field name="total_value"/>
+                <field name="reference" />
+                <field name="state" />
+                <field name="incident_id" />
+                <field name="warehouse_id" />
+                <field name="total_quantity" />
+                <field name="total_value" />
                 <templates>
                     <t t-name="card">
-                        <field name="reference" class="fw-bold"/>
-                        <field name="incident_id"/>
-                        <field name="warehouse_id"/>
+                        <field name="reference" class="fw-bold" />
+                        <field name="incident_id" />
+                        <field name="warehouse_id" />
                         <div class="mt-2">
                             <span class="badge rounded-pill text-bg-secondary">
-                                <field name="total_quantity"/> items
+                                <field name="total_quantity" /> items
                             </span>
                             <span class="badge rounded-pill text-bg-primary ms-1">
-                                <field name="total_value" widget="monetary"/>
+                                <field name="total_value" widget="monetary" />
                             </span>
                         </div>
                     </t>
@@ -249,7 +362,7 @@
         <field name="model">spp.drims.return</field>
         <field name="arch" type="xml">
             <graph string="Returns by State" type="pie">
-                <field name="state"/>
+                <field name="state" />
             </graph>
         </field>
     </record>
@@ -260,11 +373,11 @@
         <field name="model">spp.drims.return</field>
         <field name="arch" type="xml">
             <pivot string="Return Analysis">
-                <field name="incident_id" type="row"/>
-                <field name="warehouse_id" type="row"/>
-                <field name="state" type="col"/>
-                <field name="total_quantity" type="measure"/>
-                <field name="total_value" type="measure"/>
+                <field name="incident_id" type="row" />
+                <field name="warehouse_id" type="row" />
+                <field name="state" type="col" />
+                <field name="total_quantity" type="measure" />
+                <field name="total_value" type="measure" />
             </pivot>
         </field>
     </record>
@@ -293,15 +406,15 @@
         <field name="model">spp.drims.return.line</field>
         <field name="arch" type="xml">
             <list editable="bottom">
-                <field name="return_id" readonly="1"/>
-                <field name="sequence" widget="handle"/>
-                <field name="product_id"/>
-                <field name="quantity_dispatched" readonly="1"/>
-                <field name="quantity_returned"/>
-                <field name="uom_id" readonly="1"/>
-                <field name="condition_id" optional="show"/>
-                <field name="value" sum="Total Value"/>
-                <field name="notes" optional="hide"/>
+                <field name="return_id" readonly="1" />
+                <field name="sequence" widget="handle" />
+                <field name="product_id" />
+                <field name="quantity_dispatched" readonly="1" />
+                <field name="quantity_returned" />
+                <field name="uom_id" readonly="1" />
+                <field name="condition_id" optional="show" />
+                <field name="value" sum="Total Value" />
+                <field name="notes" optional="hide" />
             </list>
         </field>
     </record>