diff --git a/src/main/java/com/gcc_manpower/config/SecurityConfig.java b/src/main/java/com/gcc_manpower/config/SecurityConfig.java
index c415f7a..7faee09 100644
--- a/src/main/java/com/gcc_manpower/config/SecurityConfig.java
+++ b/src/main/java/com/gcc_manpower/config/SecurityConfig.java
@@ -72,7 +72,9 @@ public class SecurityConfig {
                                 "/gccadjustmentmanagement/login",
                                 "/gccadjustmentmanagement/api/login",
                                 "/gcctapaldetailsmanagement/login",
-                                "/gcctapaldetailsmanagement/api/login")
+                                "/gcctapaldetailsmanagement/api/login",
+                                "/gccrentalmanagement/login",
+                                "/gccrentalmanagement/api/login")
                         .permitAll()
                         // Allow logout endpoints
                         .requestMatchers(
@@ -81,7 +83,8 @@ public class SecurityConfig {
                                 "/gccservicepaymenttracker/logout",
                                 "/gccservicedocuments/logout",
                                 "/gccadjustmentmanagement/logout",
-                                "/gcctapaldetailsmanagement/logout")
+                                "/gcctapaldetailsmanagement/logout",
+                                "/gccrentalmanagement/logout")
                         .permitAll()
                         // Require authentication for all other requests
                         .anyRequest().authenticated())
@@ -93,7 +96,8 @@ public class SecurityConfig {
                                 "/gccservicepaymenttracker/api/login",
                                 "/gccservicedocuments/api/login",
                                 "/gccadjustmentmanagement/api/login",
-                                "/gcctapaldetailsmanagement/api/login"))
+                                "/gcctapaldetailsmanagement/api/login",
+                                "/gccrentalmanagement/api/login"))
                 // Session management configuration with module-aware invalid session
                 // redirection
                 .sessionManagement(session -> session
@@ -111,6 +115,8 @@ public class SecurityConfig {
                                 response.sendRedirect(request.getContextPath() + "/gccadjustmentmanagement/login");
                             } else if (requestURI.contains("/gcctapaldetailsmanagement")) {
                                 response.sendRedirect(request.getContextPath() + "/gcctapaldetailsmanagement/login");
+                            } else if (requestURI.contains("/gccrentalmanagement")) {
+                                response.sendRedirect(request.getContextPath() + "/gccrentalmanagement/login");
                             } else {
                                 response.sendRedirect(request.getContextPath() + "/login");
                             }
@@ -129,6 +135,8 @@ public class SecurityConfig {
                                 response.sendRedirect(request.getContextPath() + "/gccadjustmentmanagement/login");
                             } else if (requestURI.contains("/gcctapaldetailsmanagement")) {
                                 response.sendRedirect(request.getContextPath() + "/gcctapaldetailsmanagement/login");
+                            } else if (requestURI.contains("/gccrentalmanagement")) {
+                                response.sendRedirect(request.getContextPath() + "/gccrentalmanagement/login");
                             } else {
                                 response.sendRedirect(request.getContextPath() + "/login");
                             }
diff --git a/src/main/java/com/gcc_manpower/config/WebConfig.java b/src/main/java/com/gcc_manpower/config/WebConfig.java
index 9a728a9..80edd1a 100644
--- a/src/main/java/com/gcc_manpower/config/WebConfig.java
+++ b/src/main/java/com/gcc_manpower/config/WebConfig.java
@@ -27,6 +27,9 @@ public class WebConfig implements WebMvcConfigurer {
         @Value("${tapal.upload.path:gcctapalfiles}")
         private String tapalUploadPathConfig;
 
+        @Value("${rental.upload.path:gccrentalmanagementfiles}")
+        private String rentalUploadPathConfig;
+
         @Override
         public void addResourceHandlers(ResourceHandlerRegistry registry) {
                 // Resolve absolute path (supports both relative and absolute paths)
@@ -58,6 +61,15 @@ public class WebConfig implements WebMvcConfigurer {
                 registry.addResourceHandler("/gcctonermanagementfiles/**")
                                 .addResourceLocations(tonerUploadPath);
 
+                // Map URL path /gccrentalmanagementfiles/** to the configured rental folder
+                String rentalUploadPath = Paths.get(rentalUploadPathConfig).toAbsolutePath().toUri()
+                                .toString();
+                if (!rentalUploadPath.endsWith("/")) {
+                        rentalUploadPath += "/";
+                }
+                registry.addResourceHandler("/gccrentalmanagementfiles/**")
+                                .addResourceLocations(rentalUploadPath);
+
                 // Map URL path /gccadjustmentmanagementfiles/** to the configured adjustment
                 // folder
                 String adjustmentUploadPath = Paths.get(adjustmentUploadPathConfig).toAbsolutePath().toUri()
diff --git a/src/main/java/com/gcc_manpower/gccrentalmanagement/controller/RentalController.java b/src/main/java/com/gcc_manpower/gccrentalmanagement/controller/RentalController.java
new file mode 100644
index 0000000..190395e
--- /dev/null
+++ b/src/main/java/com/gcc_manpower/gccrentalmanagement/controller/RentalController.java
@@ -0,0 +1,518 @@
+package com.gcc_manpower.gccrentalmanagement.controller;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.gcc_manpower.gccrentalmanagement.service.RentalService;
+import com.gcc_manpower.service.AppUserService;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.context.HttpSessionSecurityContextRepository;
+
+@Controller
+@RequestMapping("/gccrentalmanagement")
+public class RentalController {
+
+    @Autowired
+    private AppUserService appUserService;
+
+    @Autowired
+    private RentalService rentalService;
+
+    @Autowired
+    private AuthenticationManager authenticationManager;
+
+    @Value("${rental.upload.path:gccrentalmanagementfiles}")
+    private String rentalUploadPathConfig;
+
+    @GetMapping({ "", "/", "/dashboard" })
+    public String viewDashboard(Model model, HttpSession session) {
+        String username = (String) session.getAttribute("rental_usrName");
+        if (username == null) {
+            return "redirect:/gccrentalmanagement/login";
+        }
+
+        String usrRole = (String) session.getAttribute("rental_usrRole");
+        boolean isAdmin = "ADMIN".equalsIgnoreCase(usrRole);
+
+        model.addAttribute("isLoggedIn", true);
+        model.addAttribute("isAdmin", isAdmin);
+        model.addAttribute("usrName", username);
+        model.addAttribute("usrRole", usrRole != null ? usrRole : "USER");
+        model.addAttribute("curPage", "gccrentalmanagement");
+
+        return "gccrentalmanagement/dashboard";
+    }
+
+    @GetMapping("/login")
+    public String login(HttpSession session) {
+        String username = (String) session.getAttribute("rental_usrName");
+        if (username != null) {
+            return "redirect:/gccrentalmanagement/dashboard";
+        }
+        return "gccrentalmanagement/login";
+    }
+
+    @PostMapping("/api/login")
+    @ResponseBody
+    public Map<String, Object> validateLogin(
+            @RequestParam("usrName") String usrName,
+            @RequestParam("usrPass") String usrPass,
+            HttpSession session) {
+
+        Map<String, Object> response = new HashMap<>();
+
+        try {
+            UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(usrName, usrPass);
+            Authentication authentication = authenticationManager.authenticate(authenticationToken);
+
+            SecurityContextHolder.getContext().setAuthentication(authentication);
+            session.setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY,
+                    SecurityContextHolder.getContext());
+
+            String role = authentication.getAuthorities().stream()
+                    .map(auth -> auth.getAuthority().replace("ROLE_", ""))
+                    .findFirst()
+                    .orElse("USER");
+
+            session.setAttribute("rental_usrName", usrName);
+            session.setAttribute("rental_usrRole", role);
+            session.setMaxInactiveInterval(1800); // 30 minutes session timeout
+            response.put("result", true);
+            response.put("usrName", usrName);
+            response.put("usrRole", role);
+        } catch (AuthenticationException e) {
+            response.put("result", false);
+            response.put("error", e.getMessage() != null ? e.getMessage() : "Invalid username or password!");
+        }
+
+        return response;
+    }
+
+    @GetMapping("/logout")
+    public String logoutGet(HttpSession session, HttpServletRequest request) {
+        SecurityContextHolder.clearContext();
+        if (session != null) {
+            session.removeAttribute("rental_usrName");
+            session.removeAttribute("rental_usrRole");
+            session.invalidate();
+        }
+        request.getSession(true);
+        return "redirect:/gccrentalmanagement/login";
+    }
+
+    @PostMapping("/logout")
+    public String logoutPost(HttpSession session, HttpServletRequest request) {
+        return logoutGet(session, request);
+    }
+
+    // =========================================================================
+    // MASTER LOOKUPS APIS
+    // =========================================================================
+
+    @GetMapping("/api/departments")
+    @ResponseBody
+    public List<Map<String, Object>> getDepartments(HttpSession session) {
+        return rentalService.getActiveDepartments();
+    }
+
+    @GetMapping("/api/zones")
+    @ResponseBody
+    public List<Map<String, Object>> getZones(HttpSession session) {
+        return rentalService.getActiveZones();
+    }
+
+    @GetMapping("/api/vendors")
+    @ResponseBody
+    public List<Map<String, Object>> getVendors(HttpSession session) {
+        return rentalService.getActiveVendors();
+    }
+
+    @GetMapping("/api/statuses")
+    @ResponseBody
+    public List<Map<String, Object>> getStatuses(
+            @RequestParam(value = "type", required = false) String type,
+            HttpSession session) {
+        return rentalService.getMasterStatuses(type);
+    }
+
+    // =========================================================================
+    // 1. WORK ORDER (WO) APIS
+    // =========================================================================
+
+    @GetMapping("/api/workorders")
+    @ResponseBody
+    public List<Map<String, Object>> getWorkOrders(HttpSession session) {
+        return rentalService.getAllWorkOrders();
+    }
+
+    @PostMapping("/api/workorders/save")
+    @ResponseBody
+    public Map<String, Object> saveWorkOrder(
+            @RequestParam("woFileNo") String woFileNo,
+            @RequestParam("fileSubject") String fileSubject,
+            @RequestParam("periodFromDate") String periodFromDate,
+            @RequestParam("periodToDate") String periodToDate,
+            @RequestParam("vendorName") String vendorName,
+            @RequestParam(value = "systemsQty", defaultValue = "0") Integer systemsQty,
+            @RequestParam(value = "systemsModel", defaultValue = "") String systemsModel,
+            @RequestParam(value = "printersQty", defaultValue = "0") Integer printersQty,
+            @RequestParam(value = "printersModel", defaultValue = "") String printersModel,
+            @RequestParam(value = "laptopsQty", defaultValue = "0") Integer laptopsQty,
+            @RequestParam(value = "laptopsModel", defaultValue = "") String laptopsModel,
+            @RequestParam(value = "woCopyFile", required = false) MultipartFile woCopyFile,
+            @RequestParam(value = "remarks", defaultValue = "") String remarks,
+            HttpSession session) {
+
+        Map<String, Object> response = new HashMap<>();
+        String username = (String) session.getAttribute("rental_usrName");
+        if (username == null) {
+            response.put("success", false);
+            response.put("error", "Unauthorized access. Please log in.");
+            return response;
+        }
+
+        try {
+            File uploadDir = new File(rentalUploadPathConfig).getAbsoluteFile();
+            if (!uploadDir.exists()) uploadDir.mkdirs();
+
+            String woCopyPath = null;
+            if (woCopyFile != null && !woCopyFile.isEmpty()) {
+                woCopyPath = saveUploadedFile(woCopyFile, "wo", uploadDir);
+            }
+
+            boolean saved = rentalService.saveWorkOrder(
+                    woFileNo, fileSubject, periodFromDate, periodToDate, vendorName,
+                    systemsQty, systemsModel, printersQty, printersModel,
+                    laptopsQty, laptopsModel, woCopyPath, remarks, username);
+
+            if (saved) {
+                response.put("success", true);
+                response.put("message", "Work order registered successfully.");
+            } else {
+                response.put("success", false);
+                response.put("error", "Failed to save work order to database.");
+            }
+        } catch (Exception e) {
+            response.put("success", false);
+            response.put("error", "Error: " + e.getMessage());
+        }
+        return response;
+    }
+
+    // =========================================================================
+    // 2. DEPARTMENT USER REQUEST APIS
+    // =========================================================================
+
+    @GetMapping("/api/requests")
+    @ResponseBody
+    public List<Map<String, Object>> getRequests(HttpSession session) {
+        return rentalService.getAllUserRequests();
+    }
+
+    @PostMapping("/api/requests/save")
+    @ResponseBody
+    public Map<String, Object> saveUserRequest(
+            @RequestParam("tapalNo") String tapalNo,
+            @RequestParam("tapalDate") String tapalDate,
+            @RequestParam("deptId") Integer deptId,
+            @RequestParam(value = "zoneId", required = false) Integer zoneId,
+            @RequestParam(value = "reqSystemsQty", defaultValue = "0") Integer reqSystemsQty,
+            @RequestParam(value = "reqPrintersQty", defaultValue = "0") Integer reqPrintersQty,
+            @RequestParam(value = "reqLaptopsQty", defaultValue = "0") Integer reqLaptopsQty,
+            @RequestParam("requiredFromDate") String requiredFromDate,
+            @RequestParam("requiredToDate") String requiredToDate,
+            @RequestParam(value = "mailCopyFile", required = false) MultipartFile mailCopyFile,
+            @RequestParam(value = "reqStatusId", defaultValue = "1") Integer reqStatusId,
+            @RequestParam(value = "requestingOfficer", defaultValue = "") String requestingOfficer,
+            @RequestParam(value = "contactNo", defaultValue = "") String contactNo,
+            @RequestParam(value = "purpose", defaultValue = "") String purpose,
+            HttpSession session) {
+
+        Map<String, Object> response = new HashMap<>();
+        String username = (String) session.getAttribute("rental_usrName");
+        if (username == null) {
+            response.put("success", false);
+            response.put("error", "Unauthorized access. Please log in.");
+            return response;
+        }
+
+        try {
+            File uploadDir = new File(rentalUploadPathConfig).getAbsoluteFile();
+            if (!uploadDir.exists()) uploadDir.mkdirs();
+
+            String mailCopyPath = null;
+            if (mailCopyFile != null && !mailCopyFile.isEmpty()) {
+                mailCopyPath = saveUploadedFile(mailCopyFile, "request_mail", uploadDir);
+            }
+
+            boolean saved = rentalService.saveUserRequest(
+                    tapalNo, tapalDate, deptId, zoneId,
+                    reqSystemsQty, reqPrintersQty, reqLaptopsQty,
+                    requiredFromDate, requiredToDate, mailCopyPath, reqStatusId,
+                    requestingOfficer, contactNo, purpose, username);
+
+            if (saved) {
+                response.put("success", true);
+                response.put("message", "Department request registered successfully.");
+            } else {
+                response.put("success", false);
+                response.put("error", "Failed to save department request.");
+            }
+        } catch (Exception e) {
+            response.put("success", false);
+            response.put("error", "Error: " + e.getMessage());
+        }
+        return response;
+    }
+
+    // =========================================================================
+    // 3. INWARD DELIVERY CHALLAN (DC) APIS
+    // =========================================================================
+
+    @GetMapping("/api/inward-challans")
+    @ResponseBody
+    public List<Map<String, Object>> getInwardChallans(HttpSession session) {
+        return rentalService.getAllInwardChallans();
+    }
+
+    @PostMapping("/api/inward-challans/save")
+    @ResponseBody
+    public Map<String, Object> saveInwardChallan(
+            @RequestParam("woId") Integer woId,
+            @RequestParam("dcNo") String dcNo,
+            @RequestParam("dcDate") String dcDate,
+            @RequestParam(value = "vendorName", defaultValue = "") String vendorName,
+            @RequestParam(value = "inSystemsQty", defaultValue = "0") Integer inSystemsQty,
+            @RequestParam(value = "inPrintersQty", defaultValue = "0") Integer inPrintersQty,
+            @RequestParam(value = "inLaptopsQty", defaultValue = "0") Integer inLaptopsQty,
+            @RequestParam(value = "dcFile", required = false) MultipartFile dcFile,
+            @RequestParam(value = "vehicleNo", defaultValue = "") String vehicleNo,
+            @RequestParam(value = "receivedBy", defaultValue = "") String receivedBy,
+            @RequestParam(value = "remarks", defaultValue = "") String remarks,
+            HttpSession session) {
+
+        Map<String, Object> response = new HashMap<>();
+        String username = (String) session.getAttribute("rental_usrName");
+        if (username == null) {
+            response.put("success", false);
+            response.put("error", "Unauthorized access. Please log in.");
+            return response;
+        }
+
+        try {
+            File uploadDir = new File(rentalUploadPathConfig).getAbsoluteFile();
+            if (!uploadDir.exists()) uploadDir.mkdirs();
+
+            String dcFilePath = null;
+            if (dcFile != null && !dcFile.isEmpty()) {
+                dcFilePath = saveUploadedFile(dcFile, "inward_dc", uploadDir);
+            }
+
+            boolean saved = rentalService.saveInwardChallan(
+                    woId, dcNo, dcDate, vendorName,
+                    inSystemsQty, inPrintersQty, inLaptopsQty,
+                    dcFilePath, vehicleNo, receivedBy, remarks, username);
+
+            if (saved) {
+                response.put("success", true);
+                response.put("message", "Inward Delivery Challan registered successfully.");
+            } else {
+                response.put("success", false);
+                response.put("error", "Failed to save inward Delivery Challan.");
+            }
+        } catch (Exception e) {
+            response.put("success", false);
+            response.put("error", "Error: " + e.getMessage());
+        }
+        return response;
+    }
+
+    // =========================================================================
+    // 4. ISSUED DETAILS APIS
+    // =========================================================================
+
+    @GetMapping("/api/issued-assets")
+    @ResponseBody
+    public List<Map<String, Object>> getIssuedAssets(HttpSession session) {
+        return rentalService.getAllIssuedDetails();
+    }
+
+    @PostMapping("/api/issued-assets/save")
+    @ResponseBody
+    public Map<String, Object> saveIssuedDetails(
+            @RequestParam("requestId") Integer requestId,
+            @RequestParam(value = "inwardDcId", required = false) Integer inwardDcId,
+            @RequestParam(value = "woId", required = false) Integer woId,
+            @RequestParam("issuedDate") String issuedDate,
+            @RequestParam(value = "issuedSystemsQty", defaultValue = "0") Integer issuedSystemsQty,
+            @RequestParam(value = "issuedPrintersQty", defaultValue = "0") Integer issuedPrintersQty,
+            @RequestParam(value = "issuedLaptopsQty", defaultValue = "0") Integer issuedLaptopsQty,
+            @RequestParam(value = "assetSerialDetails", defaultValue = "") String assetSerialDetails,
+            @RequestParam("issuedFromDate") String issuedFromDate,
+            @RequestParam("issuedToDate") String issuedToDate,
+            @RequestParam(value = "stockCopyFile", required = false) MultipartFile stockCopyFile,
+            @RequestParam(value = "custodianOfficer", defaultValue = "") String custodianOfficer,
+            @RequestParam(value = "contactNo", defaultValue = "") String contactNo,
+            @RequestParam(value = "issuedBy", defaultValue = "") String issuedBy,
+            HttpSession session) {
+
+        Map<String, Object> response = new HashMap<>();
+        String username = (String) session.getAttribute("rental_usrName");
+        if (username == null) {
+            response.put("success", false);
+            response.put("error", "Unauthorized access. Please log in.");
+            return response;
+        }
+
+        try {
+            File uploadDir = new File(rentalUploadPathConfig).getAbsoluteFile();
+            if (!uploadDir.exists()) uploadDir.mkdirs();
+
+            String stockCopyPath = null;
+            if (stockCopyFile != null && !stockCopyFile.isEmpty()) {
+                stockCopyPath = saveUploadedFile(stockCopyFile, "issue_stock", uploadDir);
+            }
+
+            boolean saved = rentalService.saveIssuedDetails(
+                    requestId, inwardDcId, woId, issuedDate,
+                    issuedSystemsQty, issuedPrintersQty, issuedLaptopsQty,
+                    assetSerialDetails, issuedFromDate, issuedToDate, stockCopyPath,
+                    custodianOfficer, contactNo, issuedBy, username);
+
+            if (saved) {
+                response.put("success", true);
+                response.put("message", "Asset issued successfully.");
+            } else {
+                response.put("success", false);
+                response.put("error", "Failed to register issued details.");
+            }
+        } catch (Exception e) {
+            response.put("success", false);
+            response.put("error", "Error: " + e.getMessage());
+        }
+        return response;
+    }
+
+    // =========================================================================
+    // 5. RETURN DETAILS APIS
+    // =========================================================================
+
+    @GetMapping("/api/returns")
+    @ResponseBody
+    public List<Map<String, Object>> getReturns(HttpSession session) {
+        return rentalService.getAllReturnDetails();
+    }
+
+    @PostMapping("/api/returns/save")
+    @ResponseBody
+    public Map<String, Object> saveReturnDetails(
+            @RequestParam("issueId") Integer issueId,
+            @RequestParam("requestId") Integer requestId,
+            @RequestParam("returnDate") String returnDate,
+            @RequestParam(value = "retSystemsQty", defaultValue = "0") Integer retSystemsQty,
+            @RequestParam(value = "retPrintersQty", defaultValue = "0") Integer retPrintersQty,
+            @RequestParam(value = "retLaptopsQty", defaultValue = "0") Integer retLaptopsQty,
+            @RequestParam(value = "stockCopyFile", required = false) MultipartFile stockCopyFile,
+            @RequestParam(value = "postReturnStatusId", defaultValue = "6") Integer postReturnStatusId,
+            @RequestParam(value = "conditionGrade", defaultValue = "Good") String conditionGrade,
+            @RequestParam(value = "penaltyCharges", defaultValue = "0.0") Double penaltyCharges,
+            @RequestParam(value = "receivedBy", defaultValue = "") String receivedBy,
+            @RequestParam(value = "remarks", defaultValue = "") String remarks,
+            HttpSession session) {
+
+        Map<String, Object> response = new HashMap<>();
+        String username = (String) session.getAttribute("rental_usrName");
+        if (username == null) {
+            response.put("success", false);
+            response.put("error", "Unauthorized access. Please log in.");
+            return response;
+        }
+
+        try {
+            File uploadDir = new File(rentalUploadPathConfig).getAbsoluteFile();
+            if (!uploadDir.exists()) uploadDir.mkdirs();
+
+            String stockCopyPath = null;
+            if (stockCopyFile != null && !stockCopyFile.isEmpty()) {
+                stockCopyPath = saveUploadedFile(stockCopyFile, "return_stock", uploadDir);
+            }
+
+            boolean saved = rentalService.saveReturnDetails(
+                    issueId, requestId, returnDate,
+                    retSystemsQty, retPrintersQty, retLaptopsQty,
+                    stockCopyPath, postReturnStatusId, conditionGrade,
+                    penaltyCharges, receivedBy, remarks, username);
+
+            if (saved) {
+                response.put("success", true);
+                response.put("message", "Asset return intake processed successfully.");
+            } else {
+                response.put("success", false);
+                response.put("error", "Failed to register return details.");
+            }
+        } catch (Exception e) {
+            response.put("success", false);
+            response.put("error", "Error: " + e.getMessage());
+        }
+        return response;
+    }
+
+    // =========================================================================
+    // 6. REMINDERS & DUE ALERTS API
+    // =========================================================================
+
+    @GetMapping("/api/reminders")
+    @ResponseBody
+    public List<Map<String, Object>> getReminders(HttpSession session) {
+        return rentalService.getOverdueAndDueSoonReminders();
+    }
+
+    // =========================================================================
+    // FILE UPLOAD HELPER METHODS
+    // =========================================================================
+
+    private String saveUploadedFile(MultipartFile file, String prefix, File uploadDir) throws Exception {
+        String originalFilename = file.getOriginalFilename();
+        String extension = "";
+        if (originalFilename != null && originalFilename.contains(".")) {
+            extension = originalFilename.substring(originalFilename.lastIndexOf("."));
+        }
+        String timestamp = new SimpleDateFormat("yyyyMMdd_HHmmss_SSS").format(new Date());
+        String newFilename = prefix + "_" + timestamp + extension;
+
+        File targetFile = new File(uploadDir, newFilename);
+        try (InputStream in = file.getInputStream(); OutputStream out = new FileOutputStream(targetFile)) {
+            byte[] buffer = new byte[8192];
+            int bytesRead;
+            while ((bytesRead = in.read(buffer)) != -1) {
+                out.write(buffer, 0, bytesRead);
+            }
+        }
+        return newFilename;
+    }
+}
diff --git a/src/main/java/com/gcc_manpower/gccrentalmanagement/service/RentalService.java b/src/main/java/com/gcc_manpower/gccrentalmanagement/service/RentalService.java
new file mode 100644
index 0000000..f12289f
--- /dev/null
+++ b/src/main/java/com/gcc_manpower/gccrentalmanagement/service/RentalService.java
@@ -0,0 +1,491 @@
+package com.gcc_manpower.gccrentalmanagement.service;
+
+import java.sql.PreparedStatement;
+import java.sql.Statement;
+import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+public class RentalService {
+
+    private JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    public void setDataSource(@Qualifier("mysqlItcellManagementDataSource") DataSource dataSource) {
+        this.jdbcTemplate = new JdbcTemplate(dataSource);
+    }
+
+    public JdbcTemplate getJdbcTemplate() {
+        return this.jdbcTemplate;
+    }
+
+    // =========================================================================
+    // 1. MASTER LOOKUPS (Departments, Zones, Vendors, Master Statuses)
+    // =========================================================================
+
+    public List<Map<String, Object>> getActiveDepartments() {
+        String sql = "SELECT id, dept_name FROM toner_department_list WHERE (is_active IS NULL OR is_active = 1) AND (is_delete IS NULL OR is_delete = 0) ORDER BY dept_name ASC";
+        try {
+            return jdbcTemplate.queryForList(sql);
+        } catch (Exception e) {
+            return new ArrayList<>();
+        }
+    }
+
+    public List<Map<String, Object>> getActiveZones() {
+        String sql = "SELECT id, zone_name FROM toner_zone_list WHERE (is_active IS NULL OR is_active = 1) AND (is_delete IS NULL OR is_delete = 0) ORDER BY id ASC";
+        try {
+            return jdbcTemplate.queryForList(sql);
+        } catch (Exception e) {
+            return new ArrayList<>();
+        }
+    }
+
+    public List<Map<String, Object>> getActiveVendors() {
+        String sql = "SELECT id, vendor_name FROM payment_vendors_list WHERE (is_active IS NULL OR is_active = 1) AND (is_delete IS NULL OR is_delete = 0) ORDER BY vendor_name ASC";
+        try {
+            return jdbcTemplate.queryForList(sql);
+        } catch (Exception e) {
+            return new ArrayList<>();
+        }
+    }
+
+    public List<Map<String, Object>> getMasterStatuses(String statusType) {
+        String sql;
+        try {
+            if (statusType != null && !statusType.trim().isEmpty() && !"ALL".equalsIgnoreCase(statusType)) {
+                sql = "SELECT id, status_name, status_type, badge_color FROM rental_master_status_list " +
+                        "WHERE (is_active IS NULL OR is_active = 1) AND (is_delete IS NULL OR is_delete = 0) " +
+                        "AND status_type = ? ORDER BY id ASC";
+                return jdbcTemplate.queryForList(sql, statusType.toUpperCase().trim());
+            } else {
+                sql = "SELECT id, status_name, status_type, badge_color FROM rental_master_status_list " +
+                        "WHERE (is_active IS NULL OR is_active = 1) AND (is_delete IS NULL OR is_delete = 0) ORDER BY id ASC";
+                return jdbcTemplate.queryForList(sql);
+            }
+        } catch (Exception e) {
+            return getDefaultStatusFallback(statusType);
+        }
+    }
+
+    private List<Map<String, Object>> getDefaultStatusFallback(String type) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        if ("REQUEST".equalsIgnoreCase(type) || type == null) {
+            list.add(Map.of("id", 1, "status_name", "Pending Sanction", "status_type", "REQUEST", "badge_color",
+                    "warning"));
+            list.add(Map.of("id", 2, "status_name", "Sanctioned & Approved", "status_type", "REQUEST", "badge_color",
+                    "info"));
+            list.add(Map.of("id", 3, "status_name", "Issued to Dept", "status_type", "REQUEST", "badge_color",
+                    "primary"));
+            list.add(Map.of("id", 4, "status_name", "Completed & Returned", "status_type", "REQUEST", "badge_color",
+                    "success"));
+            list.add(Map.of("id", 5, "status_name", "Rejected", "status_type", "REQUEST", "badge_color", "danger"));
+        }
+        if ("RETURN".equalsIgnoreCase(type) || type == null) {
+            list.add(Map.of("id", 6, "status_name", "Completed", "status_type", "RETURN", "badge_color", "success"));
+            list.add(Map.of("id", 7, "status_name", "Partially Returned", "status_type", "RETURN", "badge_color",
+                    "warning"));
+            list.add(
+                    Map.of("id", 8, "status_name", "Pending Return", "status_type", "RETURN", "badge_color", "danger"));
+        }
+        return list;
+    }
+
+    // =========================================================================
+    // 2. WORK ORDER (WO) FILE CREATION & REGISTRY
+    // =========================================================================
+
+    @Transactional
+    public boolean saveWorkOrder(String woFileNo, String fileSubject, String fromDate, String toDate,
+            String vendorName, Integer systemsQty, String systemsModel,
+            Integer printersQty, String printersModel, Integer laptopsQty,
+            String laptopsModel, String woCopyPath, String remarks, String updatedBy) {
+        String sql = "INSERT INTO rental_workorder_register " +
+                "(wo_file_no, file_subject, period_from_date, period_to_date, vendor_name, " +
+                "systems_qty, systems_model_name, printers_qty, printers_model_name, " +
+                "laptops_qty, laptops_model_name, wo_copy_file, status, remarks, created_by, is_active, is_delete) " +
+                "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'Active', ?, ?, 1, 0)";
+        try {
+            int rows = jdbcTemplate.update(sql,
+                    woFileNo != null ? woFileNo.trim() : null,
+                    fileSubject != null ? fileSubject.trim() : null,
+                    fromDate, toDate,
+                    vendorName != null ? vendorName.trim() : null,
+                    systemsQty != null ? systemsQty : 0,
+                    systemsModel != null ? systemsModel.trim() : "",
+                    printersQty != null ? printersQty : 0,
+                    printersModel != null ? printersModel.trim() : "",
+                    laptopsQty != null ? laptopsQty : 0,
+                    laptopsModel != null ? laptopsModel.trim() : "",
+                    woCopyPath, remarks, updatedBy);
+            return rows > 0;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public List<Map<String, Object>> getAllWorkOrders() {
+        String sql = "SELECT id, wo_file_no, file_subject, period_from_date, period_to_date, vendor_name, " +
+                "systems_qty, systems_model_name, printers_qty, printers_model_name, " +
+                "laptops_qty, laptops_model_name, (systems_qty + printers_qty + laptops_qty) AS total_units, " +
+                "wo_copy_file, status, remarks, created_by, created_at " +
+                "FROM rental_workorder_register " +
+                "WHERE (is_active IS NULL OR is_active = 1) AND (is_delete IS NULL OR is_delete = 0) " +
+                "ORDER BY id DESC";
+        try {
+            return jdbcTemplate.queryForList(sql);
+        } catch (Exception e) {
+            return new ArrayList<>();
+        }
+    }
+
+    public Map<String, Object> getWorkOrderById(int id) {
+        String sql = "SELECT * FROM rental_workorder_register WHERE id = ?";
+        try {
+            return jdbcTemplate.queryForMap(sql, id);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    // =========================================================================
+    // 3. DEPARTMENT USER REQUEST CREATION (Tapal, Dept, Zone, Qty, Dates)
+    // =========================================================================
+
+    @Transactional
+    public boolean saveUserRequest(String tapalNo, String tapalDate, Integer deptId, Integer zoneId,
+            Integer reqSystemsQty, Integer reqPrintersQty, Integer reqLaptopsQty,
+            String fromDate, String toDate, String mailCopyPath, Integer statusId,
+            String requestingOfficer, String contactNo, String purpose, String updatedBy) {
+
+        int calculatedDays = calculateDaysBetween(fromDate, toDate);
+        int finalStatusId = (statusId != null && statusId > 0) ? statusId : 1; // Default to 'Pending Sanction'
+
+        String sql = "INSERT INTO rental_user_request " +
+                "(tapal_no, tapal_date, department_id, zone_id, " +
+                "req_systems_qty, req_printers_qty, req_laptops_qty, " +
+                "required_from_date, required_to_date, calculated_days, " +
+                "mail_copy_file, req_status_id, requesting_officer, contact_no, purpose, " +
+                "created_by, is_active, is_delete) " +
+                "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, 0)";
+        try {
+            int rows = jdbcTemplate.update(sql,
+                    tapalNo != null ? tapalNo.trim() : null,
+                    tapalDate,
+                    deptId, zoneId,
+                    reqSystemsQty != null ? reqSystemsQty : 0,
+                    reqPrintersQty != null ? reqPrintersQty : 0,
+                    reqLaptopsQty != null ? reqLaptopsQty : 0,
+                    fromDate, toDate, calculatedDays,
+                    mailCopyPath, finalStatusId,
+                    requestingOfficer != null ? requestingOfficer.trim() : null,
+                    contactNo != null ? contactNo.trim() : null,
+                    purpose, updatedBy);
+            return rows > 0;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public List<Map<String, Object>> getAllUserRequests() {
+        String sql = "SELECT r.id, r.tapal_no, r.tapal_date, r.department_id, d.dept_name, " +
+                "r.zone_id, z.zone_name, r.req_systems_qty, r.req_printers_qty, r.req_laptops_qty, " +
+                "(r.req_systems_qty + r.req_printers_qty + r.req_laptops_qty) AS total_req_qty, " +
+                "r.required_from_date, r.required_to_date, r.calculated_days, r.mail_copy_file, " +
+                "r.req_status_id, COALESCE(s.status_name, 'Pending') AS status_name, " +
+                "COALESCE(s.badge_color, 'warning') AS badge_color, " +
+                "r.requesting_officer, r.contact_no, r.purpose, r.created_by, r.created_at " +
+                "FROM rental_user_request r " +
+                "LEFT JOIN toner_department_list d ON r.department_id = d.id " +
+                "LEFT JOIN toner_zone_list z ON r.zone_id = z.id " +
+                "LEFT JOIN rental_master_status_list s ON r.req_status_id = s.id " +
+                "WHERE (r.is_active IS NULL OR r.is_active = 1) AND (r.is_delete IS NULL OR r.is_delete = 0) " +
+                "ORDER BY r.id DESC";
+        try {
+            return jdbcTemplate.queryForList(sql);
+        } catch (Exception e) {
+            return new ArrayList<>();
+        }
+    }
+
+    @Transactional
+    public boolean updateUserRequestStatus(int requestId, int statusId, String updatedBy) {
+        String sql = "UPDATE rental_user_request SET req_status_id = ? WHERE id = ?";
+        try {
+            return jdbcTemplate.update(sql, statusId, requestId) > 0;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    // =========================================================================
+    // 4. DELIVERY CHALLAN (DC) - INWARD STOCK AGAINST REGISTERED WORK ORDER
+    // =========================================================================
+
+    @Transactional
+    public boolean saveInwardChallan(Integer woId, String dcNo, String dcDate, String vendorName,
+            Integer inSystemsQty, Integer inPrintersQty, Integer inLaptopsQty,
+            String dcFilePath, String vehicleNo, String receivedBy,
+            String remarks, String updatedBy) {
+        String sql = "INSERT INTO rental_inward_delivery_challan " +
+                "(wo_id, dc_no, dc_date, vendor_name, " +
+                "inward_systems_qty, inward_printers_qty, inward_laptops_qty, " +
+                "dc_file_path, vehicle_no, received_by, remarks, created_by, is_active, is_delete) " +
+                "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, 0)";
+        try {
+            int rows = jdbcTemplate.update(sql,
+                    woId,
+                    dcNo != null ? dcNo.trim() : null,
+                    dcDate,
+                    vendorName != null ? vendorName.trim() : null,
+                    inSystemsQty != null ? inSystemsQty : 0,
+                    inPrintersQty != null ? inPrintersQty : 0,
+                    inLaptopsQty != null ? inLaptopsQty : 0,
+                    dcFilePath,
+                    vehicleNo != null ? vehicleNo.trim() : null,
+                    receivedBy != null ? receivedBy.trim() : null,
+                    remarks, updatedBy);
+            return rows > 0;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public List<Map<String, Object>> getAllInwardChallans() {
+        String sql = "SELECT c.id, c.wo_id, w.wo_file_no, w.file_subject, c.dc_no, c.dc_date, " +
+                "COALESCE(c.vendor_name, w.vendor_name) AS vendor_name, " +
+                "c.inward_systems_qty, c.inward_printers_qty, c.inward_laptops_qty, " +
+                "(c.inward_systems_qty + c.inward_printers_qty + c.inward_laptops_qty) AS total_inward_qty, " +
+                "c.dc_file_path, c.vehicle_no, c.received_by, c.remarks, c.created_by, c.created_at " +
+                "FROM rental_inward_delivery_challan c " +
+                "LEFT JOIN rental_workorder_register w ON c.wo_id = w.id " +
+                "WHERE (c.is_active IS NULL OR c.is_active = 1) AND (c.is_delete IS NULL OR c.is_delete = 0) " +
+                "ORDER BY c.id DESC";
+        try {
+            return jdbcTemplate.queryForList(sql);
+        } catch (Exception e) {
+            return new ArrayList<>();
+        }
+    }
+
+    // =========================================================================
+    // 5. ISSUED DETAILS (From Inward Stock & User Request)
+    // =========================================================================
+
+    @Transactional
+    public boolean saveIssuedDetails(Integer requestId, Integer inwardDcId, Integer woId,
+            String issuedDate, Integer issuedSystemsQty, Integer issuedPrintersQty,
+            Integer issuedLaptopsQty, String assetSerialDetails,
+            String issuedFromDate, String issuedToDate, String stockCopyPath,
+            String custodianOfficer, String contactNo, String issuedBy, String updatedBy) {
+
+        int periodDays = calculateDaysBetween(issuedFromDate, issuedToDate);
+
+        String sql = "INSERT INTO rental_issued_details " +
+                "(request_id, inward_dc_id, wo_id, issued_date, " +
+                "issued_systems_qty, issued_printers_qty, issued_laptops_qty, " +
+                "asset_serial_details, issued_from_date, issued_to_date, issued_period_days, " +
+                "stock_copy_path, custodian_officer, contact_no, issued_by, status, " +
+                "created_by, is_active, is_delete) " +
+                "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'Issued', ?, 1, 0)";
+        try {
+            int rows = jdbcTemplate.update(sql,
+                    requestId, inwardDcId, woId, issuedDate,
+                    issuedSystemsQty != null ? issuedSystemsQty : 0,
+                    issuedPrintersQty != null ? issuedPrintersQty : 0,
+                    issuedLaptopsQty != null ? issuedLaptopsQty : 0,
+                    assetSerialDetails, issuedFromDate, issuedToDate, periodDays,
+                    stockCopyPath,
+                    custodianOfficer != null ? custodianOfficer.trim() : null,
+                    contactNo != null ? contactNo.trim() : null,
+                    issuedBy != null ? issuedBy.trim() : null,
+                    updatedBy);
+
+            if (rows > 0 && requestId != null) {
+                // Automatically update request status to 'Issued' (status_id = 3)
+                jdbcTemplate.update("UPDATE rental_user_request SET req_status_id = 3 WHERE id = ?", requestId);
+            }
+            return rows > 0;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public List<Map<String, Object>> getAllIssuedDetails() {
+        String sql = "SELECT i.id, i.request_id, r.tapal_no, d.dept_name, z.zone_name, " +
+                "i.inward_dc_id, dc.dc_no, i.wo_id, w.wo_file_no, i.issued_date, " +
+                "i.issued_systems_qty, i.issued_printers_qty, i.issued_laptops_qty, " +
+                "(i.issued_systems_qty + i.issued_printers_qty + i.issued_laptops_qty) AS total_issued_qty, " +
+                "i.asset_serial_details, i.issued_from_date, i.issued_to_date, i.issued_period_days, " +
+                "i.stock_copy_path, i.custodian_officer, i.contact_no, i.issued_by, i.status, " +
+                "i.created_by, i.created_at, " +
+                "COALESCE(ret.total_returned_qty, 0) AS total_returned_qty " +
+                "FROM rental_issued_details i " +
+                "LEFT JOIN rental_user_request r ON i.request_id = r.id " +
+                "LEFT JOIN toner_department_list d ON r.department_id = d.id " +
+                "LEFT JOIN toner_zone_list z ON r.zone_id = z.id " +
+                "LEFT JOIN rental_inward_delivery_challan dc ON i.inward_dc_id = dc.id " +
+                "LEFT JOIN rental_workorder_register w ON i.wo_id = w.id " +
+                "LEFT JOIN (SELECT issue_id, SUM(returned_systems_qty + returned_printers_qty + returned_laptops_qty) AS total_returned_qty "
+                +
+                "           FROM rental_return_details WHERE is_delete = 0 GROUP BY issue_id) ret ON i.id = ret.issue_id "
+                +
+                "WHERE (i.is_active IS NULL OR i.is_active = 1) AND (i.is_delete IS NULL OR i.is_delete = 0) " +
+                "ORDER BY i.id DESC";
+        try {
+            return jdbcTemplate.queryForList(sql);
+        } catch (Exception e) {
+            return new ArrayList<>();
+        }
+    }
+
+    // =========================================================================
+    // 6. RETURN DETAILS (Return Date, Returned Qty, Stock Copy, Status)
+    // =========================================================================
+
+    @Transactional
+    public boolean saveReturnDetails(Integer issueId, Integer requestId, String returnDate,
+            Integer retSystemsQty, Integer retPrintersQty, Integer retLaptopsQty,
+            String stockCopyPath, Integer postReturnStatusId, String conditionGrade,
+            Double penaltyCharges, String receivedBy, String remarks, String updatedBy) {
+
+        int finalStatusId = (postReturnStatusId != null && postReturnStatusId > 0) ? postReturnStatusId : 6; // Default
+                                                                                                             // to
+                                                                                                             // 'Completed'
+
+        String sql = "INSERT INTO rental_return_details " +
+                "(issue_id, request_id, return_date, " +
+                "returned_systems_qty, returned_printers_qty, returned_laptops_qty, " +
+                "stock_copy_path, post_return_status_id, condition_grade, penalty_charges, " +
+                "received_by, remarks, created_by, is_active, is_delete) " +
+                "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, 0)";
+        try {
+            int rows = jdbcTemplate.update(sql,
+                    issueId, requestId, returnDate,
+                    retSystemsQty != null ? retSystemsQty : 0,
+                    retPrintersQty != null ? retPrintersQty : 0,
+                    retLaptopsQty != null ? retLaptopsQty : 0,
+                    stockCopyPath, finalStatusId,
+                    conditionGrade != null ? conditionGrade.trim() : "Good",
+                    penaltyCharges != null ? penaltyCharges : 0.0,
+                    receivedBy != null ? receivedBy.trim() : null,
+                    remarks, updatedBy);
+
+            if (rows > 0) {
+                // Update issued details status
+                String postStatusText = (finalStatusId == 6) ? "Returned - Completed" : "Partially Returned";
+                if (issueId != null) {
+                    jdbcTemplate.update("UPDATE rental_issued_details SET status = ? WHERE id = ?", postStatusText,
+                            issueId);
+                }
+                if (requestId != null && finalStatusId == 6) {
+                    jdbcTemplate.update("UPDATE rental_user_request SET req_status_id = 4 WHERE id = ?", requestId); // 4
+                                                                                                                     // =
+                                                                                                                     // Completed
+                }
+            }
+            return rows > 0;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public List<Map<String, Object>> getAllReturnDetails() {
+        String sql = "SELECT rt.id, rt.issue_id, rt.request_id, r.tapal_no, d.dept_name, z.zone_name, " +
+                "iss.custodian_officer, iss.issued_to_date, rt.return_date, " +
+                "rt.returned_systems_qty, rt.returned_printers_qty, rt.returned_laptops_qty, " +
+                "(rt.returned_systems_qty + rt.returned_printers_qty + rt.returned_laptops_qty) AS total_returned_qty, "
+                +
+                "rt.stock_copy_path, rt.post_return_status_id, " +
+                "COALESCE(s.status_name, 'Completed') AS post_return_status_name, " +
+                "COALESCE(s.badge_color, 'success') AS badge_color, " +
+                "rt.condition_grade, rt.penalty_charges, rt.received_by, rt.remarks, " +
+                "rt.created_by, rt.created_at " +
+                "FROM rental_return_details rt " +
+                "LEFT JOIN rental_issued_details iss ON rt.issue_id = iss.id " +
+                "LEFT JOIN rental_user_request r ON rt.request_id = r.id " +
+                "LEFT JOIN toner_department_list d ON r.department_id = d.id " +
+                "LEFT JOIN toner_zone_list z ON r.zone_id = z.id " +
+                "LEFT JOIN rental_master_status_list s ON rt.post_return_status_id = s.id " +
+                "WHERE (rt.is_active IS NULL OR rt.is_active = 1) AND (rt.is_delete IS NULL OR rt.is_delete = 0) " +
+                "ORDER BY rt.id DESC";
+        try {
+            return jdbcTemplate.queryForList(sql);
+        } catch (Exception e) {
+            return new ArrayList<>();
+        }
+    }
+
+    // =========================================================================
+    // 7. REAL-TIME DATE MATH & REMINDERS CALCULATION
+    // =========================================================================
+
+    public List<Map<String, Object>> getOverdueAndDueSoonReminders() {
+        List<Map<String, Object>> issuedList = getAllIssuedDetails();
+        List<Map<String, Object>> result = new ArrayList<>();
+
+        LocalDate today = LocalDate.now();
+
+        for (Map<String, Object> item : issuedList) {
+            Object dueDateObj = item.get("issued_to_date");
+            if (dueDateObj == null)
+                continue;
+
+            try {
+                LocalDate dueDate = LocalDate.parse(dueDateObj.toString());
+                long daysDiff = ChronoUnit.DAYS.between(today, dueDate);
+
+                Map<String, Object> alert = new HashMap<>(item);
+                alert.put("daysDiff", daysDiff);
+
+                if (daysDiff < 0) {
+                    alert.put("calculated_status", "OVERDUE");
+                    alert.put("overdue_days", Math.abs(daysDiff));
+                    alert.put("badge_class", "status-overdue");
+                    alert.put("status_label", "OVERDUE by " + Math.abs(daysDiff) + " Days");
+                    result.add(alert);
+                } else if (daysDiff <= 7) {
+                    alert.put("calculated_status", "DUE_SOON");
+                    alert.put("due_days", daysDiff);
+                    alert.put("badge_class", "status-due-soon");
+                    alert.put("status_label", "Due in " + daysDiff + " Days");
+                    result.add(alert);
+                }
+            } catch (Exception ignored) {
+            }
+        }
+        return result;
+    }
+
+    private int calculateDaysBetween(String fromDateStr, String toDateStr) {
+        if (fromDateStr == null || toDateStr == null)
+            return 0;
+        try {
+            LocalDate from = LocalDate.parse(fromDateStr);
+            LocalDate to = LocalDate.parse(toDateStr);
+            long days = ChronoUnit.DAYS.between(from, to) + 1;
+            return (int) Math.max(days, 0);
+        } catch (Exception e) {
+            return 0;
+        }
+    }
+}
diff --git a/src/main/java/com/gcc_manpower/gcctonermanagement/controller/TonerController.java b/src/main/java/com/gcc_manpower/gcctonermanagement/controller/TonerController.java
index 7bec3be..d9df303 100644
--- a/src/main/java/com/gcc_manpower/gcctonermanagement/controller/TonerController.java
+++ b/src/main/java/com/gcc_manpower/gcctonermanagement/controller/TonerController.java
@@ -164,6 +164,8 @@ public class TonerController {
             @RequestParam("refNo") String refNo,
             @RequestParam("companyName") String companyName,
             @RequestParam("itemsJson") String itemsJson,
+            @RequestParam(value = "dcNo", required = false) String dcNo,
+            @RequestParam(value = "dcDate", required = false) String dcDate,
             @RequestParam(value = "dcFile", required = false) MultipartFile dcFile,
             HttpSession session) {
 
@@ -211,7 +213,7 @@ public class TonerController {
             String dcPath = saveUploadedFile(dcFile, "dc", uploadDir);
 
             boolean saved = tonerService.saveInwardRegister(
-                    refNo.trim(), companyName.trim(), items, dcPath, updatedBy);
+                    refNo.trim(), companyName.trim(), items, dcPath, dcNo, dcDate, updatedBy);
 
             if (saved) {
                 response.put("success", true);
@@ -236,6 +238,7 @@ public class TonerController {
             @RequestParam("deptId") String deptId,
             @RequestParam(value = "zoneId", required = false) String zoneId,
             @RequestParam("itemsJson") String itemsJson,
+            @RequestParam(value = "requestDate", required = false) String requestDate,
             @RequestParam(value = "userRequestFile", required = false) MultipartFile userRequestFile,
             HttpSession session) {
 
@@ -284,7 +287,7 @@ public class TonerController {
 
             String safeZoneId = (zoneId != null && !zoneId.trim().isEmpty()) ? zoneId.trim() : null;
             boolean saved = tonerService.saveUserRequest(
-                    itcellRefNo.trim(), deptId.trim(), safeZoneId, items, urPath, updatedBy);
+                    itcellRefNo.trim(), deptId.trim(), safeZoneId, items, urPath, requestDate, updatedBy);
 
             if (saved) {
                 response.put("success", true);
@@ -312,6 +315,7 @@ public class TonerController {
             @RequestParam("pid") int pid,
             @RequestParam("tid") int tid,
             @RequestParam("qtyRequested") int qtyRequested,
+            @RequestParam(value = "requestDate", required = false) String requestDate,
             @RequestParam(value = "userRequestFile", required = false) MultipartFile userRequestFile,
             HttpSession session) {
 
@@ -364,7 +368,8 @@ public class TonerController {
 
             String safeZoneId = (zoneId != null && !zoneId.trim().isEmpty()) ? zoneId.trim() : null;
             boolean updated = tonerService.updateUserRequest(
-                    id, itcellRefNo.trim(), deptId.trim(), safeZoneId, pid, tid, qtyRequested, urPath, updatedBy);
+                    id, itcellRefNo.trim(), deptId.trim(), safeZoneId, pid, tid, qtyRequested, urPath, requestDate,
+                    updatedBy);
 
             if (updated) {
                 response.put("success", true);
@@ -387,8 +392,11 @@ public class TonerController {
     @PostMapping("/api/outward")
     @ResponseBody
     public Map<String, Object> uploadOutward(
-            @RequestParam("id") int id,
-            @RequestParam("qtyIssued") String qtyIssued,
+            @RequestParam(value = "id", required = false) Integer id,
+            @RequestParam(value = "ids", required = false) String idsJson,
+            @RequestParam(value = "qtyIssued", required = false) String qtyIssued,
+            @RequestParam(value = "itemsJson", required = false) String itemsJson,
+            @RequestParam(value = "outwardDate", required = false) String outwardDate,
             @RequestParam(value = "finalDeliveredFile", required = false) MultipartFile finalDeliveredFile,
             @RequestParam(value = "userPhotoFile", required = false) MultipartFile userPhotoFile,
             @RequestParam(value = "userPhotoBase64", required = false) String userPhotoBase64,
@@ -412,13 +420,6 @@ public class TonerController {
                 response.put("error", "Final Delivered file must be a PDF.");
                 return response;
             }
-            boolean hasPhoto = (userPhotoFile != null && !userPhotoFile.isEmpty())
-                    || (userPhotoBase64 != null && !userPhotoBase64.trim().isEmpty());
-            if (!hasPhoto) {
-                response.put("success", false);
-                response.put("error", "Receiver / User photo is mandatory.");
-                return response;
-            }
         }
 
         if (userPhotoFile != null && !userPhotoFile.isEmpty() && !isImageFile(userPhotoFile)) {
@@ -427,108 +428,154 @@ public class TonerController {
             return response;
         }
 
-        Map<String, Object> req = tonerService.getUserRequestById(id);
-        if (req == null) {
-            response.put("success", false);
-            response.put("error", "Invalid or non-existent request ID: " + id);
-            return response;
-        }
+        ObjectMapper mapper = new ObjectMapper();
 
         boolean isInitialDelivery = (finalDeliveredFile == null || finalDeliveredFile.isEmpty()) &&
                 (userPhotoFile == null || userPhotoFile.isEmpty()) &&
                 (userPhotoBase64 == null || userPhotoBase64.trim().isEmpty());
 
-        if (isInitialDelivery) {
-            int issueQty = 0;
-            try {
-                issueQty = Integer.parseInt(qtyIssued.trim());
-            } catch (Exception e) {
-                response.put("success", false);
-                response.put("error", "Invalid quantity issued value.");
-                return response;
-            }
-
-            if (issueQty <= 0) {
-                response.put("success", false);
-                response.put("error", "Quantity issued must be greater than zero.");
-                return response;
-            }
-
-            String pid = String.valueOf(req.get("pid"));
-            String tid = String.valueOf(req.get("tid"));
-            String modelName = req.get("model_name") != null ? String.valueOf(req.get("model_name")) : "Toner";
-            String printerName = req.get("printer_name") != null ? String.valueOf(req.get("printer_name")) : "Printer";
+        try {
+            if (isInitialDelivery) {
+                List<Map<String, Object>> items = new ArrayList<>();
+                if (itemsJson != null && !itemsJson.trim().isEmpty()) {
+                    items = mapper.readValue(itemsJson, new TypeReference<List<Map<String, Object>>>() {
+                    });
+                } else if (id != null && qtyIssued != null) {
+                    Map<String, Object> single = new HashMap<>();
+                    single.put("id", id);
+                    single.put("qtyIssued", qtyIssued);
+                    items.add(single);
+                }
 
-            int availableStock = tonerService.getAvailableStockForModel(pid, tid);
+                if (items == null || items.isEmpty()) {
+                    response.put("success", false);
+                    response.put("error", "Please enter quantity to issue for at least one model.");
+                    return response;
+                }
 
-            if (availableStock <= 0) {
-                response.put("success", false);
-                response.put("error", "Cannot issue: No inward stock available for " + printerName + " - " + modelName
-                        + ". Please register inward stock before issuing outward delivery.");
-                return response;
-            }
+                // Validate each item
+                for (Map<String, Object> itm : items) {
+                    Integer itmId = parseIntegerSafely(itm.get("id"));
+                    Integer itmQty = parseIntegerSafely(itm.get("qtyIssued"));
+                    if (itmId == null || itmQty == null || itmQty <= 0)
+                        continue;
+
+                    Map<String, Object> req = tonerService.getUserRequestById(itmId);
+                    if (req == null) {
+                        response.put("success", false);
+                        response.put("error", "Invalid or non-existent request ID: " + itmId);
+                        return response;
+                    }
+
+                    String pid = String.valueOf(req.get("pid"));
+                    String tid = String.valueOf(req.get("tid"));
+                    String modelName = req.get("model_name") != null ? String.valueOf(req.get("model_name")) : "Toner";
+                    String printerName = req.get("printer_name") != null ? String.valueOf(req.get("printer_name"))
+                            : "Printer";
+
+                    int availableStock = tonerService.getAvailableStockForModel(pid, tid);
+                    if (availableStock <= 0) {
+                        response.put("success", false);
+                        response.put("error",
+                                "Cannot issue: No inward stock available for " + printerName + " - " + modelName + ".");
+                        return response;
+                    }
+                    if (itmQty > availableStock) {
+                        response.put("success", false);
+                        response.put("error",
+                                "Cannot issue: Quantity to issue (" + itmQty + ") exceeds available inward stock ("
+                                        + availableStock + ") for " + printerName + " - " + modelName + ".");
+                        return response;
+                    }
+
+                    int requestedQty = 0;
+                    int alreadyDelivered = 0;
+                    try {
+                        if (req.get("qty_requested") != null)
+                            requestedQty = Integer.parseInt(String.valueOf(req.get("qty_requested")));
+                        if (req.get("qty_delivered") != null)
+                            alreadyDelivered = Integer.parseInt(String.valueOf(req.get("qty_delivered")));
+                    } catch (Exception ignored) {
+                    }
+
+                    int remainingReq = Math.max(0, requestedQty - alreadyDelivered);
+                    if (itmQty > remainingReq) {
+                        response.put("success", false);
+                        response.put("error",
+                                "Cannot issue: Quantity to issue (" + itmQty
+                                        + ") exceeds remaining requested quantity (" + remainingReq + ") for "
+                                        + printerName + " - " + modelName + ".");
+                        return response;
+                    }
+                }
 
-            if (issueQty > availableStock) {
-                response.put("success", false);
-                response.put("error",
-                        "Cannot issue: Quantity to issue (" + issueQty + ") exceeds available inward stock ("
-                                + availableStock + ") for " + printerName + " - " + modelName + ".");
+                boolean saved = tonerService.saveOutwardRegisterBulk(items, outwardDate, updatedBy);
+                if (saved) {
+                    response.put("success", true);
+                    response.put("message", "Outward delivery recorded successfully.");
+                } else {
+                    response.put("success", false);
+                    response.put("error", "Failed to update outward details in database.");
+                }
                 return response;
-            }
-
-            int requestedQty = 0;
-            int alreadyDelivered = 0;
-            try {
-                if (req.get("qty_requested") != null) {
-                    requestedQty = Integer.parseInt(String.valueOf(req.get("qty_requested")));
+            } else {
+                // Uploading Proof / Acknowledgement / Photo
+                List<Integer> targetIds = new ArrayList<>();
+                if (idsJson != null && !idsJson.trim().isEmpty()) {
+                    try {
+                        if (idsJson.trim().startsWith("[")) {
+                            targetIds = mapper.readValue(idsJson, new TypeReference<List<Integer>>() {
+                            });
+                        } else {
+                            for (String s : idsJson.split(",")) {
+                                if (!s.trim().isEmpty())
+                                    targetIds.add(Integer.parseInt(s.trim()));
+                            }
+                        }
+                    } catch (Exception ignored) {
+                    }
                 }
-                if (req.get("qty_delivered") != null) {
-                    alreadyDelivered = Integer.parseInt(String.valueOf(req.get("qty_delivered")));
+                if (targetIds.isEmpty() && id != null) {
+                    targetIds.add(id);
                 }
-            } catch (Exception ignored) {
-            }
 
-            int remainingReq = Math.max(0, requestedQty - alreadyDelivered);
-            if (issueQty > remainingReq) {
-                response.put("success", false);
-                response.put("error", "Cannot issue: Quantity to issue (" + issueQty
-                        + ") exceeds remaining requested quantity (" + remainingReq + ").");
-                return response;
-            }
-        }
-
-        try {
-            File uploadDir = new File(tonerUploadPathConfig).getAbsoluteFile();
-            if (!uploadDir.exists()) {
-                uploadDir.mkdirs();
-            }
+                if (targetIds.isEmpty()) {
+                    response.put("success", false);
+                    response.put("error", "No request ID specified for uploading proof.");
+                    return response;
+                }
 
-            String fdPath = saveUploadedFile(finalDeliveredFile, "final_delivered", uploadDir);
-            String photoPath = null;
-            if (userPhotoFile != null && !userPhotoFile.isEmpty()) {
-                photoPath = saveUploadedFile(userPhotoFile, "receiver_photo", uploadDir);
-            } else if (userPhotoBase64 != null && !userPhotoBase64.trim().isEmpty()) {
-                photoPath = saveBase64Image(userPhotoBase64, "receiver_photo", uploadDir);
-            }
+                File uploadDir = new File(tonerUploadPathConfig).getAbsoluteFile();
+                if (!uploadDir.exists()) {
+                    uploadDir.mkdirs();
+                }
 
-            boolean saved = tonerService.saveOutwardRegister(
-                    id, qtyIssued.trim(), fdPath, photoPath, updatedBy);
+                String fdPath = saveUploadedFile(finalDeliveredFile, "final_delivered", uploadDir);
+                String photoPath = null;
+                if (userPhotoFile != null && !userPhotoFile.isEmpty()) {
+                    photoPath = saveUploadedFile(userPhotoFile, "receiver_photo", uploadDir);
+                } else if (userPhotoBase64 != null && !userPhotoBase64.trim().isEmpty()) {
+                    photoPath = saveBase64Image(userPhotoBase64, "receiver_photo", uploadDir);
+                }
 
-            if (saved) {
-                response.put("success", true);
-                response.put("message", "Outward delivery recorded successfully.");
-            } else {
-                deleteFileIfExists(fdPath, uploadDir);
-                deleteFileIfExists(photoPath, uploadDir);
-                response.put("success", false);
-                response.put("error", "Failed to update outward details in the database.");
+                boolean saved = tonerService.updateOutwardDeliveryFiles(targetIds, fdPath, photoPath, updatedBy);
+                if (saved) {
+                    response.put("success", true);
+                    response.put("message", "Outward delivery proof uploaded successfully.");
+                } else {
+                    deleteFileIfExists(fdPath, uploadDir);
+                    deleteFileIfExists(photoPath, uploadDir);
+                    response.put("success", false);
+                    response.put("error", "Failed to update outward delivery proof.");
+                }
+                return response;
             }
         } catch (Exception e) {
             response.put("success", false);
             response.put("error", "An error occurred: " + e.getMessage());
             e.printStackTrace();
+            return response;
         }
-        return response;
     }
 
     @PostMapping("/api/workorder")
@@ -663,6 +710,16 @@ public class TonerController {
         return tonerService.getOutwardHistory();
     }
 
+    private Integer parseIntegerSafely(Object val) {
+        if (val == null)
+            return null;
+        try {
+            return Integer.parseInt(String.valueOf(val).trim());
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
     private boolean isPdfFile(MultipartFile file) {
         String originalFilename = file.getOriginalFilename();
         if (originalFilename == null)
@@ -741,11 +798,11 @@ public class TonerController {
 
     @GetMapping("/api/workorders/active")
     @ResponseBody
-    public List<String> getActiveWorkorderRefNos(HttpSession session) {
+    public List<Map<String, Object>> getActiveWorkorderRefNos(HttpSession session) {
         if (session.getAttribute("toner_usrName") == null) {
             return new ArrayList<>();
         }
-        return tonerService.getActiveWorkorderRefNos();
+        return tonerService.getActiveWorkorders();
     }
 
     @GetMapping("/api/workorders/items")
diff --git a/src/main/java/com/gcc_manpower/gcctonermanagement/service/TonerService.java b/src/main/java/com/gcc_manpower/gcctonermanagement/service/TonerService.java
index 3cda3c3..e69d234 100644
--- a/src/main/java/com/gcc_manpower/gcctonermanagement/service/TonerService.java
+++ b/src/main/java/com/gcc_manpower/gcctonermanagement/service/TonerService.java
@@ -12,6 +12,7 @@ import java.util.Map;
 import javax.sql.DataSource;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
@@ -61,6 +62,21 @@ public class TonerService {
         return map;
     }
 
+    private Map<String, String> getTonerPartCodeMap() {
+        Map<String, String> map = new HashMap<>();
+        try {
+            List<Map<String, Object>> list = jdbcTemplate.queryForList(
+                    "SELECT id, part_code FROM toner_model_list WHERE (is_active IS NULL OR is_active = 1) AND (is_delete IS NULL OR is_delete = 0)");
+            for (Map<String, Object> row : list) {
+                if (row.get("id") != null && row.get("part_code") != null) {
+                    map.put(String.valueOf(row.get("id")).trim(), String.valueOf(row.get("part_code")).trim());
+                }
+            }
+        } catch (Exception ignored) {
+        }
+        return map;
+    }
+
     private Map<String, String> getDepartmentMap() {
         Map<String, String> map = new HashMap<>();
         try {
@@ -225,7 +241,8 @@ public class TonerService {
     // ================ Adding department & toners & printers ================
 
     public boolean savenewdepartment(String department) {
-        if (department == null || department.trim().isEmpty()) return false;
+        if (department == null || department.trim().isEmpty())
+            return false;
         String cleanDept = department.trim();
         try {
             String sql = "INSERT INTO toner_department_list (dept_name, is_active, is_delete) VALUES (?, 1, 0)";
@@ -250,7 +267,8 @@ public class TonerService {
     }
 
     public boolean savetonermodel(int pid, String modelname, String partcode) {
-        if (pid <= 0 || modelname == null || modelname.trim().isEmpty()) return false;
+        if (pid <= 0 || modelname == null || modelname.trim().isEmpty())
+            return false;
         String cleanModel = modelname.trim();
         String cleanPart = (partcode != null && !partcode.trim().isEmpty()) ? partcode.trim() : null;
         try {
@@ -270,7 +288,8 @@ public class TonerService {
     }
 
     public boolean saveprintermodel(String printermodel) {
-        if (printermodel == null || printermodel.trim().isEmpty()) return false;
+        if (printermodel == null || printermodel.trim().isEmpty())
+            return false;
         String cleanPrinter = printermodel.trim();
         try {
             String sql = "INSERT INTO toner_printer_model_list (printer_name, is_active, is_delete) VALUES (?, 1, 0)";
@@ -289,7 +308,8 @@ public class TonerService {
     }
 
     public boolean updatePrinterModel(int id, String printermodel) {
-        if (id <= 0 || printermodel == null || printermodel.trim().isEmpty()) return false;
+        if (id <= 0 || printermodel == null || printermodel.trim().isEmpty())
+            return false;
         String cleanPrinter = printermodel.trim();
         try {
             String sql = "UPDATE toner_printer_model_list SET printer_name = ? WHERE id = ?";
@@ -301,7 +321,8 @@ public class TonerService {
     }
 
     public boolean updateTonerModel(int id, int pid, String modelname, String partcode) {
-        if (id <= 0 || pid <= 0 || modelname == null || modelname.trim().isEmpty()) return false;
+        if (id <= 0 || pid <= 0 || modelname == null || modelname.trim().isEmpty())
+            return false;
         String cleanModel = modelname.trim();
         String cleanPart = (partcode != null && !partcode.trim().isEmpty()) ? partcode.trim() : null;
         try {
@@ -314,7 +335,8 @@ public class TonerService {
     }
 
     public boolean updateDepartment(int id, String department) {
-        if (id <= 0 || department == null || department.trim().isEmpty()) return false;
+        if (id <= 0 || department == null || department.trim().isEmpty())
+            return false;
         String cleanDept = department.trim();
         try {
             String sql = "UPDATE toner_department_list SET dept_name = ? WHERE id = ?";
@@ -331,7 +353,8 @@ public class TonerService {
     }
 
     public boolean deletePrinterModel(int id) {
-        if (id <= 0) return false;
+        if (id <= 0)
+            return false;
         try {
             String sql = "UPDATE toner_printer_model_list SET is_active = 0, is_delete = 1 WHERE id = ?";
             return jdbcTemplate.update(sql, id) > 0;
@@ -342,7 +365,8 @@ public class TonerService {
     }
 
     public boolean restorePrinterModel(int id) {
-        if (id <= 0) return false;
+        if (id <= 0)
+            return false;
         try {
             String sql = "UPDATE toner_printer_model_list SET is_active = 1, is_delete = 0 WHERE id = ?";
             return jdbcTemplate.update(sql, id) > 0;
@@ -353,7 +377,8 @@ public class TonerService {
     }
 
     public boolean deleteTonerModel(int id) {
-        if (id <= 0) return false;
+        if (id <= 0)
+            return false;
         try {
             String sql = "UPDATE toner_model_list SET is_active = 0, is_delete = 1 WHERE id = ?";
             return jdbcTemplate.update(sql, id) > 0;
@@ -364,7 +389,8 @@ public class TonerService {
     }
 
     public boolean restoreTonerModel(int id) {
-        if (id <= 0) return false;
+        if (id <= 0)
+            return false;
         try {
             String sql = "UPDATE toner_model_list SET is_active = 1, is_delete = 0 WHERE id = ?";
             return jdbcTemplate.update(sql, id) > 0;
@@ -375,7 +401,8 @@ public class TonerService {
     }
 
     public boolean deleteDepartment(int id) {
-        if (id <= 0) return false;
+        if (id <= 0)
+            return false;
         try {
             String sql = "UPDATE toner_department_list SET is_active = 0, is_delete = 1 WHERE id = ?";
             return jdbcTemplate.update(sql, id) > 0;
@@ -386,7 +413,8 @@ public class TonerService {
     }
 
     public boolean restoreDepartment(int id) {
-        if (id <= 0) return false;
+        if (id <= 0)
+            return false;
         try {
             String sql = "UPDATE toner_department_list SET is_active = 1, is_delete = 0 WHERE id = ?";
             return jdbcTemplate.update(sql, id) > 0;
@@ -417,14 +445,17 @@ public class TonerService {
         try {
             String sql;
             if ("deleted".equalsIgnoreCase(status)) {
-                sql = "SELECT t.id, t.pid, t.model_name, t.part_code, p.printer_name, t.is_active, t.is_delete FROM toner_model_list t " +
+                sql = "SELECT t.id, t.pid, t.model_name, t.part_code, p.printer_name, t.is_active, t.is_delete FROM toner_model_list t "
+                        +
                         "LEFT JOIN toner_printer_model_list p ON t.pid = p.id " +
                         "WHERE (t.is_delete = 1 OR t.is_active = 0) ORDER BY t.id DESC";
             } else if ("all".equalsIgnoreCase(status)) {
-                sql = "SELECT t.id, t.pid, t.model_name, t.part_code, p.printer_name, t.is_active, t.is_delete FROM toner_model_list t " +
+                sql = "SELECT t.id, t.pid, t.model_name, t.part_code, p.printer_name, t.is_active, t.is_delete FROM toner_model_list t "
+                        +
                         "LEFT JOIN toner_printer_model_list p ON t.pid = p.id ORDER BY p.printer_name ASC, t.model_name ASC";
             } else {
-                sql = "SELECT t.id, t.pid, t.model_name, t.part_code, p.printer_name, t.is_active, t.is_delete FROM toner_model_list t " +
+                sql = "SELECT t.id, t.pid, t.model_name, t.part_code, p.printer_name, t.is_active, t.is_delete FROM toner_model_list t "
+                        +
                         "LEFT JOIN toner_printer_model_list p ON t.pid = p.id " +
                         "WHERE (t.is_active IS NULL OR t.is_active = 1) AND (t.is_delete IS NULL OR t.is_delete = 0) " +
                         "ORDER BY p.printer_name ASC, t.model_name ASC";
@@ -535,12 +566,14 @@ public class TonerService {
     // ================= INWARD STOCK REGISTER =================
     @Transactional
     public boolean saveInwardRegister(String refNo, String companyName, List<Map<String, Object>> items,
-            String dcUpload, String username) {
+            String dcUpload, String dcNo, String dcDate, String username) {
         String sql = "INSERT INTO toner_stock_register_details " +
-                "(ref_no, company_name, pid, tid, qty_registered, dc_upload, cdate, updated_date, updated_by, is_active, is_delete, request_id) "
+                "(ref_no, company_name, pid, tid, qty_registered, dc_upload, dc_no, dc_date, cdate, updated_date, updated_by, is_active, is_delete, request_id) "
                 +
-                "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 1, 0, ?)";
+                "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, 0, ?)";
         Timestamp now = new Timestamp(System.currentTimeMillis());
+        String finalDcNo = (dcNo != null && !dcNo.trim().isEmpty()) ? dcNo.trim() : null;
+        String finalDcDate = (dcDate != null && !dcDate.trim().isEmpty()) ? dcDate.trim() : null;
         try {
             for (Map<String, Object> item : items) {
                 Integer pidVal = parseIntegerSafely(item.get("pid"));
@@ -558,7 +591,7 @@ public class TonerService {
                 Integer requestId = parseIntegerSafely(item.get("requestId"));
 
                 jdbcTemplate.update(sql, refNo, companyName, String.valueOf(pid), String.valueOf(tid),
-                        String.valueOf(qtyVal), dcUpload, now, now, username, requestId);
+                        String.valueOf(qtyVal), dcUpload, finalDcNo, finalDcDate, now, now, username, requestId);
             }
             return true;
         } catch (Exception e) {
@@ -566,6 +599,18 @@ public class TonerService {
         }
     }
 
+    @Transactional
+    public boolean saveInwardRegister(String refNo, String companyName, List<Map<String, Object>> items,
+            String dcUpload, String dcDate, String username) {
+        return saveInwardRegister(refNo, companyName, items, dcUpload, null, dcDate, username);
+    }
+
+    @Transactional
+    public boolean saveInwardRegister(String refNo, String companyName, List<Map<String, Object>> items,
+            String dcUpload, String username) {
+        return saveInwardRegister(refNo, companyName, items, dcUpload, null, null, username);
+    }
+
     public List<Map<String, Object>> getInwardHistory() {
         try {
             String sql = "SELECT * FROM toner_stock_register_details WHERE (is_active IS NULL OR is_active = 1) AND (is_delete IS NULL OR is_delete = 0) ORDER BY id DESC";
@@ -581,47 +626,39 @@ public class TonerService {
             Map<String, String> fileNumberMap = getWorkorderFileNumberMap();
             Map<String, Integer> woQtyMap = getWorkorderRegisteredQtyMap();
 
-            Map<String, Map<String, Object>> grouped = new HashMap<>();
+            List<Map<String, Object>> result = new ArrayList<>();
             for (Map<String, Object> raw : list) {
                 String refNo = raw.get("ref_no") != null ? String.valueOf(raw.get("ref_no")).trim() : "";
                 String pid = raw.get("pid") != null ? String.valueOf(raw.get("pid")).trim() : "";
                 String tid = raw.get("tid") != null ? String.valueOf(raw.get("tid")).trim() : "";
-                String key = refNo + "_" + pid + "_" + tid;
 
                 Integer qtyIn = parseIntegerSafely(raw.get("qty_registered"));
                 int qty = qtyIn != null ? qtyIn : 0;
 
                 String dc = raw.get("dc_upload") != null ? String.valueOf(raw.get("dc_upload")).trim() : "";
+                String dcNo = raw.get("dc_no") != null ? String.valueOf(raw.get("dc_no")).trim() : "";
+                String dcDate = raw.get("dc_date") != null ? String.valueOf(raw.get("dc_date")).trim() : "";
                 String updatedBy = raw.get("updated_by") != null ? String.valueOf(raw.get("updated_by")).trim() : "";
                 String companyName = raw.get("company_name") != null ? String.valueOf(raw.get("company_name")).trim()
                         : "";
 
-                if (!grouped.containsKey(key)) {
-                    Map<String, Object> row = new HashMap<>(raw);
-                    row.put("printer_name", printerMap.getOrDefault(pid, pid));
-                    row.put("model_name", tonerMap.getOrDefault(tid, tid));
-                    row.put("order_by", userMap.getOrDefault(updatedBy, updatedBy));
-                    row.put("file_number", fileNumberMap.getOrDefault(refNo, ""));
-                    row.put("vendor_name", vendorMap.getOrDefault(companyName, companyName));
-                    row.put("qty_registered", qty);
-                    row.put("qty_workorder_registered", woQtyMap.getOrDefault(refNo + "_" + pid + "_" + tid, 0));
-                    row.put("qty_workorder_requested", 0);
-                    row.put("dc_uploads", dc);
-                    grouped.put(key, row);
-                } else {
-                    Map<String, Object> existing = grouped.get(key);
-                    Integer curQ = parseIntegerSafely(existing.get("qty_registered"));
-                    int currentQty = curQ != null ? curQ : 0;
-                    existing.put("qty_registered", currentQty + qty);
-
-                    String currentDcs = existing.get("dc_uploads") != null ? String.valueOf(existing.get("dc_uploads"))
-                            : "";
-                    if (!dc.isEmpty() && !currentDcs.contains(dc)) {
-                        existing.put("dc_uploads", currentDcs.isEmpty() ? dc : (currentDcs + "," + dc));
-                    }
-                }
+                Map<String, Object> row = new HashMap<>(raw);
+                row.put("printer_name", printerMap.getOrDefault(pid, pid));
+                row.put("model_name", tonerMap.getOrDefault(tid, tid));
+                row.put("order_by", userMap.getOrDefault(updatedBy, updatedBy));
+                row.put("file_number", fileNumberMap.getOrDefault(refNo, ""));
+                row.put("vendor_name", vendorMap.getOrDefault(companyName, companyName));
+                row.put("qty_registered", qty);
+                row.put("inward_qty", qty);
+                row.put("qty_workorder_registered", woQtyMap.getOrDefault(refNo + "_" + pid + "_" + tid, 0));
+                row.put("qty_workorder_requested", 0);
+                row.put("dc_upload", dc);
+                row.put("dc_uploads", dc);
+                row.put("dc_no", dcNo);
+                row.put("dc_date", dcDate);
+                result.add(row);
             }
-            return new ArrayList<>(grouped.values());
+            return result;
         } catch (Exception e) {
             return new ArrayList<>();
         }
@@ -639,12 +676,13 @@ public class TonerService {
 
     @Transactional
     public boolean saveUserRequest(String itCellRefNo, String deptId, String zoneId, List<Map<String, Object>> items,
-            String userRequestUpload, String username) {
+            String userRequestUpload, String requestDate, String username) {
         Timestamp now = new Timestamp(System.currentTimeMillis());
+        String finalRequestDate = (requestDate != null && !requestDate.trim().isEmpty()) ? requestDate.trim() : null;
         String sql = "INSERT INTO toner_department_requested_details " +
-                "(req_no, itcell_ref_no, dept_id, zone_id, pid, tid, qty_requested, qty_delivered, user_request_upload, cdate, updated_date, updated_by, is_active, is_delete) "
+                "(req_no, itcell_ref_no, dept_id, zone_id, pid, tid, qty_requested, qty_delivered, user_request_upload, request_date, cdate, updated_date, updated_by, is_active, is_delete) "
                 +
-                "VALUES (?, ?, ?, ?, ?, ?, ?, '0', ?, ?, ?, ?, 1, 0)";
+                "VALUES (?, ?, ?, ?, ?, ?, ?, '0', ?, ?, ?, ?, ?, 1, 0)";
         try {
             int baseMaxId = getMaxRequestId();
             int year = Calendar.getInstance().get(Calendar.YEAR);
@@ -675,7 +713,7 @@ public class TonerService {
                 String reqNo = String.format("%s-%d-%04d", cleanModel, year, seqNum);
 
                 jdbcTemplate.update(sql, reqNo, itCellRefNo, deptId, zoneId, String.valueOf(pid), String.valueOf(tid),
-                        String.valueOf(qtyRequested), userRequestUpload, now, now, username);
+                        String.valueOf(qtyRequested), userRequestUpload, finalRequestDate, now, now, username);
             }
             return true;
         } catch (Exception e) {
@@ -683,31 +721,40 @@ public class TonerService {
         }
     }
 
+    @Transactional
+    public boolean saveUserRequest(String itCellRefNo, String deptId, String zoneId, List<Map<String, Object>> items,
+            String userRequestUpload, String username) {
+        return saveUserRequest(itCellRefNo, deptId, zoneId, items, userRequestUpload, null, username);
+    }
+
     @Transactional
     public boolean updateUserRequest(int id, String itcellRefNo, String deptId, String zoneId,
-            int pid, int tid, int qtyRequested, String newUploadPath, String username) {
+            int pid, int tid, int qtyRequested, String newUploadPath, String requestDate, String username) {
         Timestamp now = new Timestamp(System.currentTimeMillis());
         try {
             String safeZoneId = (zoneId != null && !zoneId.trim().isEmpty() && !"null".equalsIgnoreCase(zoneId))
                     ? zoneId.trim()
                     : null;
+            String finalRequestDate = (requestDate != null && !requestDate.trim().isEmpty()) ? requestDate.trim()
+                    : null;
             if (newUploadPath != null && !newUploadPath.trim().isEmpty()) {
                 String sql = "UPDATE toner_department_requested_details SET " +
                         "itcell_ref_no = ?, dept_id = ?, zone_id = ?, pid = ?, tid = ?, " +
-                        "qty_requested = ?, user_request_upload = ?, updated_date = ?, updated_by = ? " +
+                        "qty_requested = ?, user_request_upload = ?, request_date = ?, updated_date = ?, updated_by = ? "
+                        +
                         "WHERE id = ?";
                 int rows = jdbcTemplate.update(sql, itcellRefNo.trim(), deptId.trim(), safeZoneId,
                         String.valueOf(pid), String.valueOf(tid), String.valueOf(qtyRequested),
-                        newUploadPath, now, username, id);
+                        newUploadPath, finalRequestDate, now, username, id);
                 return rows > 0;
             } else {
                 String sql = "UPDATE toner_department_requested_details SET " +
                         "itcell_ref_no = ?, dept_id = ?, zone_id = ?, pid = ?, tid = ?, " +
-                        "qty_requested = ?, updated_date = ?, updated_by = ? " +
+                        "qty_requested = ?, request_date = ?, updated_date = ?, updated_by = ? " +
                         "WHERE id = ?";
                 int rows = jdbcTemplate.update(sql, itcellRefNo.trim(), deptId.trim(), safeZoneId,
                         String.valueOf(pid), String.valueOf(tid), String.valueOf(qtyRequested),
-                        now, username, id);
+                        finalRequestDate, now, username, id);
                 return rows > 0;
             }
         } catch (Exception e) {
@@ -716,6 +763,13 @@ public class TonerService {
         }
     }
 
+    @Transactional
+    public boolean updateUserRequest(int id, String itcellRefNo, String deptId, String zoneId,
+            int pid, int tid, int qtyRequested, String newUploadPath, String username) {
+        return updateUserRequest(id, itcellRefNo, deptId, zoneId, pid, tid, qtyRequested, newUploadPath, null,
+                username);
+    }
+
     public List<Map<String, Object>> getAllUserRequests() {
         try {
             String sql = "SELECT * FROM toner_department_requested_details WHERE (is_active IS NULL OR is_active = 1) AND (is_delete IS NULL OR is_delete = 0) ORDER BY id DESC";
@@ -739,12 +793,15 @@ public class TonerService {
                 String deptId = raw.get("dept_id") != null ? String.valueOf(raw.get("dept_id")).trim() : "";
                 String zoneId = raw.get("zone_id") != null ? String.valueOf(raw.get("zone_id")).trim() : "";
                 String updatedBy = raw.get("updated_by") != null ? String.valueOf(raw.get("updated_by")).trim() : "";
+                String requestDate = raw.get("request_date") != null ? String.valueOf(raw.get("request_date")).trim()
+                        : "";
 
                 row.put("printer_name", printerMap.getOrDefault(pid, pid));
                 row.put("model_name", tonerMap.getOrDefault(tid, tid));
                 row.put("dept_name", deptMap.getOrDefault(deptId, deptId));
                 row.put("zone_name", zoneMap.getOrDefault(zoneId, zoneId));
                 row.put("updated_by", userMap.getOrDefault(updatedBy, updatedBy));
+                row.put("request_date", requestDate);
 
                 result.add(row);
             }
@@ -788,6 +845,7 @@ public class TonerService {
 
             Map<String, String> printerMap = getPrinterMap();
             Map<String, String> tonerMap = getTonerMap();
+            Map<String, String> partCodeMap = getTonerPartCodeMap();
             Map<String, String> deptMap = getDepartmentMap();
             Map<String, String> zoneMap = getZoneMap();
             Map<String, Integer> availStockMap = getAvailableStockMap();
@@ -806,9 +864,6 @@ public class TonerService {
                 String pid = raw.get("pid") != null ? String.valueOf(raw.get("pid")).trim() : "";
                 String tid = raw.get("tid") != null ? String.valueOf(raw.get("tid")).trim() : "";
                 int availStock = availStockMap.getOrDefault(pid + "_" + tid, 0);
-                if (availStock <= 0) {
-                    continue; // Cannot issue without available stock
-                }
 
                 Map<String, Object> row = new HashMap<>(raw);
                 String deptId = raw.get("dept_id") != null ? String.valueOf(raw.get("dept_id")).trim() : "";
@@ -816,6 +871,7 @@ public class TonerService {
 
                 row.put("printer_name", printerMap.getOrDefault(pid, pid));
                 row.put("model_name", tonerMap.getOrDefault(tid, tid));
+                row.put("part_code", partCodeMap.getOrDefault(tid, "N/A"));
                 row.put("dept_name", deptMap.getOrDefault(deptId, deptId));
                 row.put("zone_name", zoneMap.getOrDefault(zoneId, zoneId));
                 row.put("available_stock", availStock);
@@ -829,6 +885,60 @@ public class TonerService {
     }
 
     // ================= OUTWARD REGISTER =================
+    @Transactional
+    public boolean saveOutwardRegisterBulk(List<Map<String, Object>> items, String outwardDate, String username) {
+        Timestamp now = new Timestamp(System.currentTimeMillis());
+        String finalOutDate = (outwardDate != null && !outwardDate.trim().isEmpty()) ? outwardDate.trim() : null;
+        try {
+            for (Map<String, Object> item : items) {
+                Integer idVal = parseIntegerSafely(item.get("id"));
+                Integer qtyVal = parseIntegerSafely(item.get("qtyIssued"));
+                if (idVal == null)
+                    continue;
+                int id = idVal;
+                int qtyIssued = (qtyVal != null) ? qtyVal : 0;
+                if (qtyIssued <= 0)
+                    continue;
+
+                String sql = "UPDATE toner_department_requested_details SET " +
+                        "qty_delivered = CAST(COALESCE(qty_delivered, 0) AS SIGNED) + ?, " +
+                        "outward_date = COALESCE(?, outward_date), " +
+                        "updated_date = ?, updated_by = ? " +
+                        "WHERE id = ?";
+                jdbcTemplate.update(sql, qtyIssued, finalOutDate, now, username, id);
+            }
+            return true;
+        } catch (Exception e) {
+            throw new RuntimeException("Rollback saveOutwardRegisterBulk due to: " + e.getMessage());
+        }
+    }
+
+    @Transactional
+    public boolean updateOutwardDeliveryFiles(List<Integer> ids, String finalDeliveredUpload, String userPhotoUpload,
+            String username) {
+        Timestamp now = new Timestamp(System.currentTimeMillis());
+        try {
+            for (int id : ids) {
+                String sql = "UPDATE toner_department_requested_details SET " +
+                        "final_delivered_upload = CASE WHEN ? IS NULL OR ? = '' THEN final_delivered_upload " +
+                        "  WHEN final_delivered_upload IS NULL OR final_delivered_upload = '' THEN ? " +
+                        "  ELSE CONCAT(final_delivered_upload, ',', ?) END, " +
+                        "receiver_photo = CASE WHEN ? IS NULL OR ? = '' THEN receiver_photo " +
+                        "  WHEN receiver_photo IS NULL OR receiver_photo = '' THEN ? " +
+                        "  ELSE CONCAT(receiver_photo, ',', ?) END, " +
+                        "updated_date = ?, updated_by = ? " +
+                        "WHERE id = ?";
+                jdbcTemplate.update(sql,
+                        finalDeliveredUpload, finalDeliveredUpload, finalDeliveredUpload, finalDeliveredUpload,
+                        userPhotoUpload, userPhotoUpload, userPhotoUpload, userPhotoUpload,
+                        now, username, id);
+            }
+            return true;
+        } catch (Exception e) {
+            throw new RuntimeException("Rollback updateOutwardDeliveryFiles due to: " + e.getMessage());
+        }
+    }
+
     public boolean saveOutwardRegister(int id, String qtyIssued, String finalDeliveredUpload, String userPhotoUpload,
             String username) {
         String sql;
@@ -878,6 +988,7 @@ public class TonerService {
 
             Map<String, String> printerMap = getPrinterMap();
             Map<String, String> tonerMap = getTonerMap();
+            Map<String, String> partCodeMap = getTonerPartCodeMap();
             Map<String, String> deptMap = getDepartmentMap();
             Map<String, String> zoneMap = getZoneMap();
             Map<String, String> userMap = getUserMap();
@@ -894,6 +1005,7 @@ public class TonerService {
 
                 row.put("printer_name", printerMap.getOrDefault(pid, pid));
                 row.put("model_name", tonerMap.getOrDefault(tid, tid));
+                row.put("part_code", partCodeMap.getOrDefault(tid, "N/A"));
                 row.put("dept_name", deptMap.getOrDefault(deptId, deptId));
                 row.put("zone_name", zoneMap.getOrDefault(zoneId, zoneId));
                 row.put("updated_by", userMap.getOrDefault(updatedBy, updatedBy));
@@ -1034,6 +1146,30 @@ public class TonerService {
         }
     }
 
+    public List<Map<String, Object>> getActiveWorkorders() {
+        String sql = "SELECT id, ref_no, file_number, vendor_name FROM toner_workorder_register_details WHERE (is_active IS NULL OR is_active = 1) AND (is_delete IS NULL OR is_delete = 0) ORDER BY id DESC";
+        try {
+            List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
+            if (list == null || list.isEmpty())
+                return new ArrayList<>();
+            Map<String, Map<String, Object>> seen = new HashMap<>();
+            List<Map<String, Object>> distinct = new ArrayList<>();
+            for (Map<String, Object> row : list) {
+                String refNo = row.get("ref_no") != null ? String.valueOf(row.get("ref_no")).trim() : "";
+                String fileNo = row.get("file_number") != null ? String.valueOf(row.get("file_number")).trim() : "";
+                String key = refNo + "_" + fileNo;
+                if (!seen.containsKey(key)) {
+                    seen.put(key, row);
+                    distinct.add(row);
+                }
+            }
+            return distinct;
+        } catch (Exception e) {
+            System.err.println("Error fetching active workorders: " + e.getMessage());
+            return new ArrayList<>();
+        }
+    }
+
     public List<String> getActiveWorkorderRefNos() {
         String sql = "SELECT ref_no FROM toner_workorder_register_details WHERE (is_active IS NULL OR is_active = 1) AND (is_delete IS NULL OR is_delete = 0) ORDER BY id DESC";
         try {
@@ -1045,8 +1181,18 @@ public class TonerService {
 
     public List<Map<String, Object>> getWorkorderRegisteredItems(String refNo) {
         try {
-            String sql = "SELECT * FROM toner_workorder_printermodel_qty WHERE TRIM(ref_no) = TRIM(?) AND (is_active IS NULL OR is_active = 1) AND (is_delete IS NULL OR is_delete = 0)";
-            List<Map<String, Object>> list = jdbcTemplate.queryForList(sql, refNo);
+            String resolvedRef = refNo != null ? refNo.trim() : "";
+            try {
+                String findSql = "SELECT ref_no FROM toner_workorder_register_details WHERE (TRIM(ref_no) = TRIM(?) OR TRIM(file_number) = TRIM(?)) AND (is_active IS NULL OR is_active = 1) AND (is_delete IS NULL OR is_delete = 0) LIMIT 1";
+                List<String> refs = jdbcTemplate.queryForList(findSql, String.class, refNo, refNo);
+                if (refs != null && !refs.isEmpty() && refs.get(0) != null) {
+                    resolvedRef = refs.get(0).trim();
+                }
+            } catch (Exception ignored) {
+            }
+
+            String sql = "SELECT * FROM toner_workorder_printermodel_qty WHERE (TRIM(ref_no) = TRIM(?) OR TRIM(ref_no) = TRIM(?)) AND (is_active IS NULL OR is_active = 1) AND (is_delete IS NULL OR is_delete = 0)";
+            List<Map<String, Object>> list = jdbcTemplate.queryForList(sql, refNo, resolvedRef);
             if (list == null || list.isEmpty()) {
                 return new ArrayList<>();
             }
@@ -1059,8 +1205,8 @@ public class TonerService {
 
             String vendorId = "";
             try {
-                String vSql = "SELECT vendor_name FROM toner_workorder_register_details WHERE TRIM(ref_no) = TRIM(?) LIMIT 1";
-                vendorId = jdbcTemplate.queryForObject(vSql, String.class, refNo);
+                String vSql = "SELECT vendor_name FROM toner_workorder_register_details WHERE (TRIM(ref_no) = TRIM(?) OR TRIM(ref_no) = TRIM(?)) LIMIT 1";
+                vendorId = jdbcTemplate.queryForObject(vSql, String.class, refNo, resolvedRef);
             } catch (Exception ignored) {
             }
 
@@ -1068,7 +1214,7 @@ public class TonerService {
             for (Map<String, Object> raw : list) {
                 Map<String, Object> row = new HashMap<>(raw);
 
-                String cleanRef = refNo != null ? refNo.trim() : "";
+                String cleanRef = resolvedRef;
                 String pid = raw.get("pid") != null ? String.valueOf(raw.get("pid")).trim() : "";
                 String tid = raw.get("tid") != null ? String.valueOf(raw.get("tid")).trim() : "";
 
diff --git a/src/main/resources/templates/fragments/rentalheader.html b/src/main/resources/templates/fragments/rentalheader.html
new file mode 100644
index 0000000..d6c7923
--- /dev/null
+++ b/src/main/resources/templates/fragments/rentalheader.html
@@ -0,0 +1,22 @@
+<th:block th:fragment="rentalheader">
+    <!-- Awesome Font -->
+    <link rel="stylesheet" th:href="@{/assets/font-awesome-6.5.2/css/all.min.css}" type="text/css">
+    <!-- Bootstrap CSS -->
+    <link rel="stylesheet" th:href="@{/assets/bootstrap-5.3.2/css/bootstrap.min.css}" type="text/css">
+    <!-- CSS for Header -->
+    <link rel="stylesheet" th:href="@{/assets/css/header-styles.css}" type="text/css">
+    <div class="header">
+        <div class="logo-left">
+            <img th:src="@{/assets/header-images/gcc1.png}" alt="Greater Chennai Corporation Logo">
+            <div class="logo-text">
+                <h2>GREATER</h2>
+                <h2>CHENNAI</h2>
+                <h2>CORPORATION</h2>
+                <p>பெருநகர சென்னை மாநகராட்சி</p>
+            </div>
+        </div>
+        <div class="title">
+            <h2>GCC IT Cell Rental Asset & Material Management System</h2>
+        </div>
+    </div>
+</th:block>
diff --git a/src/main/resources/templates/gccrentalmanagement/dashboard.html b/src/main/resources/templates/gccrentalmanagement/dashboard.html
new file mode 100644
index 0000000..206abd1
--- /dev/null
+++ b/src/main/resources/templates/gccrentalmanagement/dashboard.html
@@ -0,0 +1,3080 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org" lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>GCC IT Cell - Rental Asset & Material Management System</title>
+
+    <!-- CSRF Tokens -->
+    <meta th:if="${_csrf != null}" name="_csrf" th:content="${_csrf.token}" />
+    <meta th:if="${_csrf != null}" name="_csrf_header" th:content="${_csrf.headerName}" />
+
+    <!-- Google Fonts -->
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link
+        href="https://fonts.googleapis.com/css2?family=Outfit:wght@400;500;600;700;800&family=Poppins:wght@300;400;500;600;700&display=swap"
+        rel="stylesheet">
+
+    <!-- Bootstrap CSS -->
+    <link rel="stylesheet" th:href="@{/assets/bootstrap-5.3.2/css/bootstrap.min.css}" type="text/css">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css"
+        type="text/css">
+    <!-- FontAwesome 6.5.2 -->
+    <link th:href="@{/assets/font-awesome-6.5.2/css/all.min.css}" rel="stylesheet" type="text/css">
+
+    <!-- Bootstrap JS (Popper & Bootstrap bundle) -->
+    <script th:src="@{/assets/popper-2.11.8/js/popper.min.js}"></script>
+    <script th:src="@{/assets/bootstrap-5.3.2/js/bootstrap.min.js}"></script>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
+
+    <!-- Flatpickr Datepicker -->
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css">
+    <!-- Chart.js -->
+    <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
+    <!-- SheetJS for Export to Excel -->
+    <script src="https://cdn.jsdelivr.net/npm/xlsx@0.18.5/dist/xlsx.full.min.js"></script>
+
+    <style>
+        :root {
+            --brand-navy: #072e41;
+            --brand-primary: #0d4b68;
+            --brand-accent: #0284c7;
+            --brand-accent-light: #e0f2fe;
+            --brand-emerald: #10b981;
+            --brand-amber: #f59e0b;
+            --brand-rose: #ef4444;
+            --brand-purple: #8b5cf6;
+            --surface-bg: #f8fafc;
+            --card-bg: #ffffff;
+            --text-dark: #0f172a;
+            --text-muted: #64748b;
+            --border-color: #e2e8f0;
+            --shadow-sm: 0 2px 4px rgba(0, 0, 0, 0.03);
+            --shadow-md: 0 6px 18px rgba(0, 0, 0, 0.06);
+            --shadow-lg: 0 12px 30px rgba(0, 0, 0, 0.1);
+        }
+
+        * {
+            box-sizing: border-box;
+            margin: 0;
+            padding: 0;
+        }
+
+        body {
+            font-family: 'Poppins', sans-serif;
+            background-color: var(--surface-bg);
+            color: var(--text-dark);
+            min-height: 100vh;
+            display: flex;
+            flex-direction: column;
+        }
+
+        /* Top Bar / Header */
+        .header-top {
+            background: linear-gradient(135deg, #072e41 0%, #0d4b68 60%, #155e75 100%);
+            color: #ffffff;
+            padding: 14px 28px;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            box-shadow: 0 4px 20px rgba(7, 46, 65, 0.25);
+            position: sticky;
+            top: 0;
+            z-index: 1000;
+        }
+
+        .header-brand {
+            display: flex;
+            align-items: center;
+            gap: 16px;
+        }
+
+        .header-logo {
+            width: 52px;
+            height: 52px;
+            background: #ffffff;
+            border-radius: 12px;
+            padding: 4px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            box-shadow: 0 4px 10px rgba(0, 0, 0, 0.15);
+        }
+
+        .header-logo img {
+            max-width: 100%;
+            max-height: 100%;
+            object-fit: contain;
+        }
+
+        .brand-titles h1 {
+            font-family: 'Outfit', sans-serif;
+            font-size: 1.15rem;
+            font-weight: 800;
+            margin: 0;
+            letter-spacing: 0.5px;
+            text-transform: uppercase;
+        }
+
+        .brand-titles p {
+            font-size: 0.72rem;
+            margin: 0;
+            color: #93c5fd;
+            font-weight: 500;
+        }
+
+        .system-pill {
+            display: inline-flex;
+            align-items: center;
+            gap: 6px;
+            background: rgba(255, 255, 255, 0.12);
+            padding: 3px 10px;
+            border-radius: 20px;
+            font-size: 0.72rem;
+            font-weight: 600;
+            color: #e0f2fe;
+            border: 1px solid rgba(255, 255, 255, 0.2);
+            margin-top: 2px;
+        }
+
+        .user-controls {
+            display: flex;
+            align-items: center;
+            gap: 14px;
+        }
+
+        .user-chip {
+            background: rgba(255, 255, 255, 0.12);
+            backdrop-filter: blur(10px);
+            border: 1px solid rgba(255, 255, 255, 0.2);
+            padding: 6px 14px;
+            border-radius: 30px;
+            font-size: 0.82rem;
+            font-weight: 600;
+            color: #ffffff;
+            display: flex;
+            align-items: center;
+            gap: 8px;
+        }
+
+        .user-chip .role-tag {
+            background: #0284c7;
+            color: #ffffff;
+            padding: 2px 8px;
+            border-radius: 12px;
+            font-size: 0.68rem;
+            text-transform: uppercase;
+        }
+
+        .btn-header-logout {
+            background: rgba(239, 68, 68, 0.2);
+            color: #fecaca;
+            border: 1px solid rgba(239, 68, 68, 0.4);
+            padding: 7px 16px;
+            border-radius: 20px;
+            font-size: 0.82rem;
+            font-weight: 600;
+            text-decoration: none;
+            display: inline-flex;
+            align-items: center;
+            gap: 6px;
+            transition: all 0.2s;
+        }
+
+        .btn-header-logout:hover {
+            background: #ef4444;
+            color: #ffffff;
+            border-color: #ef4444;
+            transform: translateY(-1px);
+        }
+
+        /* Sub-Navigation Bar */
+        .module-nav-bar {
+            background: #ffffff;
+            border-bottom: 1px solid var(--border-color);
+            padding: 0 28px;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            box-shadow: var(--shadow-sm);
+        }
+
+        .nav-tabs-custom {
+            display: flex;
+            gap: 6px;
+            list-style: none;
+            margin: 0;
+            padding: 0;
+            overflow-x: auto;
+        }
+
+        .nav-tab-item {
+            padding: 15px 16px;
+            font-size: 0.86rem;
+            font-weight: 600;
+            color: var(--text-muted);
+            cursor: pointer;
+            border-bottom: 3px solid transparent;
+            display: inline-flex;
+            align-items: center;
+            gap: 7px;
+            transition: all 0.25s;
+            white-space: nowrap;
+        }
+
+        .nav-tab-item:hover {
+            color: var(--brand-accent);
+            background: #f8fafc;
+        }
+
+        .nav-tab-item.active {
+            color: var(--brand-primary);
+            border-bottom-color: var(--brand-accent);
+            background: #f0f9ff;
+        }
+
+        .nav-tab-item .badge-count {
+            padding: 2px 7px;
+            border-radius: 12px;
+            font-size: 0.72rem;
+            font-weight: 700;
+        }
+
+        .badge-danger-glow {
+            background: #ef4444;
+            color: #ffffff;
+            box-shadow: 0 0 10px rgba(239, 68, 68, 0.5);
+            animation: pulseAlert 2s infinite;
+        }
+
+        @keyframes pulseAlert {
+
+            0%,
+            100% {
+                opacity: 1;
+                transform: scale(1);
+            }
+
+            50% {
+                opacity: 0.85;
+                transform: scale(1.08);
+            }
+        }
+
+        /* Container Layout */
+        .app-container {
+            max-width: 1540px;
+            width: 100%;
+            margin: 0 auto;
+            padding: 24px 28px;
+            flex: 1;
+        }
+
+        /* KPI Metric Cards */
+        .kpi-grid {
+            display: grid;
+            grid-template-columns: repeat(auto-fit, minmax(230px, 1fr));
+            gap: 18px;
+            margin-bottom: 26px;
+        }
+
+        .kpi-card {
+            background: var(--card-bg);
+            border: 1px solid var(--border-color);
+            border-radius: 18px;
+            padding: 20px;
+            box-shadow: var(--shadow-sm);
+            transition: all 0.3s ease;
+            position: relative;
+            overflow: hidden;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+        }
+
+        .kpi-card:hover {
+            transform: translateY(-3px);
+            box-shadow: var(--shadow-md);
+        }
+
+        .kpi-card::before {
+            content: '';
+            position: absolute;
+            left: 0;
+            top: 0;
+            width: 6px;
+            height: 100%;
+        }
+
+        .kpi-card.kpi-active::before {
+            background: var(--brand-accent);
+        }
+
+        .kpi-card.kpi-due::before {
+            background: var(--brand-amber);
+        }
+
+        .kpi-card.kpi-overdue::before {
+            background: var(--brand-rose);
+        }
+
+        .kpi-card.kpi-wo::before {
+            background: var(--brand-purple);
+        }
+
+        .kpi-card.kpi-req::before {
+            background: var(--brand-emerald);
+        }
+
+        .kpi-top {
+            display: flex;
+            justify-content: space-between;
+            align-items: flex-start;
+            margin-bottom: 10px;
+        }
+
+        .kpi-label {
+            font-size: 0.8rem;
+            font-weight: 600;
+            color: var(--text-muted);
+            text-transform: uppercase;
+            letter-spacing: 0.5px;
+        }
+
+        .kpi-icon-wrap {
+            width: 42px;
+            height: 42px;
+            border-radius: 12px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-size: 1.2rem;
+        }
+
+        .kpi-active .kpi-icon-wrap {
+            background: #e0f2fe;
+            color: #0284c7;
+        }
+
+        .kpi-due .kpi-icon-wrap {
+            background: #fef3c7;
+            color: #d97706;
+        }
+
+        .kpi-overdue .kpi-icon-wrap {
+            background: #fee2e2;
+            color: #dc2626;
+        }
+
+        .kpi-wo .kpi-icon-wrap {
+            background: #ede9fe;
+            color: #7c3aed;
+        }
+
+        .kpi-req .kpi-icon-wrap {
+            background: #dcfce7;
+            color: #16a34a;
+        }
+
+        .kpi-value {
+            font-family: 'Outfit', sans-serif;
+            font-size: 1.8rem;
+            font-weight: 800;
+            color: var(--text-dark);
+            line-height: 1;
+            margin-bottom: 6px;
+        }
+
+        .kpi-subtext {
+            font-size: 0.76rem;
+            color: var(--text-muted);
+            display: flex;
+            align-items: center;
+            gap: 4px;
+        }
+
+        /* Action Toolbars */
+        .section-header-bar {
+            background: #ffffff;
+            border: 1px solid var(--border-color);
+            border-radius: 16px;
+            padding: 16px 20px;
+            margin-bottom: 20px;
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+            align-items: center;
+            gap: 15px;
+            box-shadow: var(--shadow-sm);
+        }
+
+        .section-title {
+            display: flex;
+            align-items: center;
+            gap: 10px;
+        }
+
+        .section-title h3 {
+            font-family: 'Outfit', sans-serif;
+            font-size: 1.15rem;
+            font-weight: 700;
+            margin: 0;
+            color: var(--brand-navy);
+        }
+
+        .section-title span {
+            font-size: 0.8rem;
+            color: var(--text-muted);
+        }
+
+        .action-btn-group {
+            display: flex;
+            flex-wrap: wrap;
+            gap: 10px;
+            align-items: center;
+        }
+
+        .btn-custom {
+            padding: 8px 16px;
+            border-radius: 10px;
+            font-size: 0.85rem;
+            font-weight: 600;
+            display: inline-flex;
+            align-items: center;
+            gap: 7px;
+            border: 1px solid transparent;
+            cursor: pointer;
+            transition: all 0.2s ease;
+            text-decoration: none;
+        }
+
+        .btn-custom-primary {
+            background: linear-gradient(135deg, var(--brand-primary), var(--brand-accent));
+            color: #ffffff;
+            box-shadow: 0 4px 12px rgba(13, 75, 104, 0.2);
+        }
+
+        .btn-custom-primary:hover {
+            background: linear-gradient(135deg, #072e41, #0284c7);
+            color: #ffffff;
+            transform: translateY(-1px);
+        }
+
+        .btn-custom-success {
+            background: linear-gradient(135deg, #10b981, #059669);
+            color: #ffffff;
+        }
+
+        .btn-custom-danger {
+            background: linear-gradient(135deg, #ef4444, #dc2626);
+            color: #ffffff;
+        }
+
+        .btn-custom-outline {
+            background: #ffffff;
+            border-color: var(--border-color);
+            color: var(--text-dark);
+        }
+
+        .btn-custom-outline:hover {
+            background: #f1f5f9;
+            border-color: #cbd5e1;
+        }
+
+        /* Search Box */
+        .search-input-wrap {
+            position: relative;
+            min-width: 250px;
+        }
+
+        .search-input-wrap input {
+            width: 100%;
+            height: 38px;
+            padding: 8px 12px 8px 36px;
+            border: 1px solid var(--border-color);
+            border-radius: 10px;
+            font-size: 0.85rem;
+            outline: none;
+            background: #f8fafc;
+            transition: all 0.2s;
+        }
+
+        .search-input-wrap input:focus {
+            background: #ffffff;
+            border-color: var(--brand-accent);
+            box-shadow: 0 0 0 3px rgba(2, 132, 199, 0.15);
+        }
+
+        .search-input-wrap i {
+            position: absolute;
+            left: 12px;
+            top: 50%;
+            transform: translateY(-50%);
+            color: #94a3b8;
+            font-size: 0.88rem;
+        }
+
+        /* Modern Table Card */
+        .table-card {
+            background: var(--card-bg);
+            border: 1px solid var(--border-color);
+            border-radius: 16px;
+            overflow: hidden;
+            box-shadow: var(--shadow-sm);
+            margin-bottom: 24px;
+        }
+
+        .table-responsive {
+            margin: 0;
+        }
+
+        .custom-table {
+            width: 100%;
+            border-collapse: collapse;
+            margin-bottom: 0;
+            font-size: 0.84rem;
+        }
+
+        .custom-table thead th {
+            background: #f8fafc;
+            color: #475569;
+            font-weight: 700;
+            font-size: 0.76rem;
+            text-transform: uppercase;
+            letter-spacing: 0.5px;
+            padding: 13px 15px;
+            border-bottom: 1.5px solid var(--border-color);
+            white-space: nowrap;
+        }
+
+        .custom-table tbody tr {
+            border-bottom: 1px solid #f1f5f9;
+            transition: background 0.2s;
+        }
+
+        .custom-table tbody tr:hover {
+            background: #f8fafc;
+        }
+
+        .custom-table tbody td {
+            padding: 12px 15px;
+            vertical-align: middle;
+            color: #1e293b;
+        }
+
+        /* Status & Alert Badges */
+        .badge-status {
+            display: inline-flex;
+            align-items: center;
+            gap: 5px;
+            padding: 4px 10px;
+            border-radius: 20px;
+            font-size: 0.74rem;
+            font-weight: 700;
+            text-transform: uppercase;
+            letter-spacing: 0.3px;
+        }
+
+        .status-active {
+            background: #dcfce7;
+            color: #15803d;
+            border: 1px solid #bbf7d0;
+        }
+
+        .status-due-soon {
+            background: #fef3c7;
+            color: #b45309;
+            border: 1px solid #fde68a;
+        }
+
+        .status-overdue {
+            background: #fee2e2;
+            color: #b91c1c;
+            border: 1px solid #fecaca;
+        }
+
+        .status-returned {
+            background: #f1f5f9;
+            color: #475569;
+            border: 1px solid #e2e8f0;
+        }
+
+        .status-pending {
+            background: #e0f2fe;
+            color: #0369a1;
+            border: 1px solid #bae6fd;
+        }
+
+        .item-breakdown-tag {
+            display: inline-block;
+            background: #f1f5f9;
+            border: 1px solid #e2e8f0;
+            border-radius: 6px;
+            padding: 2px 7px;
+            font-size: 0.74rem;
+            margin: 2px;
+            color: #334155;
+        }
+
+        /* Overdue Alert Banner */
+        .overdue-alert-banner {
+            background: linear-gradient(135deg, #fff1f2, #ffe4e6);
+            border: 1px solid #fecdd3;
+            border-left: 6px solid #e11d48;
+            border-radius: 14px;
+            padding: 16px 20px;
+            margin-bottom: 24px;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            gap: 15px;
+        }
+
+        .alert-content {
+            display: flex;
+            align-items: center;
+            gap: 14px;
+        }
+
+        .alert-icon-pulsing {
+            width: 44px;
+            height: 44px;
+            border-radius: 50%;
+            background: #e11d48;
+            color: #ffffff;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-size: 1.25rem;
+            animation: pulseAlert 2s infinite;
+        }
+
+        .alert-text h4 {
+            font-family: 'Outfit', sans-serif;
+            font-size: 1.05rem;
+            font-weight: 700;
+            color: #9f1239;
+            margin: 0 0 2px;
+        }
+
+        .alert-text p {
+            font-size: 0.82rem;
+            color: #be123c;
+            margin: 0;
+        }
+
+        /* Modal Customizations */
+        .modal-content {
+            border-radius: 20px;
+            border: none;
+            box-shadow: 0 20px 60px rgba(0, 0, 0, 0.2);
+            overflow: hidden;
+        }
+
+        .modal-header {
+            background: linear-gradient(135deg, #072e41, #0d4b68);
+            color: #ffffff;
+            padding: 18px 24px;
+            border-bottom: none;
+        }
+
+        .modal-title {
+            font-family: 'Outfit', sans-serif;
+            font-weight: 700;
+            font-size: 1.15rem;
+            display: flex;
+            align-items: center;
+            gap: 10px;
+        }
+
+        .btn-close-white {
+            filter: invert(1) grayscale(100%) brightness(200%);
+        }
+
+        .modal-body {
+            padding: 24px;
+            background: #ffffff;
+        }
+
+        .modal-footer {
+            padding: 16px 24px;
+            background: #f8fafc;
+            border-top: 1px solid var(--border-color);
+        }
+
+        .form-label {
+            font-size: 0.82rem;
+            font-weight: 600;
+            color: #334155;
+            margin-bottom: 6px;
+        }
+
+        .form-control,
+        .form-select {
+            border-radius: 10px;
+            border: 1px solid #cbd5e1;
+            font-size: 0.85rem;
+            padding: 9px 13px;
+        }
+
+        .form-control:focus,
+        .form-select:focus {
+            border-color: var(--brand-accent);
+            box-shadow: 0 0 0 3px rgba(2, 132, 199, 0.15);
+        }
+
+        .date-calc-box {
+            background: #f0fdf4;
+            border: 1px solid #bbf7d0;
+            border-radius: 12px;
+            padding: 12px 16px;
+            margin-top: 8px;
+            font-size: 0.82rem;
+            color: #166534;
+            display: flex;
+            align-items: center;
+            gap: 10px;
+        }
+
+        .notice-preview-box {
+            background: #f8fafc;
+            border: 1.5px dashed #cbd5e1;
+            border-radius: 14px;
+            padding: 18px;
+            font-family: 'Courier New', monospace;
+            font-size: 0.82rem;
+            color: #1e293b;
+            line-height: 1.6;
+            white-space: pre-wrap;
+            max-height: 280px;
+            overflow-y: auto;
+        }
+
+        .tab-panel-section {
+            display: none;
+            animation: fadeIn 0.3s ease;
+        }
+
+        .tab-panel-section.active-panel {
+            display: block;
+        }
+
+        @keyframes fadeIn {
+            from {
+                opacity: 0;
+                transform: translateY(6px);
+            }
+
+            to {
+                opacity: 1;
+                transform: translateY(0);
+            }
+        }
+
+        .analytics-grid {
+            display: grid;
+            grid-template-columns: repeat(auto-fit, minmax(420px, 1fr));
+            gap: 20px;
+            margin-bottom: 28px;
+        }
+
+        .chart-card {
+            background: #ffffff;
+            border: 1px solid var(--border-color);
+            border-radius: 16px;
+            padding: 20px;
+            box-shadow: var(--shadow-sm);
+        }
+
+        .chart-card h4 {
+            font-family: 'Outfit', sans-serif;
+            font-size: 0.98rem;
+            font-weight: 700;
+            color: var(--brand-navy);
+            margin-bottom: 16px;
+            display: flex;
+            align-items: center;
+            gap: 8px;
+        }
+
+        .toast-notification {
+            position: fixed;
+            bottom: 24px;
+            right: 24px;
+            background: #0f172a;
+            color: #ffffff;
+            padding: 14px 22px;
+            border-radius: 12px;
+            box-shadow: 0 10px 30px rgba(0, 0, 0, 0.25);
+            display: flex;
+            align-items: center;
+            gap: 12px;
+            z-index: 9999;
+            font-size: 0.86rem;
+            transform: translateY(100px);
+            opacity: 0;
+            transition: all 0.3s cubic-bezier(0.16, 1, 0.3, 1);
+        }
+
+        .toast-notification.show {
+            transform: translateY(0);
+            opacity: 1;
+        }
+    </style>
+</head>
+
+<body>
+    <!-- Top Bar -->
+    <header class="header-top no-print">
+        <div class="header-brand">
+            <div class="header-logo">
+                <img th:src="@{/assets/header-images/gcc1.png}" alt="Greater Chennai Corporation Logo">
+            </div>
+            <div class="brand-titles">
+                <h1>Greater Chennai Corporation</h1>
+                <p>பெருநகர சென்னை மாநகராட்சி &bull; IT Cell</p>
+                <div class="system-pill">
+                    <i class="fa-solid fa-boxes-packing"></i>
+                    <span>Rental Asset & Material Management Hub</span>
+                </div>
+            </div>
+        </div>
+
+        <div class="user-controls">
+            <div class="user-chip">
+                <i class="fa-solid fa-user-shield text-info"></i>
+                <span th:text="${usrName != null ? usrName : 'Officer'}">admin</span>
+                <span class="role-tag" th:text="${usrRole != null ? usrRole : 'ADMIN'}">ADMIN</span>
+            </div>
+            <a th:href="@{/gccrentalmanagement/logout}" class="btn-header-logout">
+                <i class="fa-solid fa-power-off"></i>
+                <span>Logout</span>
+            </a>
+        </div>
+    </header>
+
+    <!-- Sub Navigation Tabs Bar -->
+    <nav class="module-nav-bar no-print">
+        <ul class="nav-tabs-custom" id="moduleNavTabs">
+            <li class="nav-tab-item active" onclick="switchRentalTab('dashboardTab')">
+                <i class="fa-solid fa-chart-pie"></i>
+                <span>Dashboard</span>
+            </li>
+            <li class="nav-tab-item" onclick="switchRentalTab('workOrdersTab')">
+                <i class="fa-solid fa-file-contract"></i>
+                <span>1. Work Orders (WO)</span>
+                <span class="badge-count bg-light text-dark" id="woCountBadge">0</span>
+            </li>
+            <li class="nav-tab-item" onclick="switchRentalTab('userRequestsTab')">
+                <i class="fa-solid fa-clipboard-list"></i>
+                <span>2. User Requests</span>
+                <span class="badge-count bg-info text-white" id="reqCountBadge">0</span>
+            </li>
+            <li class="nav-tab-item" onclick="switchRentalTab('challansTab')">
+                <i class="fa-solid fa-truck-ramp-box"></i>
+                <span>3. Inward DC Stock</span>
+                <span class="badge-count bg-secondary text-white" id="dcCountBadge">0</span>
+            </li>
+            <li class="nav-tab-item" onclick="switchRentalTab('issuedTab')">
+                <i class="fa-solid fa-hand-holding-box"></i>
+                <span>4. Issued Details</span>
+                <span class="badge-count bg-primary text-white" id="issuedCountBadge">0</span>
+            </li>
+            <li class="nav-tab-item" onclick="switchRentalTab('returnsTab')">
+                <i class="fa-solid fa-arrow-rotate-left"></i>
+                <span>5. Return Details</span>
+                <span class="badge-count bg-success text-white" id="returnCountBadge">0</span>
+            </li>
+            <li class="nav-tab-item" onclick="switchRentalTab('remindersTab')">
+                <i class="fa-solid fa-bell"></i>
+                <span>Reminders & Overdue</span>
+                <span class="badge-count badge-danger-glow" id="overdueBadgeCount">0 Overdue</span>
+            </li>
+            <li class="nav-tab-item" onclick="switchRentalTab('reportsTab')">
+                <i class="fa-solid fa-file-excel"></i>
+                <span>Master Ledger</span>
+            </li>
+        </ul>
+    </nav>
+
+    <!-- Main Container -->
+    <main class="app-container">
+
+        <!-- OVERDUE CRITICAL ALERT BANNER -->
+        <div class="overdue-alert-banner no-print" id="overdueAlertBanner" style="display: none;">
+            <div class="alert-content">
+                <div class="alert-icon-pulsing">
+                    <i class="fa-solid fa-triangle-exclamation"></i>
+                </div>
+                <div class="alert-text">
+                    <h4>Urgent Return Alert: <span id="bannerOverdueCount">0</span> Department Rental Assets are
+                        OVERDUE!</h4>
+                    <p>Assets deployed for election, camps, and zonal work orders have exceeded their scheduled return
+                        date. Immediate return reminder notification required.</p>
+                </div>
+            </div>
+            <div class="action-btn-group">
+                <button class="btn-custom btn-custom-danger" onclick="openBulkReminderModal()">
+                    <i class="fa-solid fa-paper-plane"></i>
+                    <span>Dispatch Reminders Now</span>
+                </button>
+                <button class="btn-custom btn-custom-outline" onclick="switchRentalTab('remindersTab')">
+                    <i class="fa-solid fa-arrow-right"></i>
+                    <span>Review Due List</span>
+                </button>
+            </div>
+        </div>
+
+        <!-- ========================================================================= -->
+        <!-- TAB: DASHBOARD & OVERDUE RADAR -->
+        <!-- ========================================================================= -->
+        <section id="dashboardTab" class="tab-panel-section active-panel">
+            <div class="kpi-grid">
+                <div class="kpi-card kpi-active" onclick="switchRentalTab('issuedTab')">
+                    <div class="kpi-top">
+                        <span class="kpi-label">Active Issued Assets</span>
+                        <div class="kpi-icon-wrap"><i class="fa-solid fa-laptop-code"></i></div>
+                    </div>
+                    <div class="kpi-value" id="kpiActiveAssets">0</div>
+                    <div class="kpi-subtext"><i class="fa-solid fa-building me-1"></i> Across GCC Depts & Zones</div>
+                </div>
+
+                <div class="kpi-card kpi-due" onclick="switchRentalTab('remindersTab')">
+                    <div class="kpi-top">
+                        <span class="kpi-label">Due In 7 Days</span>
+                        <div class="kpi-icon-wrap"><i class="fa-solid fa-clock"></i></div>
+                    </div>
+                    <div class="kpi-value" id="kpiDueSoon">0</div>
+                    <div class="kpi-subtext"><i class="fa-solid fa-calendar-check me-1"></i> Pre-return notice scheduled
+                    </div>
+                </div>
+
+                <div class="kpi-card kpi-overdue" onclick="switchRentalTab('remindersTab')">
+                    <div class="kpi-top">
+                        <span class="kpi-label">Overdue Returns</span>
+                        <div class="kpi-icon-wrap"><i class="fa-solid fa-circle-exclamation"></i></div>
+                    </div>
+                    <div class="kpi-value" id="kpiOverdue">0</div>
+                    <div class="kpi-subtext text-danger fw-bold"><i class="fa-solid fa-triangle-exclamation me-1"></i>
+                        Action Required Immediately</div>
+                </div>
+
+                <div class="kpi-card kpi-wo" onclick="switchRentalTab('workOrdersTab')">
+                    <div class="kpi-top">
+                        <span class="kpi-label">Work Orders</span>
+                        <div class="kpi-icon-wrap"><i class="fa-solid fa-file-invoice-dollar"></i></div>
+                    </div>
+                    <div class="kpi-value" id="kpiActiveWO">0</div>
+                    <div class="kpi-subtext"><i class="fa-solid fa-handshake me-1"></i> Registered Vendor Contracts
+                    </div>
+                </div>
+
+                <div class="kpi-card kpi-req" onclick="switchRentalTab('userRequestsTab')">
+                    <div class="kpi-top">
+                        <span class="kpi-label">User Requests</span>
+                        <div class="kpi-icon-wrap"><i class="fa-solid fa-user-plus"></i></div>
+                    </div>
+                    <div class="kpi-value" id="kpiPendingReq">0</div>
+                    <div class="kpi-subtext"><i class="fa-solid fa-hourglass-half me-1"></i> Dept & Zone Requisitions
+                    </div>
+                </div>
+            </div>
+
+            <!-- Visual Charts Grid -->
+            <div class="analytics-grid">
+                <div class="chart-card">
+                    <h4><i class="fa-solid fa-chart-column text-primary"></i> Department-Wise Asset Allocation</h4>
+                    <div style="height: 250px;">
+                        <canvas id="deptDistributionChart"></canvas>
+                    </div>
+                </div>
+                <div class="chart-card">
+                    <h4><i class="fa-solid fa-chart-pie text-success"></i> Return Schedule & Health Radar</h4>
+                    <div style="height: 250px;">
+                        <canvas id="returnStatusChart"></canvas>
+                    </div>
+                </div>
+            </div>
+
+            <!-- Priority Overdue Radar Quick Table -->
+            <div class="section-header-bar">
+                <div class="section-title">
+                    <i class="fa-solid fa-radiation text-danger fs-5"></i>
+                    <div>
+                        <h3>High Priority Return Overdue Radar</h3>
+                        <span>Assets requiring immediate department follow-up and return notice generation</span>
+                    </div>
+                </div>
+                <div class="action-btn-group">
+                    <button class="btn-custom btn-custom-outline"
+                        onclick="exportTableToExcel('radarOverdueTable', 'GCC_Overdue_Rental_Assets')">
+                        <i class="fa-solid fa-file-excel text-success"></i> Export Radar
+                    </button>
+                    <button class="btn-custom btn-custom-primary" onclick="openIssueAssetModal()">
+                        <i class="fa-solid fa-plus-circle"></i> Issue New Asset
+                    </button>
+                </div>
+            </div>
+
+            <div class="table-card">
+                <div class="table-responsive">
+                    <table class="custom-table" id="radarOverdueTable">
+                        <thead>
+                            <tr>
+                                <th>Department & Location</th>
+                                <th>Custodian / Officer</th>
+                                <th>Issued Items (Sys / Prt / Ltp)</th>
+                                <th>Issue Date</th>
+                                <th>Due Date</th>
+                                <th>Overdue Days</th>
+                                <th>Action</th>
+                            </tr>
+                        </thead>
+                        <tbody id="radarOverdueTableBody">
+                            <!-- Injected -->
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </section>
+
+
+        <!-- ========================================================================= -->
+        <!-- TAB 1: WORK ORDER FILE CREATION & REGISTRY -->
+        <!-- ========================================================================= -->
+        <section id="workOrdersTab" class="tab-panel-section">
+            <div class="section-header-bar">
+                <div class="section-title">
+                    <i class="fa-solid fa-file-contract text-primary fs-5"></i>
+                    <div>
+                        <h3>1. Work Order File Creation & Contract Registry</h3>
+                        <span>File No, File Subject, Period From/To, Vendor Name & Quantities with Model Names for
+                            Systems, Printers, Laptops</span>
+                    </div>
+                </div>
+                <div class="action-btn-group">
+                    <div class="search-input-wrap">
+                        <i class="fa-solid fa-magnifying-glass"></i>
+                        <input type="text" onkeyup="filterGenericTable('woTable', this.value)"
+                            placeholder="Search WO No, Subject, Vendor...">
+                    </div>
+                    <button class="btn-custom btn-custom-primary" onclick="openNewWOModal()">
+                        <i class="fa-solid fa-plus"></i> Create Work Order File
+                    </button>
+                    <button class="btn-custom btn-custom-outline"
+                        onclick="exportTableToExcel('woTable', 'GCC_Rental_Work_Orders')">
+                        <i class="fa-solid fa-file-excel text-success"></i> Excel Export
+                    </button>
+                </div>
+            </div>
+
+            <div class="table-card">
+                <div class="table-responsive">
+                    <table class="custom-table" id="woTable">
+                        <thead>
+                            <tr>
+                                <th>WO File No</th>
+                                <th>File Subject</th>
+                                <th>Contract Period</th>
+                                <th>Vendor Name</th>
+                                <th>Systems (Qty & Model)</th>
+                                <th>Printers (Qty & Model)</th>
+                                <th>Laptops (Qty & Model)</th>
+                                <th>Total Units</th>
+                                <th>WO Copy</th>
+                                <th>Status</th>
+                            </tr>
+                        </thead>
+                        <tbody id="woTableBody">
+                            <!-- Injected -->
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </section>
+
+
+        <!-- ========================================================================= -->
+        <!-- TAB 2: REQUEST CREATION -->
+        <!-- ========================================================================= -->
+        <section id="userRequestsTab" class="tab-panel-section">
+            <div class="section-header-bar">
+                <div class="section-title">
+                    <i class="fa-solid fa-clipboard-list text-info fs-5"></i>
+                    <div>
+                        <h3>2. Department User Request Creation</h3>
+                        <span>Tapal No & Date, Department & Zone Dropdowns, Requested Qty (Systems, Printers, Laptops),
+                            Required Period (Days Calculated), Mail Copy Upload & Dynamic Status</span>
+                    </div>
+                </div>
+                <div class="action-btn-group">
+                    <div class="search-input-wrap">
+                        <i class="fa-solid fa-magnifying-glass"></i>
+                        <input type="text" onkeyup="filterGenericTable('reqTable', this.value)"
+                            placeholder="Search Tapal No, Dept, Zone...">
+                    </div>
+                    <button class="btn-custom btn-custom-primary" onclick="openNewRequestModal()">
+                        <i class="fa-solid fa-plus-circle"></i> Create Request
+                    </button>
+                    <button class="btn-custom btn-custom-outline"
+                        onclick="exportTableToExcel('reqTable', 'GCC_Department_Rental_Requests')">
+                        <i class="fa-solid fa-file-excel text-success"></i> Export
+                    </button>
+                </div>
+            </div>
+
+            <div class="table-card">
+                <div class="table-responsive">
+                    <table class="custom-table" id="reqTable">
+                        <thead>
+                            <tr>
+                                <th>Tapal No & Date</th>
+                                <th>Department & Zone</th>
+                                <th>Requesting Officer</th>
+                                <th>Systems Qty</th>
+                                <th>Printers Qty</th>
+                                <th>Laptops Qty</th>
+                                <th>Required Period</th>
+                                <th>Duration (Days)</th>
+                                <th>Mail Copy</th>
+                                <th>Status</th>
+                                <th>Action</th>
+                            </tr>
+                        </thead>
+                        <tbody id="reqTableBody">
+                            <!-- Injected -->
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </section>
+
+
+        <!-- ========================================================================= -->
+        <!-- TAB 3: DELIVERY CHALLAN (DC) UPLOAD FOR INWARD STOCK -->
+        <!-- ========================================================================= -->
+        <section id="challansTab" class="tab-panel-section">
+            <div class="section-header-bar">
+                <div class="section-title">
+                    <i class="fa-solid fa-truck-ramp-box text-warning fs-5"></i>
+                    <div>
+                        <h3>3. Delivery Challan (DC) Upload for Inward Stock</h3>
+                        <span>Inward stock entry against registered Work Order, DC No, DC Date, Inward Qty (Systems,
+                            Printers, Laptops) & DC File Upload</span>
+                    </div>
+                </div>
+                <div class="action-btn-group">
+                    <div class="search-input-wrap">
+                        <i class="fa-solid fa-magnifying-glass"></i>
+                        <input type="text" onkeyup="filterGenericTable('dcTable', this.value)"
+                            placeholder="Search DC No, WO File No, Vendor...">
+                    </div>
+                    <button class="btn-custom btn-custom-primary" onclick="openNewDCModal()">
+                        <i class="fa-solid fa-file-invoice"></i> Upload Inward DC Stock
+                    </button>
+                    <button class="btn-custom btn-custom-outline"
+                        onclick="exportTableToExcel('dcTable', 'GCC_Rental_Inward_Delivery_Challans')">
+                        <i class="fa-solid fa-file-excel text-success"></i> Export
+                    </button>
+                </div>
+            </div>
+
+            <div class="table-card">
+                <div class="table-responsive">
+                    <table class="custom-table" id="dcTable">
+                        <thead>
+                            <tr>
+                                <th>DC No & Date</th>
+                                <th>Work Order Ref</th>
+                                <th>Vendor Name</th>
+                                <th>Inward Systems</th>
+                                <th>Inward Printers</th>
+                                <th>Inward Laptops</th>
+                                <th>Total Stock</th>
+                                <th>Vehicle / Driver</th>
+                                <th>DC File Copy</th>
+                                <th>Received By</th>
+                            </tr>
+                        </thead>
+                        <tbody id="dcTableBody">
+                            <!-- Injected -->
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </section>
+
+
+        <!-- ========================================================================= -->
+        <!-- TAB 4: ISSUED DETAILS FROM INWARD STOCK & USER REQUEST -->
+        <!-- ========================================================================= -->
+        <section id="issuedTab" class="tab-panel-section">
+            <div class="section-header-bar">
+                <div class="section-title">
+                    <i class="fa-solid fa-hand-holding-box text-primary fs-5"></i>
+                    <div>
+                        <h3>4. Request Creation Issued Details (Asset Allocation)</h3>
+                        <span>Issued Date, Issued Qty (Systems, Printers, Laptops), Issued Period (Days Calculated),
+                            Stock Copy Upload & Custodian Details</span>
+                    </div>
+                </div>
+                <div class="action-btn-group">
+                    <div class="search-input-wrap">
+                        <i class="fa-solid fa-magnifying-glass"></i>
+                        <input type="text" onkeyup="filterGenericTable('issuedTable', this.value)"
+                            placeholder="Search Department, Officer, Tapal...">
+                    </div>
+                    <button class="btn-custom btn-custom-primary" onclick="openIssueAssetModal()">
+                        <i class="fa-solid fa-box-check"></i> Issue Asset to Department
+                    </button>
+                    <button class="btn-custom btn-custom-outline"
+                        onclick="exportTableToExcel('issuedTable', 'GCC_Active_Issued_Assets')">
+                        <i class="fa-solid fa-file-excel text-success"></i> Export
+                    </button>
+                </div>
+            </div>
+
+            <div class="table-card">
+                <div class="table-responsive">
+                    <table class="custom-table" id="issuedTable">
+                        <thead>
+                            <tr>
+                                <th>Tapal Ref / Dept</th>
+                                <th>Custodian Officer & Phone</th>
+                                <th>Issued Date</th>
+                                <th>Issued Systems</th>
+                                <th>Issued Printers</th>
+                                <th>Issued Laptops</th>
+                                <th>Issued Period</th>
+                                <th>Days</th>
+                                <th>Stock Copy</th>
+                                <th>Status</th>
+                                <th>Action</th>
+                            </tr>
+                        </thead>
+                        <tbody id="issuedTableBody">
+                            <!-- Injected -->
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </section>
+
+
+        <!-- ========================================================================= -->
+        <!-- TAB 5: RETURN DETAILS -->
+        <!-- ========================================================================= -->
+        <section id="returnsTab" class="tab-panel-section">
+            <div class="section-header-bar">
+                <div class="section-title">
+                    <i class="fa-solid fa-arrow-rotate-left text-success fs-5"></i>
+                    <div>
+                        <h3>5. Return Details & Quality Intake</h3>
+                        <span>Return Date, Returned Qty (Systems, Printers, Laptops), Stock Copy Upload & Post-Return
+                            Status ('Completed' / 'Pending' from Master Status)</span>
+                    </div>
+                </div>
+                <div class="action-btn-group">
+                    <div class="search-input-wrap">
+                        <i class="fa-solid fa-magnifying-glass"></i>
+                        <input type="text" onkeyup="filterGenericTable('returnsTable', this.value)"
+                            placeholder="Search Return ID, Dept, Officer...">
+                    </div>
+                    <button class="btn-custom btn-custom-success" onclick="openReturnAssetModal()">
+                        <i class="fa-solid fa-check-double"></i> Process Return Intake
+                    </button>
+                    <button class="btn-custom btn-custom-outline"
+                        onclick="exportTableToExcel('returnsTable', 'GCC_Asset_Returns_Log')">
+                        <i class="fa-solid fa-file-excel text-success"></i> Export
+                    </button>
+                </div>
+            </div>
+
+            <div class="table-card">
+                <div class="table-responsive">
+                    <table class="custom-table" id="returnsTable">
+                        <thead>
+                            <tr>
+                                <th>Department & Location</th>
+                                <th>Custodian Officer</th>
+                                <th>Return Date</th>
+                                <th>Ret Systems</th>
+                                <th>Ret Printers</th>
+                                <th>Ret Laptops</th>
+                                <th>Total Returned</th>
+                                <th>Stock Copy</th>
+                                <th>Post-Return Status</th>
+                                <th>Condition</th>
+                                <th>Received By</th>
+                            </tr>
+                        </thead>
+                        <tbody id="returnsTableBody">
+                            <!-- Injected -->
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </section>
+
+
+        <!-- ========================================================================= -->
+        <!-- TAB 6: DATE CALCULATOR, REMINDERS & DEPARTMENT NOTIFICATIONS -->
+        <!-- ========================================================================= -->
+        <section id="remindersTab" class="tab-panel-section">
+            <div class="section-header-bar">
+                <div class="section-title">
+                    <i class="fa-solid fa-bell-ring text-danger fs-5"></i>
+                    <div>
+                        <h3>Automated Return Date Calculator & Department Reminder Engine</h3>
+                        <span>Calculates rental duration, days overdue, and dispatches formal return notices to
+                            departments</span>
+                    </div>
+                </div>
+                <div class="action-btn-group">
+                    <button class="btn-custom btn-custom-danger" onclick="openBulkReminderModal()">
+                        <i class="fa-solid fa-paper-plane"></i> Send Bulk Overdue Notices
+                    </button>
+                    <button class="btn-custom btn-custom-outline"
+                        onclick="exportTableToExcel('remindersTable', 'GCC_Rental_Reminders_Ledger')">
+                        <i class="fa-solid fa-file-excel text-success"></i> Export History
+                    </button>
+                </div>
+            </div>
+
+            <div class="table-card">
+                <div class="table-responsive">
+                    <table class="custom-table" id="remindersTable">
+                        <thead>
+                            <tr>
+                                <th>Department & Zone</th>
+                                <th>Custodian Officer & Phone</th>
+                                <th>Issued Items</th>
+                                <th>Issued Date</th>
+                                <th>Return Due Date</th>
+                                <th>Calculated Due Status</th>
+                                <th>Action</th>
+                            </tr>
+                        </thead>
+                        <tbody id="remindersTableBody">
+                            <!-- Injected -->
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </section>
+
+
+        <!-- ========================================================================= -->
+        <!-- TAB 7: MASTER LEDGER & EXCEL REPORTS -->
+        <!-- ========================================================================= -->
+        <section id="reportsTab" class="tab-panel-section">
+            <div class="section-header-bar">
+                <div class="section-title">
+                    <i class="fa-solid fa-file-invoice text-primary fs-5"></i>
+                    <div>
+                        <h3>Master Rental Asset Ledger & Comprehensive Reports</h3>
+                        <span>Download full audit trails, department reconciliation sheets, and stock utilization
+                            reports</span>
+                    </div>
+                </div>
+                <div class="action-btn-group">
+                    <button class="btn-custom btn-custom-success"
+                        onclick="exportTableToExcel('masterReportTable', 'GCC_Rental_Master_Ledger_Complete')">
+                        <i class="fa-solid fa-download"></i> Download Master Excel
+                    </button>
+                    <button class="btn-custom btn-custom-outline" onclick="window.print()">
+                        <i class="fa-solid fa-print"></i> Print Summary
+                    </button>
+                </div>
+            </div>
+
+            <div class="table-card">
+                <div class="table-responsive">
+                    <table class="custom-table" id="masterReportTable">
+                        <thead>
+                            <tr>
+                                <th>Ref / Dept</th>
+                                <th>Custodian Officer</th>
+                                <th>Issued Date</th>
+                                <th>Return Due Date</th>
+                                <th>Systems Qty</th>
+                                <th>Printers Qty</th>
+                                <th>Laptops Qty</th>
+                                <th>Total Qty</th>
+                                <th>Status</th>
+                            </tr>
+                        </thead>
+                        <tbody id="masterReportTableBody">
+                            <!-- Injected -->
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </section>
+
+    </main>
+
+
+    <!-- ========================================================================= -->
+    <!-- MODALS SECTION -->
+    <!-- ========================================================================= -->
+
+    <!-- MODAL 1: CREATE NEW WORK ORDER (File No, Subject, From/To, Vendor, Systems/Printers/Laptops Model & Qty) -->
+    <div class="modal fade" id="newWOModal" tabindex="-1" aria-hidden="true">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title"><i class="fa-solid fa-file-contract me-2"></i> 1. Create Work Order File
+                    </h5>
+                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                </div>
+                <form id="newWOForm" onsubmit="handleSaveWO(event)">
+                    <div class="modal-body">
+                        <div class="row g-3">
+                            <div class="col-md-6">
+                                <label class="form-label">Work Order File No *</label>
+                                <input type="text" class="form-control" id="woFileNoInput" required
+                                    placeholder="e.g. GCC/IT/WO/2026/092">
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Vendor Name *</label>
+                                <select class="form-select" id="woVendorInput" required>
+                                    <option value="">-- Select Vendor --</option>
+                                    <!-- Populated from payment_vendors_list -->
+                                </select>
+                            </div>
+                            <div class="col-12">
+                                <label class="form-label">File Subject *</label>
+                                <input type="text" class="form-control" id="woSubjectInput" required
+                                    placeholder="e.g. Outsourcing of Rental IT Hardware for Zonal Revenue Assessment Drives">
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">File Period From Date *</label>
+                                <input type="date" class="form-control" id="woFromDateInput" required
+                                    onchange="calculateWODuration()">
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">File Period To Date *</label>
+                                <input type="date" class="form-control" id="woToDateInput" required
+                                    onchange="calculateWODuration()">
+                            </div>
+
+                            <!-- Item Quantities and Model Names -->
+                            <div class="col-12">
+                                <h6 class="fw-bold text-primary border-bottom pb-2 mt-2"><i
+                                        class="fa-solid fa-boxes-stacked me-1"></i> Quantities & Model Names</h6>
+                            </div>
+                            <div class="col-md-4">
+                                <label class="form-label">Systems (Desktop) Qty</label>
+                                <input type="number" class="form-control" id="woSystemsQtyInput" min="0" value="0"
+                                    placeholder="Qty">
+                            </div>
+                            <div class="col-md-8">
+                                <label class="form-label">Systems Model Name</label>
+                                <input type="text" class="form-control" id="woSystemsModelInput"
+                                    placeholder="e.g. Dell OptiPlex 3080 Core i5 / 16GB / 512GB SSD">
+                            </div>
+
+                            <div class="col-md-4">
+                                <label class="form-label">Printers Qty</label>
+                                <input type="number" class="form-control" id="woPrintersQtyInput" min="0" value="0"
+                                    placeholder="Qty">
+                            </div>
+                            <div class="col-md-8">
+                                <label class="form-label">Printers Model Name</label>
+                                <input type="text" class="form-control" id="woPrintersModelInput"
+                                    placeholder="e.g. HP LaserJet Pro MFP 4104dw Heavy Duty">
+                            </div>
+
+                            <div class="col-md-4">
+                                <label class="form-label">Laptops Qty</label>
+                                <input type="number" class="form-control" id="woLaptopsQtyInput" min="0" value="0"
+                                    placeholder="Qty">
+                            </div>
+                            <div class="col-md-8">
+                                <label class="form-label">Laptops Model Name</label>
+                                <input type="text" class="form-control" id="woLaptopsModelInput"
+                                    placeholder="e.g. Dell Latitude 5440 Core i7 / 16GB RAM">
+                            </div>
+
+                            <div class="col-md-6">
+                                <label class="form-label">Upload Work Order Copy (PDF / Doc)</label>
+                                <input type="file" class="form-control" id="woCopyFileInput"
+                                    accept=".pdf,.doc,.docx,.jpg,.png">
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Remarks / Sanction Ref</label>
+                                <input type="text" class="form-control" id="woRemarksInput"
+                                    placeholder="Approved vide IT Cell Sanction Ref...">
+                            </div>
+
+                            <div class="col-12">
+                                <div class="date-calc-box" id="woDurationBox">
+                                    <i class="fa-solid fa-calculator text-success fs-5"></i>
+                                    <div>
+                                        <strong>Calculated Contract Tenure:</strong> <span
+                                            id="woCalculatedTenure">-</span>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+                        <button type="submit" class="btn btn-primary"><i class="fa-solid fa-save me-1"></i> Save Work
+                            Order</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+
+
+    <!-- MODAL 2: CREATE REQUEST (Tapal No, Date, Dept/Zone Dropdown, Systems/Prt/Ltp Qty, Period From/To + Calculated Days, Mail Copy Upload, Dynamic Status) -->
+    <div class="modal fade" id="newRequestModal" tabindex="-1" aria-hidden="true">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title"><i class="fa-solid fa-clipboard-question me-2"></i> 2. Create Department
+                        Asset Request</h5>
+                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                </div>
+                <form id="newRequestForm" onsubmit="handleSaveRequest(event)">
+                    <div class="modal-body">
+                        <div class="row g-3">
+                            <div class="col-md-6">
+                                <label class="form-label">Tapal No *</label>
+                                <input type="text" class="form-control" id="reqTapalNoInput" required
+                                    placeholder="e.g. TP/IT/2026/041">
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Tapal Date *</label>
+                                <input type="date" class="form-control" id="reqTapalDateInput" required>
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Location - Department * (From Toner Dept API)</label>
+                                <select class="form-select" id="reqDeptInput" required>
+                                    <option value="">-- Select Department --</option>
+                                    <!-- Populated from toner_department_list API -->
+                                </select>
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Location - Zone (From Toner Zone API)</label>
+                                <select class="form-select" id="reqZoneInput">
+                                    <option value="">-- Select Zone (Optional) --</option>
+                                    <!-- Populated from toner_zone_list API -->
+                                </select>
+                            </div>
+
+                            <div class="col-md-4">
+                                <label class="form-label">Requested Systems Qty</label>
+                                <input type="number" class="form-control" id="reqSystemsQtyInput" min="0" value="0">
+                            </div>
+                            <div class="col-md-4">
+                                <label class="form-label">Requested Printers Qty</label>
+                                <input type="number" class="form-control" id="reqPrintersQtyInput" min="0" value="0">
+                            </div>
+                            <div class="col-md-4">
+                                <label class="form-label">Requested Laptops Qty</label>
+                                <input type="number" class="form-control" id="reqLaptopsQtyInput" min="0" value="0">
+                            </div>
+
+                            <div class="col-md-6">
+                                <label class="form-label">Required Period - From Date *</label>
+                                <input type="date" class="form-control" id="reqFromDateInput" required
+                                    onchange="calculateRequestDuration()">
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Required Period - To Date *</label>
+                                <input type="date" class="form-control" id="reqToDateInput" required
+                                    onchange="calculateRequestDuration()">
+                            </div>
+
+                            <div class="col-12">
+                                <div class="date-calc-box" id="reqDurationBox">
+                                    <i class="fa-solid fa-stopwatch text-success fs-5"></i>
+                                    <div>
+                                        <strong>Calculated Duration:</strong> <span id="reqDurationDaysText">-</span>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="col-md-6">
+                                <label class="form-label">Upload Mail Copy (PDF / Scan)</label>
+                                <input type="file" class="form-control" id="reqMailCopyFileInput"
+                                    accept=".pdf,.doc,.docx,.jpg,.png">
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Request Status * (From Master Table)</label>
+                                <select class="form-select" id="reqStatusInput" required>
+                                    <!-- Populated dynamically from rental_master_status_list -->
+                                </select>
+                            </div>
+
+                            <div class="col-md-6">
+                                <label class="form-label">Requesting Officer Name & Designation</label>
+                                <input type="text" class="form-control" id="reqOfficerInput"
+                                    placeholder="e.g. Dr. K. Ramanathan, AEE">
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Contact Mobile / Email</label>
+                                <input type="text" class="form-control" id="reqContactInput"
+                                    placeholder="e.g. 98401XXXXX">
+                            </div>
+                            <div class="col-12">
+                                <label class="form-label">Purpose / Event Description</label>
+                                <textarea class="form-control" id="reqPurposeInput" rows="2"
+                                    placeholder="Required for Stormwater Drain Monsoon Monitoring Control Room..."></textarea>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+                        <button type="submit" class="btn btn-primary"><i class="fa-solid fa-paper-plane me-1"></i>
+                            Submit Request</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+
+
+    <!-- MODAL 3: INWARD DELIVERY CHALLAN (DC) UPLOAD -->
+    <div class="modal fade" id="newDCModal" tabindex="-1" aria-hidden="true">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title"><i class="fa-solid fa-truck-ramp-box me-2"></i> 3. Delivery Challan (DC)
+                        Inward Stock Upload</h5>
+                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                </div>
+                <form id="newDCForm" onsubmit="handleSaveDC(event)">
+                    <div class="modal-body">
+                        <div class="row g-3">
+                            <div class="col-md-6">
+                                <label class="form-label">Registered Work Order *</label>
+                                <select class="form-select" id="dcWOSelect" required
+                                    onchange="populateDCVendorFromWO(this.value)">
+                                    <option value="">-- Select Work Order --</option>
+                                    <!-- Populated from rental_workorder_register -->
+                                </select>
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Vendor Name</label>
+                                <input type="text" class="form-control bg-light" id="dcVendorDisplay" readonly
+                                    placeholder="Auto-populated from WO">
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Delivery Challan (DC) No *</label>
+                                <input type="text" class="form-control" id="dcNumberInput" required
+                                    placeholder="e.g. DC-INW-2026-104">
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Challan Date *</label>
+                                <input type="date" class="form-control" id="dcDateInput" required>
+                            </div>
+
+                            <div class="col-md-4">
+                                <label class="form-label">Inward Systems Qty</label>
+                                <input type="number" class="form-control" id="dcSystemsQtyInput" min="0" value="0">
+                            </div>
+                            <div class="col-md-4">
+                                <label class="form-label">Inward Printers Qty</label>
+                                <input type="number" class="form-control" id="dcPrintersQtyInput" min="0" value="0">
+                            </div>
+                            <div class="col-md-4">
+                                <label class="form-label">Inward Laptops Qty</label>
+                                <input type="number" class="form-control" id="dcLaptopsQtyInput" min="0" value="0">
+                            </div>
+
+                            <div class="col-md-6">
+                                <label class="form-label">Upload Delivery Challan (DC) Stock Copy *</label>
+                                <input type="file" class="form-control" id="dcFileInput"
+                                    accept=".pdf,.doc,.docx,.jpg,.png" required>
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Vehicle Registration No</label>
+                                <input type="text" class="form-control" id="dcVehicleInput"
+                                    placeholder="e.g. TN-01-AB-4567">
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Received By (Store Officer)</label>
+                                <input type="text" class="form-control" id="dcReceivedByInput"
+                                    placeholder="e.g. M. Suresh, IT Central Store Officer">
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Remarks / Gate Pass Ref</label>
+                                <input type="text" class="form-control" id="dcRemarksInput"
+                                    placeholder="Verified OK against WO Quota">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+                        <button type="submit" class="btn btn-primary"><i class="fa-solid fa-save me-1"></i> Save Inward
+                            Stock DC</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+
+
+    <!-- MODAL 4: ISSUED DETAILS (From Inward Stock & User Request) -->
+    <div class="modal fade" id="issueAssetModal" tabindex="-1" aria-hidden="true">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title"><i class="fa-solid fa-hand-holding-box me-2"></i> 4. Request Creation -
+                        Issued Details</h5>
+                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                </div>
+                <form id="issueAssetForm" onsubmit="handleSaveIssueAsset(event)">
+                    <div class="modal-body">
+                        <div class="row g-3">
+                            <div class="col-md-6">
+                                <label class="form-label">Select User Request *</label>
+                                <select class="form-select" id="issueReqSelect" required
+                                    onchange="populateIssueDetailsFromReq(this.value)">
+                                    <option value="">-- Choose User Request --</option>
+                                    <!-- Populated from rental_user_request -->
+                                </select>
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Select Inward Stock DC (Optional)</label>
+                                <select class="form-select" id="issueInwardDCSelect">
+                                    <option value="">-- Choose Inward DC (Optional) --</option>
+                                    <!-- Populated from rental_inward_delivery_challan -->
+                                </select>
+                            </div>
+
+                            <div class="col-md-6">
+                                <label class="form-label">Department & Location</label>
+                                <input type="text" class="form-control bg-light" id="issueDeptDisplay" readonly
+                                    placeholder="Auto-populated">
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Issued Date *</label>
+                                <input type="date" class="form-control" id="issueDateInput" required>
+                            </div>
+
+                            <div class="col-md-4">
+                                <label class="form-label">Issued Systems Qty</label>
+                                <input type="number" class="form-control" id="issueSystemsQtyInput" min="0" value="0">
+                            </div>
+                            <div class="col-md-4">
+                                <label class="form-label">Issued Printers Qty</label>
+                                <input type="number" class="form-control" id="issuePrintersQtyInput" min="0" value="0">
+                            </div>
+                            <div class="col-md-4">
+                                <label class="form-label">Issued Laptops Qty</label>
+                                <input type="number" class="form-control" id="issueLaptopsQtyInput" min="0" value="0">
+                            </div>
+
+                            <div class="col-12">
+                                <label class="form-label">Asset Tag / Serial Numbers (Comma Separated)</label>
+                                <input type="text" class="form-control" id="issueSerialDetailsInput"
+                                    placeholder="e.g. GCC-RN-LTP-088, GCC-RN-LTP-089, HP-PRT-012">
+                            </div>
+
+                            <div class="col-md-6">
+                                <label class="form-label">Issued Period - From Date *</label>
+                                <input type="date" class="form-control" id="issueFromDateInput" required
+                                    onchange="calculateIssuedDuration()">
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Issued Period - To Date *</label>
+                                <input type="date" class="form-control" id="issueToDateInput" required
+                                    onchange="calculateIssuedDuration()">
+                            </div>
+
+                            <div class="col-12">
+                                <div class="date-calc-box" id="issueDurationBox">
+                                    <i class="fa-solid fa-stopwatch text-success fs-5"></i>
+                                    <div>
+                                        <strong>Calculated Rental Duration:</strong> <span
+                                            id="issueDurationDaysText">-</span>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="col-md-6">
+                                <label class="form-label">Upload Stock Issue Copy (Acknowledgment / Handover
+                                    Slip)</label>
+                                <input type="file" class="form-control" id="issueStockCopyFileInput"
+                                    accept=".pdf,.doc,.docx,.jpg,.png">
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Custodian Officer Name</label>
+                                <input type="text" class="form-control" id="issueCustodianOfficerInput"
+                                    placeholder="e.g. Thiru. M. Anbarasan, ZO">
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Custodian Contact No</label>
+                                <input type="text" class="form-control" id="issueContactNoInput"
+                                    placeholder="e.g. 9841098765">
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Issued By (Officer)</label>
+                                <input type="text" class="form-control" id="issueIssuedByInput"
+                                    placeholder="e.g. IT Store Officer">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+                        <button type="submit" class="btn btn-primary"><i class="fa-solid fa-check-circle me-1"></i>
+                            Register Issue Details</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+
+
+    <!-- MODAL 5: RETURN DETAILS -->
+    <div class="modal fade" id="returnAssetModal" tabindex="-1" aria-hidden="true">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title"><i class="fa-solid fa-arrow-rotate-left me-2"></i> 5. Process Return Details
+                    </h5>
+                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                </div>
+                <form id="returnAssetForm" onsubmit="handleSaveReturn(event)">
+                    <div class="modal-body">
+                        <div class="row g-3">
+                            <div class="col-md-6">
+                                <label class="form-label">Select Issued Item / Department *</label>
+                                <select class="form-select" id="returnIssuedSelect" required
+                                    onchange="populateReturnFromIssued(this.value)">
+                                    <option value="">-- Choose Issued Record --</option>
+                                    <!-- Populated from rental_issued_details -->
+                                </select>
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Return Date *</label>
+                                <input type="date" class="form-control" id="returnDateInput" required>
+                            </div>
+
+                            <div class="col-md-6">
+                                <label class="form-label">Department & Custodian</label>
+                                <input type="text" class="form-control bg-light" id="returnDeptDisplay" readonly
+                                    placeholder="Auto-populated">
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Original Scheduled Due Date</label>
+                                <input type="text" class="form-control bg-light" id="returnDueDateDisplay" readonly
+                                    placeholder="Auto-populated">
+                            </div>
+
+                            <div class="col-md-4">
+                                <label class="form-label">Returned Systems Qty</label>
+                                <input type="number" class="form-control" id="returnSystemsQtyInput" min="0" value="0">
+                            </div>
+                            <div class="col-md-4">
+                                <label class="form-label">Returned Printers Qty</label>
+                                <input type="number" class="form-control" id="returnPrintersQtyInput" min="0" value="0">
+                            </div>
+                            <div class="col-md-4">
+                                <label class="form-label">Returned Laptops Qty</label>
+                                <input type="number" class="form-control" id="returnLaptopsQtyInput" min="0" value="0">
+                            </div>
+
+                            <div class="col-md-6">
+                                <label class="form-label">Upload Return Stock Copy (Return Receipt / Clearance
+                                    PDF)</label>
+                                <input type="file" class="form-control" id="returnStockCopyFileInput"
+                                    accept=".pdf,.doc,.docx,.jpg,.png">
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">After Return Status * (From Master Table)</label>
+                                <select class="form-select" id="returnStatusInput" required>
+                                    <!-- Populated from rental_master_status_list where type='RETURN' -->
+                                </select>
+                            </div>
+
+                            <div class="col-md-6">
+                                <label class="form-label">Physical & Operational Condition Grade</label>
+                                <select class="form-select" id="returnConditionInput">
+                                    <option value="Good Condition / Normal Wear">Good Condition / Normal Wear</option>
+                                    <option value="Minor Scratch / Tested Working">Minor Scratch / Tested Working
+                                    </option>
+                                    <option value="Damaged Screen / Keyboard">Damaged Screen / Keyboard</option>
+                                    <option value="Missing Adapter / Bag / Cables">Missing Adapter / Bag / Cables
+                                    </option>
+                                </select>
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Received By (Store Officer)</label>
+                                <input type="text" class="form-control" id="returnReceivedByInput"
+                                    placeholder="e.g. M. Suresh, IT Store Officer">
+                            </div>
+                            <div class="col-12">
+                                <label class="form-label">Damage / Return Remarks</label>
+                                <textarea class="form-control" id="returnRemarksInput" rows="2"
+                                    placeholder="Hardware tested and sanitized. Handover clearance completed."></textarea>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+                        <button type="submit" class="btn btn-success"><i class="fa-solid fa-circle-check me-1"></i> Save
+                            Return Details</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+
+
+    <!-- MODAL 6: SEND SINGLE DEPARTMENT RETURN REMINDER -->
+    <div class="modal fade" id="sendReminderModal" tabindex="-1" aria-hidden="true">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title"><i class="fa-solid fa-paper-plane me-2"></i> Dispatch Official Asset Return
+                        Notice</h5>
+                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                </div>
+                <div class="modal-body">
+                    <div class="row g-3">
+                        <div class="col-md-6">
+                            <label class="form-label">Recipient Department</label>
+                            <input type="text" class="form-control bg-light" id="reminderDeptDisplay" readonly>
+                        </div>
+                        <div class="col-md-6">
+                            <label class="form-label">Custodian Officer & Contact</label>
+                            <input type="text" class="form-control bg-light" id="reminderOfficerDisplay" readonly>
+                        </div>
+                        <div class="col-md-6">
+                            <label class="form-label">Scheduled Due Date</label>
+                            <input type="text" class="form-control bg-light" id="reminderDueDateDisplay" readonly>
+                        </div>
+                        <div class="col-md-6">
+                            <label class="form-label">Overdue Severity</label>
+                            <input type="text" class="form-control bg-light text-danger fw-bold"
+                                id="reminderSeverityDisplay" readonly>
+                        </div>
+                        <div class="col-12">
+                            <label class="form-label">Generated GCC Official Return Notice Memo (Preview)</label>
+                            <div class="notice-preview-box" id="reminderNoticePreview"></div>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                    <button type="button" class="btn btn-danger" onclick="confirmDispatchSingleReminder()"><i
+                            class="fa-solid fa-paper-plane me-1"></i> Send Notice Now</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+    <!-- MODAL 7: BULK REMINDER DISPATCH -->
+    <div class="modal fade" id="bulkReminderModal" tabindex="-1" aria-hidden="true">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header bg-danger text-white">
+                    <h5 class="modal-title"><i class="fa-solid fa-bullhorn me-2"></i> Bulk Dispatch Overdue Return
+                        Notices</h5>
+                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                </div>
+                <div class="modal-body">
+                    <div class="alert alert-warning">
+                        <i class="fa-solid fa-triangle-exclamation me-2"></i>
+                        You are about to dispatch automated return notices to <strong>all departments with overdue or
+                            near-due rental assets</strong>.
+                    </div>
+                    <h6 class="fw-bold mb-3">Recipients Queue:</h6>
+                    <div class="table-responsive border rounded-3 mb-3">
+                        <table class="table table-sm table-hover mb-0">
+                            <thead class="table-light">
+                                <tr>
+                                    <th>Dept & Location</th>
+                                    <th>Officer</th>
+                                    <th>Due Date</th>
+                                    <th>Overdue Days</th>
+                                </tr>
+                            </thead>
+                            <tbody id="bulkQueueTableBody">
+                                <!-- Populated dynamically -->
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+                    <button type="button" class="btn btn-danger" onclick="executeBulkReminderDispatch()"><i
+                            class="fa-solid fa-paper-plane me-1"></i> Dispatch All Reminders (<span
+                            id="bulkCountDisplay">0</span>)</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+    <!-- Toast Notification Banner -->
+    <div id="toastNotification" class="toast-notification">
+        <i class="fa-solid fa-circle-check text-success fs-5"></i>
+        <span id="toastMessage">Action completed successfully.</span>
+    </div>
+
+
+    <!-- ========================================================================= -->
+    <!-- JAVASCRIPT ENGINE (API INTEGRATION & CALCULATIONS) -->
+    <!-- ========================================================================= -->
+    <!-- Local Popper & Bootstrap JS -->
+    <script th:src="@{/assets/popper-2.11.8/js/popper.min.js}"></script>
+    <script th:src="@{/assets/bootstrap-5.3.2/js/bootstrap.min.js}"></script>
+    <!-- CDN Fallback for Bootstrap bundle -->
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
+
+    <script th:inline="javascript">
+        const contextPath = /*[[@{/}]]*/ '/';
+    </script>
+
+    <script>
+        // Universal Safe Modal Show / Hide Helpers
+        function showModal(modalId) {
+            const el = document.getElementById(modalId);
+            if (!el) return;
+            if (window.bootstrap && window.bootstrap.Modal) {
+                try {
+                    const instance = bootstrap.Modal.getOrCreateInstance(el);
+                    instance.show();
+                    return;
+                } catch (e) {
+                    console.warn('Bootstrap modal instance error:', e);
+                }
+            }
+            // Direct DOM fallback
+            el.classList.add('show');
+            el.style.display = 'block';
+            document.body.classList.add('modal-open');
+            let backdrop = document.querySelector('.modal-backdrop');
+            if (!backdrop) {
+                backdrop = document.createElement('div');
+                backdrop.className = 'modal-backdrop fade show';
+                document.body.appendChild(backdrop);
+            }
+        }
+
+        function hideModal(modalId) {
+            const el = document.getElementById(modalId);
+            if (!el) return;
+            if (window.bootstrap && window.bootstrap.Modal) {
+                try {
+                    const instance = bootstrap.Modal.getInstance(el);
+                    if (instance) instance.hide();
+                } catch (e) { }
+            }
+            el.classList.remove('show');
+            el.style.display = 'none';
+            document.body.classList.remove('modal-open');
+            const backdrops = document.querySelectorAll('.modal-backdrop');
+            backdrops.forEach(b => b.remove());
+        }
+
+        const TODAY = new Date();
+        const formatDate = (date) => {
+            const d = new Date(date);
+            const month = '' + (d.getMonth() + 1);
+            const day = '' + d.getDate();
+            const year = d.getFullYear();
+            return [year, month.padStart(2, '0'), day.padStart(2, '0')].join('-');
+        };
+
+        const addDays = (date, days) => {
+            const result = new Date(date);
+            result.setDate(result.getDate() + days);
+            return result;
+        };
+
+        // Global State & Master Data Cache
+        let masterData = {
+            departments: [],
+            zones: [],
+            vendors: [],
+            requestStatuses: [],
+            returnStatuses: []
+        };
+
+        let rentalData = {
+            workOrders: [],
+            requests: [],
+            challans: [],
+            issuedAssets: [],
+            returns: [],
+            reminders: []
+        };
+
+        // Helper for CSRF headers
+        function getCsrfHeaders() {
+            const csrfToken = document.querySelector("meta[name='_csrf']")?.getAttribute("content");
+            const csrfHeader = document.querySelector("meta[name='_csrf_header']")?.getAttribute("content");
+            const headers = {};
+            if (csrfToken && csrfHeader) {
+                headers[csrfHeader] = csrfToken;
+            }
+            return headers;
+        }
+
+        // ==========================================
+        // INITIALIZATION & API FETCH
+        // ==========================================
+        document.addEventListener('DOMContentLoaded', async () => {
+            await loadMasterData();
+            await loadAllRentalData();
+        });
+
+        async function loadMasterData() {
+            try {
+                const [deptRes, zoneRes, vendorRes, reqStatRes, retStatRes] = await Promise.all([
+                    fetch(contextPath + 'gccrentalmanagement/api/departments'),
+                    fetch(contextPath + 'gccrentalmanagement/api/zones'),
+                    fetch(contextPath + 'gccrentalmanagement/api/vendors'),
+                    fetch(contextPath + 'gccrentalmanagement/api/statuses?type=REQUEST'),
+                    fetch(contextPath + 'gccrentalmanagement/api/statuses?type=RETURN')
+                ]);
+
+                masterData.departments = await deptRes.json();
+                masterData.zones = await zoneRes.json();
+                masterData.vendors = await vendorRes.json();
+                masterData.requestStatuses = await reqStatRes.json();
+                masterData.returnStatuses = await retStatRes.json();
+
+                populateMasterDropdowns();
+            } catch (err) {
+                console.error('Error loading master data:', err);
+            }
+        }
+
+        function populateMasterDropdowns() {
+            // Departments
+            const deptSelect = document.getElementById('reqDeptInput');
+            deptSelect.innerHTML = '<option value="">-- Select Department --</option>';
+            masterData.departments.forEach(d => {
+                const opt = document.createElement('option');
+                opt.value = d.id;
+                opt.textContent = d.dept_name;
+                deptSelect.appendChild(opt);
+            });
+
+            // Zones
+            const zoneSelect = document.getElementById('reqZoneInput');
+            zoneSelect.innerHTML = '<option value="">-- Select Zone (Optional) --</option>';
+            masterData.zones.forEach(z => {
+                const opt = document.createElement('option');
+                opt.value = z.id;
+                opt.textContent = z.zone_name;
+                zoneSelect.appendChild(opt);
+            });
+
+            // Vendors
+            const vendorSelect = document.getElementById('woVendorInput');
+            vendorSelect.innerHTML = '<option value="">-- Select Vendor --</option>';
+            if (masterData.vendors.length === 0) {
+                // Default options if table empty
+                ['M/s InfoTech Rentals Pvt Ltd', 'M/s Chennai IT Solutions', 'M/s Prime Digital Systems'].forEach(v => {
+                    const opt = document.createElement('option');
+                    opt.value = v;
+                    opt.textContent = v;
+                    vendorSelect.appendChild(opt);
+                });
+            } else {
+                masterData.vendors.forEach(v => {
+                    const opt = document.createElement('option');
+                    opt.value = v.vendor_name;
+                    opt.textContent = v.vendor_name;
+                    vendorSelect.appendChild(opt);
+                });
+            }
+
+            // Request Statuses
+            const reqStatSelect = document.getElementById('reqStatusInput');
+            reqStatSelect.innerHTML = '';
+            masterData.requestStatuses.forEach(s => {
+                const opt = document.createElement('option');
+                opt.value = s.id;
+                opt.textContent = s.status_name;
+                reqStatSelect.appendChild(opt);
+            });
+
+            // Return Statuses
+            const retStatSelect = document.getElementById('returnStatusInput');
+            retStatSelect.innerHTML = '';
+            masterData.returnStatuses.forEach(s => {
+                const opt = document.createElement('option');
+                opt.value = s.id;
+                opt.textContent = s.status_name;
+                retStatSelect.appendChild(opt);
+            });
+        }
+
+        async function loadAllRentalData() {
+            try {
+                const [woRes, reqRes, dcRes, issRes, retRes, remRes] = await Promise.all([
+                    fetch(contextPath + 'gccrentalmanagement/api/workorders'),
+                    fetch(contextPath + 'gccrentalmanagement/api/requests'),
+                    fetch(contextPath + 'gccrentalmanagement/api/inward-challans'),
+                    fetch(contextPath + 'gccrentalmanagement/api/issued-assets'),
+                    fetch(contextPath + 'gccrentalmanagement/api/returns'),
+                    fetch(contextPath + 'gccrentalmanagement/api/reminders')
+                ]);
+
+                rentalData.workOrders = await woRes.json();
+                rentalData.requests = await reqRes.json();
+                rentalData.challans = await dcRes.json();
+                rentalData.issuedAssets = await issRes.json();
+                rentalData.returns = await retRes.json();
+                rentalData.reminders = await remRes.json();
+
+                renderAllTables();
+                renderDashboardMetrics();
+                renderCharts();
+            } catch (err) {
+                console.error('Error fetching rental data:', err);
+            }
+        }
+
+        function renderAllTables() {
+            renderWOTable();
+            renderRequestsTable();
+            renderChallansTable();
+            renderIssuedTable();
+            renderReturnsTable();
+            renderRemindersTable();
+            renderMasterReportTable();
+            populateCrossModuleDropdowns();
+        }
+
+        // ==========================================
+        // UI SWITCHER & TOAST
+        // ==========================================
+        function switchRentalTab(tabId) {
+            document.querySelectorAll('.nav-tab-item').forEach(el => el.classList.remove('active'));
+            document.querySelectorAll('.tab-panel-section').forEach(el => el.classList.remove('active-panel'));
+
+            const targetPanel = document.getElementById(tabId);
+            if (targetPanel) targetPanel.classList.add('active-panel');
+
+            document.querySelectorAll('.nav-tab-item').forEach(btn => {
+                if (btn.getAttribute('onclick')?.includes(tabId)) {
+                    btn.classList.add('active');
+                }
+            });
+            window.scrollTo({ top: 0, behavior: 'smooth' });
+        }
+
+        function showToast(message, isError = false) {
+            const toast = document.getElementById('toastNotification');
+            const toastMsg = document.getElementById('toastMessage');
+            toastMsg.textContent = message;
+            toast.style.background = isError ? '#991b1b' : '#0f172a';
+            toast.classList.add('show');
+            setTimeout(() => toast.classList.remove('show'), 3500);
+        }
+
+        // ==========================================
+        // 1. WORK ORDER RENDERING & ACTIONS
+        // ==========================================
+        function renderWOTable() {
+            const tbody = document.getElementById('woTableBody');
+            tbody.innerHTML = '';
+
+            if (rentalData.workOrders.length === 0) {
+                tbody.innerHTML = '<tr><td colspan="10" class="text-center py-4 text-muted">No Work Orders registered yet. Click "Create Work Order File" to add.</td></tr>';
+                return;
+            }
+
+            rentalData.workOrders.forEach(wo => {
+                const tr = document.createElement('tr');
+                tr.innerHTML = `
+                    <td><strong>${wo.wo_file_no || '-'}</strong></td>
+                    <td>${wo.file_subject || '-'}</td>
+                    <td>${wo.period_from_date || '-'} to ${wo.period_to_date || '-'}</td>
+                    <td><strong>${wo.vendor_name || '-'}</strong></td>
+                    <td><span class="item-breakdown-tag">Qty: ${wo.systems_qty || 0}</span><br><small class="text-muted">${wo.systems_model_name || '-'}</small></td>
+                    <td><span class="item-breakdown-tag">Qty: ${wo.printers_qty || 0}</span><br><small class="text-muted">${wo.printers_model_name || '-'}</small></td>
+                    <td><span class="item-breakdown-tag">Qty: ${wo.laptops_qty || 0}</span><br><small class="text-muted">${wo.laptops_model_name || '-'}</small></td>
+                    <td class="text-center fw-bold text-primary">${wo.total_units || (wo.systems_qty + wo.printers_qty + wo.laptops_qty)}</td>
+                    <td>
+                        ${wo.wo_copy_file ? `<a href="${contextPath}gccrentalmanagementfiles/${wo.wo_copy_file}" target="_blank" class="btn btn-sm btn-outline-primary"><i class="fa-solid fa-file-pdf"></i> View</a>` : '<span class="text-muted">-</span>'}
+                    </td>
+                    <td><span class="badge-status status-active">${wo.status || 'Active'}</span></td>
+                `;
+                tbody.appendChild(tr);
+            });
+        }
+
+        function openNewWOModal() {
+            document.getElementById('woFromDateInput').value = formatDate(TODAY);
+            document.getElementById('woToDateInput').value = formatDate(addDays(TODAY, 180));
+            calculateWODuration();
+            showModal('newWOModal');
+        }
+
+        function calculateWODuration() {
+            const from = document.getElementById('woFromDateInput').value;
+            const to = document.getElementById('woToDateInput').value;
+            if (from && to) {
+                const diffDays = Math.ceil((new Date(to) - new Date(from)) / (1000 * 60 * 60 * 24));
+                const diffMonths = Math.round(diffDays / 30);
+                document.getElementById('woCalculatedTenure').textContent = `${diffDays} Days (~${diffMonths} Months)`;
+            }
+        }
+
+        async function handleSaveWO(event) {
+            event.preventDefault();
+            const formData = new FormData();
+            formData.append('woFileNo', document.getElementById('woFileNoInput').value.trim());
+            formData.append('fileSubject', document.getElementById('woSubjectInput').value.trim());
+            formData.append('periodFromDate', document.getElementById('woFromDateInput').value);
+            formData.append('periodToDate', document.getElementById('woToDateInput').value);
+            formData.append('vendorName', document.getElementById('woVendorInput').value);
+            formData.append('systemsQty', document.getElementById('woSystemsQtyInput').value);
+            formData.append('systemsModel', document.getElementById('woSystemsModelInput').value.trim());
+            formData.append('printersQty', document.getElementById('woPrintersQtyInput').value);
+            formData.append('printersModel', document.getElementById('woPrintersModelInput').value.trim());
+            formData.append('laptopsQty', document.getElementById('woLaptopsQtyInput').value);
+            formData.append('laptopsModel', document.getElementById('woLaptopsModelInput').value.trim());
+            formData.append('remarks', document.getElementById('woRemarksInput').value.trim());
+
+            const fileInput = document.getElementById('woCopyFileInput');
+            if (fileInput.files.length > 0) {
+                formData.append('woCopyFile', fileInput.files[0]);
+            }
+
+            try {
+                const response = await fetch(contextPath + 'gccrentalmanagement/api/workorders/save', {
+                    method: 'POST',
+                    headers: getCsrfHeaders(),
+                    body: formData
+                });
+                const res = await response.json();
+                if (res.success) {
+                    showToast(res.message);
+                    hideModal('newWOModal');
+                    document.getElementById('newWOForm').reset();
+                    await loadAllRentalData();
+                } else {
+                    showToast(res.error || 'Failed to save Work Order', true);
+                }
+            } catch (err) {
+                showToast('Network error saving Work Order', true);
+            }
+        }
+
+        // ==========================================
+        // 2. USER REQUEST RENDERING & ACTIONS
+        // ==========================================
+        function renderRequestsTable() {
+            const tbody = document.getElementById('reqTableBody');
+            tbody.innerHTML = '';
+
+            if (rentalData.requests.length === 0) {
+                tbody.innerHTML = '<tr><td colspan="11" class="text-center py-4 text-muted">No Department Requests recorded yet. Click "Create Request" to add.</td></tr>';
+                return;
+            }
+
+            rentalData.requests.forEach(req => {
+                const tr = document.createElement('tr');
+                tr.innerHTML = `
+                    <td><strong>${req.tapal_no || '-'}</strong><br><small class="text-muted">${req.tapal_date || '-'}</small></td>
+                    <td><strong>${req.dept_name || 'Dept #' + req.department_id}</strong><br><small class="text-muted">${req.zone_name || '-'}</small></td>
+                    <td>${req.requesting_officer || '-'}<br><small class="text-muted">${req.contact_no || ''}</small></td>
+                    <td class="text-center fw-bold">${req.req_systems_qty || 0}</td>
+                    <td class="text-center fw-bold">${req.req_printers_qty || 0}</td>
+                    <td class="text-center fw-bold">${req.req_laptops_qty || 0}</td>
+                    <td>${req.required_from_date || '-'} to ${req.required_to_date || '-'}</td>
+                    <td class="text-center fw-bold text-success">${req.calculated_days || 0} Days</td>
+                    <td>
+                        ${req.mail_copy_file ? `<a href="${contextPath}gccrentalmanagementfiles/${req.mail_copy_file}" target="_blank" class="btn btn-sm btn-outline-info"><i class="fa-solid fa-file-pdf"></i> View</a>` : '<span class="text-muted">-</span>'}
+                    </td>
+                    <td><span class="badge-status status-${req.badge_color || 'warning'}">${req.status_name || 'Pending'}</span></td>
+                    <td>
+                        <button class="btn btn-sm btn-outline-primary" onclick="openIssueAssetForRequest(${req.id})" title="Issue Asset">
+                            <i class="fa-solid fa-hand-holding-box me-1"></i> Issue
+                        </button>
+                    </td>
+                `;
+                tbody.appendChild(tr);
+            });
+        }
+
+        function openNewRequestModal() {
+            document.getElementById('reqTapalDateInput').value = formatDate(TODAY);
+            document.getElementById('reqFromDateInput').value = formatDate(TODAY);
+            document.getElementById('reqToDateInput').value = formatDate(addDays(TODAY, 30));
+            calculateRequestDuration();
+            showModal('newRequestModal');
+        }
+
+        function calculateRequestDuration() {
+            const from = document.getElementById('reqFromDateInput').value;
+            const to = document.getElementById('reqToDateInput').value;
+            if (from && to) {
+                const diff = Math.ceil((new Date(to) - new Date(from)) / (1000 * 60 * 60 * 24)) + 1;
+                document.getElementById('reqDurationDaysText').textContent = `${diff} Days`;
+            }
+        }
+
+        async function handleSaveRequest(event) {
+            event.preventDefault();
+            const formData = new FormData();
+            formData.append('tapalNo', document.getElementById('reqTapalNoInput').value.trim());
+            formData.append('tapalDate', document.getElementById('reqTapalDateInput').value);
+            formData.append('deptId', document.getElementById('reqDeptInput').value);
+            formData.append('zoneId', document.getElementById('reqZoneInput').value);
+            formData.append('reqSystemsQty', document.getElementById('reqSystemsQtyInput').value);
+            formData.append('reqPrintersQty', document.getElementById('reqPrintersQtyInput').value);
+            formData.append('reqLaptopsQty', document.getElementById('reqLaptopsQtyInput').value);
+            formData.append('requiredFromDate', document.getElementById('reqFromDateInput').value);
+            formData.append('requiredToDate', document.getElementById('reqToDateInput').value);
+            formData.append('reqStatusId', document.getElementById('reqStatusInput').value);
+            formData.append('requestingOfficer', document.getElementById('reqOfficerInput').value.trim());
+            formData.append('contactNo', document.getElementById('reqContactInput').value.trim());
+            formData.append('purpose', document.getElementById('reqPurposeInput').value.trim());
+
+            const fileInput = document.getElementById('reqMailCopyFileInput');
+            if (fileInput.files.length > 0) {
+                formData.append('mailCopyFile', fileInput.files[0]);
+            }
+
+            try {
+                const response = await fetch(contextPath + 'gccrentalmanagement/api/requests/save', {
+                    method: 'POST',
+                    headers: getCsrfHeaders(),
+                    body: formData
+                });
+                const res = await response.json();
+                if (res.success) {
+                    showToast(res.message);
+                    hideModal('newRequestModal');
+                    document.getElementById('newRequestForm').reset();
+                    await loadAllRentalData();
+                } else {
+                    showToast(res.error || 'Failed to save Request', true);
+                }
+            } catch (err) {
+                showToast('Network error saving Request', true);
+            }
+        }
+
+        // ==========================================
+        // 3. INWARD DELIVERY CHALLAN RENDERING & ACTIONS
+        // ==========================================
+        function renderChallansTable() {
+            const tbody = document.getElementById('dcTableBody');
+            tbody.innerHTML = '';
+
+            if (rentalData.challans.length === 0) {
+                tbody.innerHTML = '<tr><td colspan="10" class="text-center py-4 text-muted">No Inward Delivery Challans uploaded yet.</td></tr>';
+                return;
+            }
+
+            rentalData.challans.forEach(dc => {
+                const tr = document.createElement('tr');
+                tr.innerHTML = `
+                    <td><strong>${dc.dc_no || '-'}</strong><br><small class="text-muted">${dc.dc_date || '-'}</small></td>
+                    <td><strong>${dc.wo_file_no || 'WO #' + dc.wo_id}</strong></td>
+                    <td>${dc.vendor_name || '-'}</td>
+                    <td class="text-center fw-bold">${dc.inward_systems_qty || 0}</td>
+                    <td class="text-center fw-bold">${dc.inward_printers_qty || 0}</td>
+                    <td class="text-center fw-bold">${dc.inward_laptops_qty || 0}</td>
+                    <td class="text-center fw-bold text-success">${dc.total_inward_qty || (dc.inward_systems_qty + dc.inward_printers_qty + dc.inward_laptops_qty)}</td>
+                    <td>${dc.vehicle_no || '-'}</td>
+                    <td>
+                        ${dc.dc_file_path ? `<a href="${contextPath}gccrentalmanagementfiles/${dc.dc_file_path}" target="_blank" class="btn btn-sm btn-outline-danger"><i class="fa-solid fa-file-pdf"></i> View DC</a>` : '<span class="text-muted">-</span>'}
+                    </td>
+                    <td>${dc.received_by || '-'}</td>
+                `;
+                tbody.appendChild(tr);
+            });
+        }
+
+        function openNewDCModal() {
+            document.getElementById('dcDateInput').value = formatDate(TODAY);
+            showModal('newDCModal');
+        }
+
+        function populateDCVendorFromWO(woId) {
+            const wo = rentalData.workOrders.find(w => w.id == woId);
+            if (wo) {
+                document.getElementById('dcVendorDisplay').value = wo.vendor_name || '';
+            }
+        }
+
+        async function handleSaveDC(event) {
+            event.preventDefault();
+            const formData = new FormData();
+            formData.append('woId', document.getElementById('dcWOSelect').value);
+            formData.append('dcNo', document.getElementById('dcNumberInput').value.trim());
+            formData.append('dcDate', document.getElementById('dcDateInput').value);
+            formData.append('vendorName', document.getElementById('dcVendorDisplay').value.trim());
+            formData.append('inSystemsQty', document.getElementById('dcSystemsQtyInput').value);
+            formData.append('inPrintersQty', document.getElementById('dcPrintersQtyInput').value);
+            formData.append('inLaptopsQty', document.getElementById('dcLaptopsQtyInput').value);
+            formData.append('vehicleNo', document.getElementById('dcVehicleInput').value.trim());
+            formData.append('receivedBy', document.getElementById('dcReceivedByInput').value.trim());
+            formData.append('remarks', document.getElementById('dcRemarksInput').value.trim());
+
+            const fileInput = document.getElementById('dcFileInput');
+            if (fileInput.files.length > 0) {
+                formData.append('dcFile', fileInput.files[0]);
+            }
+
+            try {
+                const response = await fetch(contextPath + 'gccrentalmanagement/api/inward-challans/save', {
+                    method: 'POST',
+                    headers: getCsrfHeaders(),
+                    body: formData
+                });
+                const res = await response.json();
+                if (res.success) {
+                    showToast(res.message);
+                    hideModal('newDCModal');
+                    document.getElementById('newDCForm').reset();
+                    await loadAllRentalData();
+                } else {
+                    showToast(res.error || 'Failed to save Inward DC', true);
+                }
+            } catch (err) {
+                showToast('Network error saving Inward DC', true);
+            }
+        }
+
+        // ==========================================
+        // 4. ISSUED DETAILS RENDERING & ACTIONS
+        // ==========================================
+        function renderIssuedTable() {
+            const tbody = document.getElementById('issuedTableBody');
+            tbody.innerHTML = '';
+
+            if (rentalData.issuedAssets.length === 0) {
+                tbody.innerHTML = '<tr><td colspan="11" class="text-center py-4 text-muted">No Assets issued yet. Click "Issue Asset to Department" to allocate.</td></tr>';
+                return;
+            }
+
+            rentalData.issuedAssets.forEach(iss => {
+                const tr = document.createElement('tr');
+                tr.innerHTML = `
+                    <td><strong>${iss.dept_name || '-'}</strong><br><small class="text-muted">${iss.tapal_no || ''}</small></td>
+                    <td>${iss.custodian_officer || '-'}<br><small class="text-muted">${iss.contact_no || ''}</small></td>
+                    <td>${iss.issued_date || '-'}</td>
+                    <td class="text-center fw-bold">${iss.issued_systems_qty || 0}</td>
+                    <td class="text-center fw-bold">${iss.issued_printers_qty || 0}</td>
+                    <td class="text-center fw-bold">${iss.issued_laptops_qty || 0}</td>
+                    <td>${iss.issued_from_date || '-'} to ${iss.issued_to_date || '-'}</td>
+                    <td class="text-center fw-bold text-primary">${iss.issued_period_days || 0} Days</td>
+                    <td>
+                        ${iss.stock_copy_path ? `<a href="${contextPath}gccrentalmanagementfiles/${iss.stock_copy_path}" target="_blank" class="btn btn-sm btn-outline-success"><i class="fa-solid fa-file-pdf"></i> Slip</a>` : '<span class="text-muted">-</span>'}
+                    </td>
+                    <td><span class="badge-status status-active">${iss.status || 'Issued'}</span></td>
+                    <td>
+                        <button class="btn btn-sm btn-outline-success me-1" onclick="openReturnAssetForIssue(${iss.id})" title="Return Asset">
+                            <i class="fa-solid fa-arrow-rotate-left"></i>
+                        </button>
+                    </td>
+                `;
+                tbody.appendChild(tr);
+            });
+        }
+
+        function openIssueAssetModal() {
+            document.getElementById('issueDateInput').value = formatDate(TODAY);
+            document.getElementById('issueFromDateInput').value = formatDate(TODAY);
+            document.getElementById('issueToDateInput').value = formatDate(addDays(TODAY, 30));
+            calculateIssuedDuration();
+            showModal('issueAssetModal');
+        }
+
+        function openIssueAssetForRequest(reqId) {
+            openIssueAssetModal();
+            document.getElementById('issueReqSelect').value = reqId;
+            populateIssueDetailsFromReq(reqId);
+        }
+
+        function populateIssueDetailsFromReq(reqId) {
+            const req = rentalData.requests.find(r => r.id == reqId);
+            if (req) {
+                document.getElementById('issueDeptDisplay').value = `${req.dept_name || 'Dept'} (${req.zone_name || 'HQ'})`;
+                document.getElementById('issueSystemsQtyInput').value = req.req_systems_qty || 0;
+                document.getElementById('issuePrintersQtyInput').value = req.req_printers_qty || 0;
+                document.getElementById('issueLaptopsQtyInput').value = req.req_laptops_qty || 0;
+                document.getElementById('issueFromDateInput').value = req.required_from_date || formatDate(TODAY);
+                document.getElementById('issueToDateInput').value = req.required_to_date || formatDate(addDays(TODAY, 30));
+                document.getElementById('issueCustodianOfficerInput').value = req.requesting_officer || '';
+                document.getElementById('issueContactNoInput').value = req.contact_no || '';
+                calculateIssuedDuration();
+            }
+        }
+
+        function calculateIssuedDuration() {
+            const from = document.getElementById('issueFromDateInput').value;
+            const to = document.getElementById('issueToDateInput').value;
+            if (from && to) {
+                const diff = Math.ceil((new Date(to) - new Date(from)) / (1000 * 60 * 60 * 24)) + 1;
+                document.getElementById('issueDurationDaysText').textContent = `${diff} Days`;
+            }
+        }
+
+        async function handleSaveIssueAsset(event) {
+            event.preventDefault();
+            const formData = new FormData();
+            formData.append('requestId', document.getElementById('issueReqSelect').value);
+            formData.append('inwardDcId', document.getElementById('issueInwardDCSelect').value || '');
+            formData.append('issuedDate', document.getElementById('issueDateInput').value);
+            formData.append('issuedSystemsQty', document.getElementById('issueSystemsQtyInput').value);
+            formData.append('issuedPrintersQty', document.getElementById('issuePrintersQtyInput').value);
+            formData.append('issuedLaptopsQty', document.getElementById('issueLaptopsQtyInput').value);
+            formData.append('assetSerialDetails', document.getElementById('issueSerialDetailsInput').value.trim());
+            formData.append('issuedFromDate', document.getElementById('issueFromDateInput').value);
+            formData.append('issuedToDate', document.getElementById('issueToDateInput').value);
+            formData.append('custodianOfficer', document.getElementById('issueCustodianOfficerInput').value.trim());
+            formData.append('contactNo', document.getElementById('issueContactNoInput').value.trim());
+            formData.append('issuedBy', document.getElementById('issueIssuedByInput').value.trim());
+
+            const fileInput = document.getElementById('issueStockCopyFileInput');
+            if (fileInput.files.length > 0) {
+                formData.append('stockCopyFile', fileInput.files[0]);
+            }
+
+            try {
+                const response = await fetch(contextPath + 'gccrentalmanagement/api/issued-assets/save', {
+                    method: 'POST',
+                    headers: getCsrfHeaders(),
+                    body: formData
+                });
+                const res = await response.json();
+                if (res.success) {
+                    showToast(res.message);
+                    hideModal('issueAssetModal');
+                    document.getElementById('issueAssetForm').reset();
+                    await loadAllRentalData();
+                } else {
+                    showToast(res.error || 'Failed to issue assets', true);
+                }
+            } catch (err) {
+                showToast('Network error issuing assets', true);
+            }
+        }
+
+        // ==========================================
+        // 5. RETURN DETAILS RENDERING & ACTIONS
+        // ==========================================
+        function renderReturnsTable() {
+            const tbody = document.getElementById('returnsTableBody');
+            tbody.innerHTML = '';
+
+            if (rentalData.returns.length === 0) {
+                tbody.innerHTML = '<tr><td colspan="11" class="text-center py-4 text-muted">No returns recorded yet.</td></tr>';
+                return;
+            }
+
+            rentalData.returns.forEach(ret => {
+                const tr = document.createElement('tr');
+                tr.innerHTML = `
+                    <td><strong>${ret.dept_name || '-'}</strong><br><small class="text-muted">${ret.zone_name || ''}</small></td>
+                    <td>${ret.custodian_officer || '-'}</td>
+                    <td class="text-success fw-bold">${ret.return_date || '-'}</td>
+                    <td class="text-center fw-bold">${ret.returned_systems_qty || 0}</td>
+                    <td class="text-center fw-bold">${ret.returned_printers_qty || 0}</td>
+                    <td class="text-center fw-bold">${ret.returned_laptops_qty || 0}</td>
+                    <td class="text-center fw-bold text-success">${ret.total_returned_qty || 0}</td>
+                    <td>
+                        ${ret.stock_copy_path ? `<a href="${contextPath}gccrentalmanagementfiles/${ret.stock_copy_path}" target="_blank" class="btn btn-sm btn-outline-success"><i class="fa-solid fa-file-pdf"></i> Receipt</a>` : '<span class="text-muted">-</span>'}
+                    </td>
+                    <td><span class="badge-status status-${ret.badge_color || 'success'}">${ret.post_return_status_name || 'Completed'}</span></td>
+                    <td><span class="badge bg-light text-dark border">${ret.condition_grade || 'Good'}</span></td>
+                    <td>${ret.received_by || '-'}</td>
+                `;
+                tbody.appendChild(tr);
+            });
+        }
+
+        function openReturnAssetModal() {
+            document.getElementById('returnDateInput').value = formatDate(TODAY);
+            showModal('returnAssetModal');
+        }
+
+        function openReturnAssetForIssue(issueId) {
+            openReturnAssetModal();
+            document.getElementById('returnIssuedSelect').value = issueId;
+            populateReturnFromIssued(issueId);
+        }
+
+        function populateReturnFromIssued(issueId) {
+            const iss = rentalData.issuedAssets.find(i => i.id == issueId);
+            if (iss) {
+                document.getElementById('returnDeptDisplay').value = `${iss.dept_name || 'Dept'} (${iss.custodian_officer || ''})`;
+                document.getElementById('returnDueDateDisplay').value = iss.issued_to_date || '';
+                document.getElementById('returnSystemsQtyInput').value = iss.issued_systems_qty || 0;
+                document.getElementById('returnPrintersQtyInput').value = iss.issued_printers_qty || 0;
+                document.getElementById('returnLaptopsQtyInput').value = iss.issued_laptops_qty || 0;
+            }
+        }
+
+        async function handleSaveReturn(event) {
+            event.preventDefault();
+            const issueId = document.getElementById('returnIssuedSelect').value;
+            const iss = rentalData.issuedAssets.find(i => i.id == issueId);
+            const requestId = iss ? iss.request_id : 0;
+
+            const formData = new FormData();
+            formData.append('issueId', issueId);
+            formData.append('requestId', requestId);
+            formData.append('returnDate', document.getElementById('returnDateInput').value);
+            formData.append('retSystemsQty', document.getElementById('returnSystemsQtyInput').value);
+            formData.append('retPrintersQty', document.getElementById('returnPrintersQtyInput').value);
+            formData.append('retLaptopsQty', document.getElementById('returnLaptopsQtyInput').value);
+            formData.append('postReturnStatusId', document.getElementById('returnStatusInput').value);
+            formData.append('conditionGrade', document.getElementById('returnConditionInput').value);
+            formData.append('receivedBy', document.getElementById('returnReceivedByInput').value.trim());
+            formData.append('remarks', document.getElementById('returnRemarksInput').value.trim());
+
+            const fileInput = document.getElementById('returnStockCopyFileInput');
+            if (fileInput.files.length > 0) {
+                formData.append('stockCopyFile', fileInput.files[0]);
+            }
+
+            try {
+                const response = await fetch(contextPath + 'gccrentalmanagement/api/returns/save', {
+                    method: 'POST',
+                    headers: getCsrfHeaders(),
+                    body: formData
+                });
+                const res = await response.json();
+                if (res.success) {
+                    showToast(res.message);
+                    hideModal('returnAssetModal');
+                    document.getElementById('returnAssetForm').reset();
+                    await loadAllRentalData();
+                } else {
+                    showToast(res.error || 'Failed to process return', true);
+                }
+            } catch (err) {
+                showToast('Network error saving return', true);
+            }
+        }
+
+        // ==========================================
+        // 6. REMINDERS & NOTIFICATION RADAR
+        // ==========================================
+        function renderRemindersTable() {
+            const tbody = document.getElementById('remindersTableBody');
+            const radarTbody = document.getElementById('radarOverdueTableBody');
+            tbody.innerHTML = '';
+            radarTbody.innerHTML = '';
+
+            const overdueItems = rentalData.reminders.filter(r => r.calculated_status === 'OVERDUE');
+
+            if (rentalData.reminders.length === 0) {
+                tbody.innerHTML = '<tr><td colspan="7" class="text-center py-4 text-success fw-bold"><i class="fa-solid fa-circle-check fs-4 d-block mb-2"></i> All rental items are on schedule!</td></tr>';
+            } else {
+                rentalData.reminders.forEach(item => {
+                    const tr = document.createElement('tr');
+                    tr.innerHTML = `
+                        <td><strong>${item.dept_name || '-'}</strong><br><small class="text-muted">${item.zone_name || ''}</small></td>
+                        <td>${item.custodian_officer || '-'}<br><small class="text-muted">${item.contact_no || ''}</small></td>
+                        <td>Sys: ${item.issued_systems_qty || 0} | Prt: ${item.issued_printers_qty || 0} | Ltp: ${item.issued_laptops_qty || 0}</td>
+                        <td>${item.issued_date || '-'}</td>
+                        <td class="${item.calculated_status === 'OVERDUE' ? 'text-danger fw-bold' : ''}">${item.issued_to_date || '-'}</td>
+                        <td><span class="badge-status ${item.badge_class || 'status-active'}">${item.status_label || '-'}</span></td>
+                        <td>
+                            <button class="btn btn-sm ${item.calculated_status === 'OVERDUE' ? 'btn-danger' : 'btn-outline-primary'}" onclick="openSingleReminderModal(${item.id})">
+                                <i class="fa-solid fa-paper-plane me-1"></i> Send Notice
+                            </button>
+                        </td>
+                    `;
+                    tbody.appendChild(tr);
+                });
+            }
+
+            if (overdueItems.length === 0) {
+                radarTbody.innerHTML = '<tr><td colspan="7" class="text-center py-4 text-success fw-bold"><i class="fa-solid fa-circle-check fs-4 d-block mb-2"></i> All rental items are on schedule! No overdue returns.</td></tr>';
+            } else {
+                overdueItems.forEach(item => {
+                    const tr = document.createElement('tr');
+                    tr.innerHTML = `
+                        <td><strong>${item.dept_name || '-'}</strong><br><small class="text-muted">${item.zone_name || ''}</small></td>
+                        <td>${item.custodian_officer || '-'}<br><small class="text-muted">${item.contact_no || ''}</small></td>
+                        <td>Sys: ${item.issued_systems_qty || 0} | Prt: ${item.issued_printers_qty || 0} | Ltp: ${item.issued_laptops_qty || 0}</td>
+                        <td>${item.issued_date || '-'}</td>
+                        <td class="text-danger fw-bold">${item.issued_to_date || '-'}</td>
+                        <td><span class="badge-status status-overdue">${item.overdue_days || 0} Days Overdue</span></td>
+                        <td>
+                            <button class="btn btn-sm btn-outline-danger" onclick="openSingleReminderModal(${item.id})">
+                                <i class="fa-solid fa-paper-plane me-1"></i> Send Notice
+                            </button>
+                        </td>
+                    `;
+                    radarTbody.appendChild(tr);
+                });
+            }
+        }
+
+        let selectedReminderItem = null;
+
+        function openSingleReminderModal(issueId) {
+            const item = rentalData.reminders.find(r => r.id == issueId) || rentalData.issuedAssets.find(i => i.id == issueId);
+            if (!item) return;
+
+            selectedReminderItem = item;
+            document.getElementById('reminderDeptDisplay').value = `${item.dept_name || 'Department'} (${item.zone_name || 'HQ'})`;
+            document.getElementById('reminderOfficerDisplay').value = `${item.custodian_officer || ''} (${item.contact_no || ''})`;
+            document.getElementById('reminderDueDateDisplay').value = item.issued_to_date || '';
+            document.getElementById('reminderSeverityDisplay').value = item.status_label || 'Return Due Notice';
+
+            const memoText =
+                `========================================================================================
+GREATER CHENNAI CORPORATION • IT CELL (RIPON BUILDING)
+OFFICIAL ASSET RETURN REMINDER NOTICE
+Date: ${formatDate(TODAY)}
+========================================================================================
+
+To:
+Designated Custodian Officer: ${item.custodian_officer || 'Officer Incharge'}
+Department / Zone: ${item.dept_name || ''} ${item.zone_name ? '(' + item.zone_name + ')' : ''}
+Greater Chennai Corporation
+
+Sub: URGENT - Return of Outsourced Rental IT Assets - Reg.
+
+Dear Sir / Madam,
+
+This is an automated official communication regarding the rental IT hardware deployed in your department:
+
+• Systems (Desktops)   : ${item.issued_systems_qty || 0}
+• Printers             : ${item.issued_printers_qty || 0}
+• Laptops              : ${item.issued_laptops_qty || 0}
+• Handover Date        : ${item.issued_date || ''}
+• Scheduled Return Due : ${item.issued_to_date || ''}
+• Current Status       : ${item.status_label || 'Due for return'}
+
+Kindly arrange to return the equipment along with accessories to the Central IT Store (Ripon Building) immediately to avoid recurring rental vendor charges.
+
+By Order,
+Superintending Engineer / IT Cell Incharge
+Greater Chennai Corporation
+========================================================================================`;
+
+            document.getElementById('reminderNoticePreview').textContent = memoText;
+            showModal('sendReminderModal');
+        }
+
+        function confirmDispatchSingleReminder() {
+            hideModal('sendReminderModal');
+            showToast(`Official return notice dispatched to ${selectedReminderItem?.dept_name || 'Department'}.`);
+        }
+
+        function openBulkReminderModal() {
+            const overdueItems = rentalData.reminders.filter(r => r.calculated_status === 'OVERDUE');
+            const tbody = document.getElementById('bulkQueueTableBody');
+            tbody.innerHTML = '';
+            document.getElementById('bulkCountDisplay').textContent = overdueItems.length;
+
+            if (overdueItems.length === 0) {
+                tbody.innerHTML = '<tr><td colspan="4" class="text-center py-3 text-success">No overdue items. All departments are up to date!</td></tr>';
+            } else {
+                overdueItems.forEach(item => {
+                    const tr = document.createElement('tr');
+                    tr.innerHTML = `
+                        <td><strong>${item.dept_name || '-'}</strong></td>
+                        <td>${item.custodian_officer || '-'}</td>
+                        <td class="text-danger fw-bold">${item.issued_to_date || '-'}</td>
+                        <td><span class="badge bg-danger">${item.overdue_days || 0} Days</span></td>
+                    `;
+                    tbody.appendChild(tr);
+                });
+            }
+            showModal('bulkReminderModal');
+        }
+
+        function executeBulkReminderDispatch() {
+            hideModal('bulkReminderModal');
+            showToast('Bulk return reminder notices successfully dispatched to all overdue departments.');
+        }
+
+        // ==========================================
+        // 7. MASTER REPORT & CROSS-MODULE DROPDOWNS
+        // ==========================================
+        function populateCrossModuleDropdowns() {
+            // Work Orders for Inward DC
+            const woSelect = document.getElementById('dcWOSelect');
+            woSelect.innerHTML = '<option value="">-- Select Work Order --</option>';
+            rentalData.workOrders.forEach(wo => {
+                const opt = document.createElement('option');
+                opt.value = wo.id;
+                opt.textContent = `${wo.wo_file_no} (${wo.vendor_name || 'Vendor'})`;
+                woSelect.appendChild(opt);
+            });
+
+            // User Requests for Issue Asset
+            const reqSelect = document.getElementById('issueReqSelect');
+            reqSelect.innerHTML = '<option value="">-- Choose User Request --</option>';
+            rentalData.requests.forEach(req => {
+                const opt = document.createElement('option');
+                opt.value = req.id;
+                opt.textContent = `Tapal: ${req.tapal_no} - ${req.dept_name || 'Dept'}`;
+                reqSelect.appendChild(opt);
+            });
+
+            // Inward DC for Issue Asset
+            const dcSelect = document.getElementById('issueInwardDCSelect');
+            dcSelect.innerHTML = '<option value="">-- Choose Inward DC (Optional) --</option>';
+            rentalData.challans.forEach(dc => {
+                const opt = document.createElement('option');
+                opt.value = dc.id;
+                opt.textContent = `DC: ${dc.dc_no} (${dc.vendor_name || 'Vendor'})`;
+                dcSelect.appendChild(opt);
+            });
+
+            // Issued Records for Return
+            const retSelect = document.getElementById('returnIssuedSelect');
+            retSelect.innerHTML = '<option value="">-- Choose Issued Record --</option>';
+            rentalData.issuedAssets.forEach(iss => {
+                const opt = document.createElement('option');
+                opt.value = iss.id;
+                opt.textContent = `ID #${iss.id}: ${iss.dept_name || 'Dept'} (${iss.custodian_officer || ''}) - Due: ${iss.issued_to_date || ''}`;
+                retSelect.appendChild(opt);
+            });
+        }
+
+        function renderMasterReportTable() {
+            const tbody = document.getElementById('masterReportTableBody');
+            tbody.innerHTML = '';
+
+            rentalData.issuedAssets.forEach(iss => {
+                const tr = document.createElement('tr');
+                tr.innerHTML = `
+                    <td><strong>${iss.dept_name || '-'}</strong><br><small class="text-muted">${iss.tapal_no || ''}</small></td>
+                    <td>${iss.custodian_officer || '-'}</td>
+                    <td>${iss.issued_date || '-'}</td>
+                    <td>${iss.issued_to_date || '-'}</td>
+                    <td class="text-center">${iss.issued_systems_qty || 0}</td>
+                    <td class="text-center">${iss.issued_printers_qty || 0}</td>
+                    <td class="text-center">${iss.issued_laptops_qty || 0}</td>
+                    <td class="text-center fw-bold text-primary">${iss.total_issued_qty || 0}</td>
+                    <td><span class="badge-status status-active">${iss.status || 'Issued'}</span></td>
+                `;
+                tbody.appendChild(tr);
+            });
+        }
+
+        function renderDashboardMetrics() {
+            const activeCount = rentalData.issuedAssets.length;
+            const overdueCount = rentalData.reminders.filter(r => r.calculated_status === 'OVERDUE').length;
+            const dueSoonCount = rentalData.reminders.filter(r => r.calculated_status === 'DUE_SOON').length;
+
+            document.getElementById('kpiActiveAssets').textContent = activeCount;
+            document.getElementById('kpiDueSoon').textContent = dueSoonCount;
+            document.getElementById('kpiOverdue').textContent = overdueCount;
+            document.getElementById('kpiActiveWO').textContent = rentalData.workOrders.length;
+            document.getElementById('kpiPendingReq').textContent = rentalData.requests.length;
+
+            document.getElementById('woCountBadge').textContent = rentalData.workOrders.length;
+            document.getElementById('reqCountBadge').textContent = rentalData.requests.length;
+            document.getElementById('dcCountBadge').textContent = rentalData.challans.length;
+            document.getElementById('issuedCountBadge').textContent = rentalData.issuedAssets.length;
+            document.getElementById('returnCountBadge').textContent = rentalData.returns.length;
+            document.getElementById('overdueBadgeCount').textContent = `${overdueCount} Overdue`;
+
+            const banner = document.getElementById('overdueAlertBanner');
+            if (overdueCount > 0) {
+                banner.style.display = 'flex';
+                document.getElementById('bannerOverdueCount').textContent = overdueCount;
+            } else {
+                banner.style.display = 'none';
+            }
+        }
+
+        // Generic Filter and Excel Exporter
+        function filterGenericTable(tableId, query) {
+            const q = query.toLowerCase().trim();
+            const table = document.getElementById(tableId);
+            const rows = table.getElementsByTagName('tbody')[0].getElementsByTagName('tr');
+            for (let i = 0; i < rows.length; i++) {
+                const text = rows[i].textContent.toLowerCase();
+                rows[i].style.display = text.includes(q) ? '' : 'none';
+            }
+        }
+
+        function exportTableToExcel(tableId, fileName) {
+            const table = document.getElementById(tableId);
+            const wb = XLSX.utils.table_to_book(table, { sheet: "Sheet1" });
+            XLSX.writeFile(wb, `${fileName}_${formatDate(TODAY)}.xlsx`);
+            showToast(`Exported ${fileName}.xlsx successfully.`);
+        }
+
+        // Chart.js Visuals
+        let deptChartInstance = null;
+        let statusChartInstance = null;
+
+        function renderCharts() {
+            // Dept Distribution
+            const deptCounts = {};
+            rentalData.issuedAssets.forEach(a => {
+                const dName = (a.dept_name || 'General').replace(' (Ripon Building)', '').replace(' - ', ' ');
+                deptCounts[dName] = (deptCounts[dName] || 0) + (a.total_issued_qty || 1);
+            });
+
+            const deptLabels = Object.keys(deptCounts);
+            const deptData = Object.values(deptCounts);
+
+            const ctxDept = document.getElementById('deptDistributionChart').getContext('2d');
+            if (deptChartInstance) deptChartInstance.destroy();
+            deptChartInstance = new Chart(ctxDept, {
+                type: 'bar',
+                data: {
+                    labels: deptLabels.length ? deptLabels : ['Works', 'Revenue', 'Health', 'Zone 05'],
+                    datasets: [{
+                        label: 'Rented Hardware Allocated',
+                        data: deptData.length ? deptData : [4, 2, 2, 3],
+                        backgroundColor: '#0284c7',
+                        borderRadius: 6
+                    }]
+                },
+                options: {
+                    responsive: true,
+                    maintainAspectRatio: false,
+                    plugins: { legend: { display: false } },
+                    scales: { y: { beginAtZero: true, ticks: { stepSize: 1 } } }
+                }
+            });
+
+            // Status Health Donut
+            let active = 0, dueSoon = 0, overdue = 0;
+            rentalData.reminders.forEach(r => {
+                if (r.calculated_status === 'OVERDUE') overdue++;
+                else if (r.calculated_status === 'DUE_SOON') dueSoon++;
+                else active++;
+            });
+            if (active === 0 && dueSoon === 0 && overdue === 0) active = 1;
+
+            const ctxStatus = document.getElementById('returnStatusChart').getContext('2d');
+            if (statusChartInstance) statusChartInstance.destroy();
+            statusChartInstance = new Chart(ctxStatus, {
+                type: 'doughnut',
+                data: {
+                    labels: ['On Schedule (Active)', 'Due in 7 Days', 'OVERDUE'],
+                    datasets: [{
+                        data: [active, dueSoon, overdue],
+                        backgroundColor: ['#10b981', '#f59e0b', '#ef4444'],
+                        borderWidth: 2
+                    }]
+                },
+                options: {
+                    responsive: true,
+                    maintainAspectRatio: false,
+                    plugins: { legend: { position: 'bottom' } }
+                }
+            });
+        }
+    </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/gccrentalmanagement/login.html b/src/main/resources/templates/gccrentalmanagement/login.html
new file mode 100644
index 0000000..9c14d80
--- /dev/null
+++ b/src/main/resources/templates/gccrentalmanagement/login.html
@@ -0,0 +1,429 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org" lang="en">
+
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title>GCC IT Cell Rental Asset Management - Login</title>
+
+	<!-- CSRF Tokens -->
+	<meta th:if="${_csrf != null}" name="_csrf" th:content="${_csrf.token}" />
+	<meta th:if="${_csrf != null}" name="_csrf_header" th:content="${_csrf.headerName}" />
+
+	<!-- Google Fonts -->
+	<link rel="preconnect" href="https://fonts.googleapis.com">
+	<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+	<link href="https://fonts.googleapis.com/css2?family=Outfit:wght@400;500;600;700;800&family=Poppins:wght@300;400;500;600;700&display=swap" rel="stylesheet">
+
+	<!-- Bootstrap CSS -->
+	<link rel="stylesheet" th:href="@{/assets/bootstrap-5.3.2/css/bootstrap.min.css}" type="text/css">
+	<!-- Awesome Font -->
+	<link th:href="@{/assets/font-awesome-6.5.2/css/all.min.css}" rel="stylesheet" type="text/css">
+
+	<style>
+		:root {
+			--primary-brand: #0d4b68;
+			--primary-dark: #072e41;
+			--accent-cyan: #06b6d4;
+			--accent-amber: #f59e0b;
+			--gradient-bg: linear-gradient(135deg, #072e41 0%, #0d4b68 50%, #155e75 100%);
+			--card-bg: rgba(255, 255, 255, 0.96);
+		}
+
+		* {
+			margin: 0;
+			padding: 0;
+			box-sizing: border-box;
+		}
+
+		body {
+			font-family: 'Poppins', sans-serif;
+			background: var(--gradient-bg);
+			min-height: 100vh;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			padding: 20px;
+			position: relative;
+			overflow-x: hidden;
+		}
+
+		/* Decorative ambient glow circles */
+		.ambient-glow {
+			position: absolute;
+			border-radius: 50%;
+			filter: blur(80px);
+			opacity: 0.25;
+			pointer-events: none;
+			z-index: 0;
+		}
+
+		.glow-1 {
+			width: 350px;
+			height: 350px;
+			background: #06b6d4;
+			top: -50px;
+			left: -50px;
+		}
+
+		.glow-2 {
+			width: 400px;
+			height: 400px;
+			background: #f59e0b;
+			bottom: -80px;
+			right: -80px;
+		}
+
+		.login-card {
+			position: relative;
+			z-index: 1;
+			width: 100%;
+			max-width: 460px;
+			background: var(--card-bg);
+			backdrop-filter: blur(12px);
+			border-radius: 24px;
+			padding: 40px 36px;
+			box-shadow: 0 20px 50px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(255, 255, 255, 0.2);
+			animation: slideUp 0.6s cubic-bezier(0.16, 1, 0.3, 1);
+		}
+
+		@keyframes slideUp {
+			from {
+				opacity: 0;
+				transform: translateY(25px);
+			}
+			to {
+				opacity: 1;
+				transform: translateY(0);
+			}
+		}
+
+		.header-branding {
+			text-align: center;
+			margin-bottom: 28px;
+		}
+
+		.logo-wrap {
+			width: 84px;
+			height: 84px;
+			margin: 0 auto 16px;
+			border-radius: 20px;
+			background: #ffffff;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			box-shadow: 0 8px 20px rgba(13, 75, 104, 0.15);
+			padding: 10px;
+			transition: transform 0.3s ease;
+		}
+
+		.logo-wrap:hover {
+			transform: scale(1.05) rotate(2deg);
+		}
+
+		.logo-wrap img {
+			max-width: 100%;
+			max-height: 100%;
+			object-fit: contain;
+		}
+
+		.brand-title-en {
+			font-family: 'Outfit', sans-serif;
+			font-size: 1.15rem;
+			font-weight: 800;
+			letter-spacing: 0.8px;
+			color: #0d4b68;
+			text-transform: uppercase;
+			margin-bottom: 2px;
+		}
+
+		.brand-title-ta {
+			font-size: 0.82rem;
+			color: #475569;
+			font-weight: 600;
+			margin-bottom: 12px;
+		}
+
+		.badge-module {
+			display: inline-flex;
+			align-items: center;
+			gap: 6px;
+			padding: 6px 14px;
+			background: linear-gradient(135deg, #e0f2fe, #e2e8f0);
+			color: #0369a1;
+			border: 1px solid #bae6fd;
+			border-radius: 30px;
+			font-size: 0.78rem;
+			font-weight: 700;
+			text-transform: uppercase;
+			letter-spacing: 0.5px;
+		}
+
+		.badge-module i {
+			color: #0284c7;
+		}
+
+		.form-title {
+			font-family: 'Outfit', sans-serif;
+			font-size: 1.4rem;
+			font-weight: 700;
+			color: #0f172a;
+			margin: 18px 0 6px;
+			text-align: center;
+		}
+
+		.form-subtitle {
+			font-size: 0.85rem;
+			color: #64748b;
+			text-align: center;
+			margin-bottom: 24px;
+		}
+
+		.form-floating-custom {
+			position: relative;
+			margin-bottom: 20px;
+		}
+
+		.form-floating-custom .input-icon {
+			position: absolute;
+			left: 16px;
+			top: 50%;
+			transform: translateY(-50%);
+			color: #94a3b8;
+			font-size: 1.1rem;
+			transition: color 0.3s ease;
+			pointer-events: none;
+		}
+
+		.form-floating-custom input {
+			width: 100%;
+			height: 52px;
+			padding: 12px 16px 12px 46px;
+			font-size: 0.92rem;
+			color: #1e293b;
+			background: #f8fafc;
+			border: 1.5px solid #e2e8f0;
+			border-radius: 12px;
+			outline: none;
+			transition: all 0.3s ease;
+		}
+
+		.form-floating-custom input:focus {
+			background: #ffffff;
+			border-color: #0284c7;
+			box-shadow: 0 0 0 4px rgba(2, 132, 199, 0.12);
+		}
+
+		.form-floating-custom input:focus + .input-icon {
+			color: #0284c7;
+		}
+
+		.btn-submit {
+			width: 100%;
+			height: 52px;
+			background: linear-gradient(135deg, #0d4b68 0%, #0284c7 100%);
+			color: #ffffff;
+			border: none;
+			border-radius: 12px;
+			font-family: 'Outfit', sans-serif;
+			font-size: 1rem;
+			font-weight: 700;
+			letter-spacing: 0.5px;
+			cursor: pointer;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			gap: 10px;
+			transition: all 0.3s ease;
+			box-shadow: 0 8px 20px rgba(13, 75, 104, 0.25);
+			margin-top: 10px;
+		}
+
+		.btn-submit:hover:not(:disabled) {
+			background: linear-gradient(135deg, #093448 0%, #0369a1 100%);
+			box-shadow: 0 12px 25px rgba(13, 75, 104, 0.35);
+			transform: translateY(-2px);
+		}
+
+		.btn-submit:disabled {
+			opacity: 0.7;
+			cursor: not-allowed;
+		}
+
+		#error-box {
+			background: #fef2f2;
+			border: 1px solid #fecaca;
+			color: #b91c1c;
+			padding: 12px 16px;
+			border-radius: 10px;
+			font-size: 0.84rem;
+			font-weight: 500;
+			margin-bottom: 20px;
+			display: none;
+			align-items: center;
+			gap: 10px;
+			animation: shake 0.4s ease;
+		}
+
+		@keyframes shake {
+			0%, 100% { transform: translateX(0); }
+			25% { transform: translateX(-5px); }
+			75% { transform: translateX(5px); }
+		}
+
+		.system-badge-footer {
+			margin-top: 25px;
+			text-align: center;
+			font-size: 0.76rem;
+			color: #94a3b8;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			gap: 8px;
+		}
+
+		.system-badge-footer span {
+			display: inline-block;
+			width: 6px;
+			height: 6px;
+			background: #22c55e;
+			border-radius: 50%;
+			box-shadow: 0 0 8px #22c55e;
+		}
+
+		.back-portal-link {
+			display: block;
+			text-align: center;
+			margin-top: 18px;
+			color: #0284c7;
+			text-decoration: none;
+			font-size: 0.85rem;
+			font-weight: 600;
+			transition: color 0.2s;
+		}
+
+		.back-portal-link:hover {
+			color: #0369a1;
+			text-decoration: underline;
+		}
+	</style>
+</head>
+
+<body>
+	<div class="ambient-glow glow-1"></div>
+	<div class="ambient-glow glow-2"></div>
+
+	<div class="login-card">
+		<div class="header-branding">
+			<div class="logo-wrap">
+				<img th:src="@{/assets/header-images/gcc1.png}" alt="Greater Chennai Corporation Logo">
+			</div>
+			<h2 class="brand-title-en">Greater Chennai Corporation</h2>
+			<p class="brand-title-ta">பெருநகர சென்னை மாநகராட்சி</p>
+			<div class="badge-module">
+				<i class="fa-solid fa-boxes-packing"></i>
+				<span>Rental Management System</span>
+			</div>
+		</div>
+
+		<h3 class="form-title">Portal Sign In</h3>
+		<p class="form-subtitle">Work Orders • Requests • Challans • Issue & Return</p>
+
+		<div id="error-box">
+			<i class="fa-solid fa-circle-exclamation fs-5"></i>
+			<span id="error-text">Invalid username or password!</span>
+		</div>
+
+		<form id="rentalLoginForm" onsubmit="handleRentalLogin(event)">
+			<div class="form-floating-custom">
+				<input type="text" name="usrName" id="usrName" placeholder="Enter Username / Employee ID" required autocomplete="username">
+				<i class="fa-solid fa-user input-icon"></i>
+			</div>
+
+			<div class="form-floating-custom">
+				<input type="password" name="usrPass" id="usrPass" placeholder="Enter Password" required autocomplete="current-password">
+				<i class="fa-solid fa-lock input-icon"></i>
+			</div>
+
+			<button type="submit" id="submit-btn" class="btn-submit">
+				<span>Sign In to Rental System</span>
+				<i class="fa-solid fa-arrow-right-to-bracket"></i>
+			</button>
+		</form>
+
+		<a th:href="@{/}" class="back-portal-link">
+			<i class="fa-solid fa-arrow-left me-1"></i> Return to Main GCC Home
+		</a>
+
+		<div class="system-badge-footer">
+			<span></span>
+			<span>GCC IT Cell Secured System &bull; Active Version 2.0</span>
+		</div>
+	</div>
+
+	<!-- Custom JS -->
+	<script th:inline="javascript">
+		const contextPath = /*[[@{/}]]*/ '/';
+	</script>
+
+	<script>
+		function handleRentalLogin(event) {
+			event.preventDefault();
+
+			const errorBox = document.getElementById("error-box");
+			const errorText = document.getElementById("error-text");
+			const submitBtn = document.getElementById("submit-btn");
+
+			errorBox.style.display = "none";
+			submitBtn.disabled = true;
+			submitBtn.innerHTML = '<i class="fa-solid fa-circle-notch fa-spin"></i> Authenticating...';
+
+			const username = document.getElementById("usrName").value.trim();
+			const password = document.getElementById("usrPass").value;
+
+			const urlParams = new URLSearchParams();
+			urlParams.append('usrName', username);
+			urlParams.append('usrPass', password);
+
+			// Fetch CSRF tokens if available
+			const csrfToken = document.querySelector("meta[name='_csrf']")?.getAttribute("content");
+			const csrfHeader = document.querySelector("meta[name='_csrf_header']")?.getAttribute("content");
+
+			const headers = {
+				'Content-Type': 'application/x-www-form-urlencoded'
+			};
+			if (csrfToken && csrfHeader) {
+				headers[csrfHeader] = csrfToken;
+			}
+
+			fetch(contextPath + 'gccrentalmanagement/api/login', {
+				method: 'POST',
+				headers: headers,
+				body: urlParams
+			})
+			.then(response => response.json())
+			.then(data => {
+				if (data.result) {
+					sessionStorage.setItem("rental_usrName", data.usrName);
+					sessionStorage.setItem("rental_usrRole", data.usrRole || "USER");
+					window.location.href = contextPath + 'gccrentalmanagement/dashboard';
+				} else {
+					submitBtn.disabled = false;
+					submitBtn.innerHTML = '<span>Sign In to Rental System</span> <i class="fa-solid fa-arrow-right-to-bracket"></i>';
+					errorText.textContent = data.error || "Authentication failed. Check your username and password.";
+					errorBox.style.display = "flex";
+				}
+			})
+			.catch(err => {
+				console.error("Login Error:", err);
+				submitBtn.disabled = false;
+				submitBtn.innerHTML = '<span>Sign In to Rental System</span> <i class="fa-solid fa-arrow-right-to-bracket"></i>';
+				errorText.textContent = "Network error. Please try again later.";
+				errorBox.style.display = "flex";
+			});
+		}
+	</script>
+</body>
+
+</html>
diff --git a/src/main/resources/templates/gcctonermanagement/upload.html b/src/main/resources/templates/gcctonermanagement/upload.html
index b6e7d53..ff1ea06 100644
--- a/src/main/resources/templates/gcctonermanagement/upload.html
+++ b/src/main/resources/templates/gcctonermanagement/upload.html
@@ -831,13 +831,9 @@
                 </button>
             </div>
             <div class="sidebar-title d-none d-lg-block">Menu Options</div>
-            <a class="nav-tab active" onclick="switchView('dashboard')">
-                <i class="fa-solid fa-gauge"></i>
-                <span>Dashboard</span>
-            </a>
-            <a class="nav-tab" onclick="switchView('report')">
-                <i class="fa-solid fa-chart-column"></i>
-                <span>Report Page</span>
+            <a class="nav-tab active" onclick="switchView('report')">
+                <i class="fa-solid fa-chart-pie"></i>
+                <span>Dashboard & Reports</span>
             </a>
             <a class="nav-tab" onclick="switchView('workorder')">
                 <i class="fa-solid fa-file-contract"></i>
@@ -870,415 +866,8 @@
         <!-- Main Content Area -->
         <div class="main-content">
 
-            <!-- ================= DASHBOARD PANEL ================= -->
-            <div id="panel-dashboard" class="view-panel active">
-                <div class="section-header">
-                    <h1 class="section-title">
-                        <i class="fa-solid fa-chart-line"></i>
-                        Toner Management Dashboard
-                    </h1>
-                </div>
-
-                <!-- Dashboard Filters -->
-                <div class="card-custom mb-4">
-                    <div class="d-flex justify-content-between align-items-center mb-3 flex-wrap gap-2">
-                        <h5 class="fw-bold m-0" style="color: #0f5c78;">
-                            <i class="fa-solid fa-filter me-2"></i>Dashboard Filters
-                        </h5>
-                    </div>
-                    <div class="row g-3 align-items-end">
-                        <!-- Make / Printer Model -->
-                        <div class="col-12 col-sm-6 col-md-3">
-                            <label class="form-label" for="dashboard-printer-filter">
-                                <i class="fa-solid fa-print text-primary me-1"></i> Make (Printer)
-                            </label>
-                            <select id="dashboard-printer-filter" class="form-control-custom"
-                                onchange="onDashboardPrinterFilterChange()">
-                                <option value="">-- All Printer Models --</option>
-                            </select>
-                        </div>
-
-                        <!-- Toner Model -->
-                        <div class="col-12 col-sm-6 col-md-3">
-                            <label class="form-label" for="dashboard-toner-filter">
-                                <i class="fa-solid fa-droplet text-primary me-1"></i> Toner Model
-                            </label>
-                            <select id="dashboard-toner-filter" class="form-control-custom" disabled>
-                                <option value="">-- All Toners --</option>
-                            </select>
-                        </div>
-
-                        <!-- Work Order -->
-                        <div class="col-12 col-sm-6 col-md-3">
-                            <label class="form-label" for="dashboard-workorder-filter">
-                                <i class="fa-solid fa-file-contract text-primary me-1"></i> Work Order
-                            </label>
-                            <select id="dashboard-workorder-filter" class="form-control-custom">
-                                <option value="">-- All Work Orders --</option>
-                            </select>
-                        </div>
-
-                        <!-- Period Preset -->
-                        <div class="col-12 col-sm-6 col-md-3">
-                            <label class="form-label" for="dashboard-period-preset">
-                                <i class="fa-solid fa-calendar-days text-primary me-1"></i> Period
-                            </label>
-                            <select id="dashboard-period-preset" class="form-control-custom"
-                                onchange="onDashboardPeriodPresetChange()">
-                                <option value="all" selected>All Time</option>
-                                <option value="today">Today</option>
-                                <option value="week">This Week</option>
-                                <option value="month">This Month</option>
-                                <option value="last30">Last 30 Days</option>
-                                <option value="year">This Year</option>
-                                <option value="custom">Custom Range</option>
-                            </select>
-                        </div>
-                        <div class="col-12 col-sm-6 col-md-3">
-                            <button type="button" class="btn btn-outline-secondary w-100 py-2 fw-semibold"
-                                onclick="location.reload()">
-                                <i class="fa-solid fa-sync me-2"></i> Reset
-                            </button>
-                        </div>
-
-                        <!-- Custom Date Ranges (conditional display) -->
-                        <div class="col-12 col-sm-6 col-md-3" id="dashboard-start-date-wrapper" style="display: none;">
-                            <label class="form-label" for="dashboard-start-date">Start Date</label>
-                            <input type="date" id="dashboard-start-date" class="form-control-custom">
-                        </div>
-
-                        <div class="col-12 col-sm-6 col-md-3" id="dashboard-end-date-wrapper" style="display: none;">
-                            <label class="form-label" for="dashboard-end-date">End Date</label>
-                            <input type="date" id="dashboard-end-date" class="form-control-custom">
-                        </div>
-
-                        <!-- Fetch Button -->
-                        <div class="col-12 col-md-3 ms-auto">
-                            <button type="button" id="dashboard-fetch-btn"
-                                class="btn btn-primary w-100 py-2 fw-semibold" onclick="updateDashboardData()"
-                                style="border-radius: 10px; height: 48px; background: linear-gradient(135deg, #0f5c78, #1781a6); border: none; color: white;">
-                                <i class="fa-solid fa-sync me-2"></i> Fetch Data
-                            </button>
-                        </div>
-                    </div>
-                </div>
-
-                <!-- Visuals and Stats Grid -->
-                <div class="row mb-4">
-                    <!-- Left: Pie Chart Visual -->
-                    <div class="col-12 col-lg-6 mb-4 mb-lg-0">
-                        <div class="card-custom h-100 p-4">
-                            <h5 class="fw-bold mb-4" style="color: #0f5c78;">
-                                <i class="fa-solid fa-chart-pie me-2"></i>Stock Distribution Chart
-                            </h5>
-                            <!-- Chart Content wrapper -->
-                            <div class="row align-items-center">
-                                <div class="col-12 col-sm-7 d-flex justify-content-center">
-                                    <div style="position: relative; height: 220px; width: 220px;">
-                                        <canvas id="dashboard-pie-chart"></canvas>
-                                    </div>
-                                </div>
-                                <div class="col-12 col-sm-5 mt-3 mt-sm-0">
-                                    <div class="p-3 bg-light rounded-4 border border-light-subtle shadow-sm">
-                                        <h6 class="fw-bold mb-3 text-secondary text-uppercase tracking-wider"
-                                            style="font-size: 0.75rem;">Status Summary</h6>
-                                        <div class="mb-2">
-                                            <small class="text-muted fw-semibold d-block">Total Stock:</small>
-                                            <span class="fs-5 fw-bold font-monospace text-dark"
-                                                id="chart-total-count">0</span>
-                                        </div>
-                                        <div class="d-flex align-items-center gap-2 mb-2">
-                                            <span
-                                                style="display: inline-block; width: 12px; height: 12px; background-color: #0f5c78; border-radius: 3px;"></span>
-                                            <small class="fw-semibold text-secondary">In hand:</small>
-                                            <span class="ms-auto font-monospace fw-bold"
-                                                id="chart-inhand-count">0</span>
-                                        </div>
-                                        <div class="d-flex align-items-center gap-2">
-                                            <span
-                                                style="display: inline-block; width: 12px; height: 12px; background-color: #38bdf8; border-radius: 3px;"></span>
-                                            <small class="fw-semibold text-secondary">Issued:</small>
-                                            <span class="ms-auto font-monospace fw-bold"
-                                                id="chart-issued-count">0</span>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <!-- Right: Summary Metric Cards Grid -->
-                    <div class="col-12 col-lg-6">
-                        <div class="row g-3 h-100">
-                            <!-- Workorder Registered Qty Card -->
-                            <div class="col-6">
-                                <div class="metric-card card-indigo h-100 p-3 cursor-pointer dashboard-metric-card"
-                                    onclick="onDashboardMetricCardClick('workorder_registered')"
-                                    title="Click to view Workorder Register details">
-                                    <div class="metric-info">
-                                        <span class="metric-label" style="font-size: 0.75rem;">Workorder Registered
-                                            Qty</span>
-                                        <span class="metric-value font-monospace" id="db-stats-workorder">0</span>
-                                    </div>
-                                    <i class="fa-solid fa-file-contract metric-icon" style="font-size: 1.8rem;"></i>
-                                </div>
-                            </div>
-                            <!--
-                            <div class="col-6">
-                                <div class="metric-card card-purple h-100 p-3 cursor-pointer dashboard-metric-card"
-                                    onclick="onDashboardMetricCardClick('workorder_requested')"
-                                    title="Click to view Workorder Model Request details">
-                                    <div class="metric-info">
-                                        <span class="metric-label" style="font-size: 0.75rem;">Workorder Model
-                                            Request</span>
-                                        <span class="metric-value font-monospace"
-                                            id="db-stats-workorder-requested">0</span>
-                                    </div>
-                                    <i class="fa-solid fa-file-circle-check metric-icon" style="font-size: 1.8rem;"></i>
-                                </div>
-                            </div>
-                            -->
-                            <!-- Inward Card -->
-                            <div class="col-6">
-                                <div class="metric-card card-blue h-100 p-3 cursor-pointer dashboard-metric-card"
-                                    onclick="onDashboardMetricCardClick('inward_register')"
-                                    title="Click to view Inward Register details">
-                                    <div class="metric-info">
-                                        <span class="metric-label" style="font-size: 0.75rem;">Inward Register</span>
-                                        <span class="metric-value font-monospace" id="db-stats-inward">0</span>
-                                    </div>
-                                    <i class="fa-solid fa-boxes-packing metric-icon" style="font-size: 1.8rem;"></i>
-                                </div>
-                            </div>
-                            <!-- User Requested Card -->
-                            <div class="col-6">
-                                <div class="metric-card card-cyan h-100 p-3 cursor-pointer dashboard-metric-card"
-                                    onclick="onDashboardMetricCardClick('user_requested')"
-                                    title="Click to view User Requested details">
-                                    <div class="metric-info">
-                                        <span class="metric-label" style="font-size: 0.75rem;">User Requested</span>
-                                        <span class="metric-value font-monospace" id="db-stats-requested">0</span>
-                                    </div>
-                                    <i class="fa-solid fa-file-invoice metric-icon" style="font-size: 1.8rem;"></i>
-                                </div>
-                            </div>
-                            <!-- Outward Card -->
-                            <div class="col-6">
-                                <div class="metric-card card-green h-100 p-3 cursor-pointer dashboard-metric-card"
-                                    onclick="onDashboardMetricCardClick('outward_register')"
-                                    title="Click to view Outward Register details">
-                                    <div class="metric-info">
-                                        <span class="metric-label" style="font-size: 0.75rem;">Outward Register</span>
-                                        <span class="metric-value font-monospace" id="db-stats-outward">0</span>
-                                    </div>
-                                    <i class="fa-solid fa-truck-ramp-box metric-icon" style="font-size: 1.8rem;"></i>
-                                </div>
-                            </div>
-                            <!-- Available (In-Hand) Card -->
-                            <div class="col-12 col-sm-6">
-                                <div class="metric-card card-amber h-100 p-3 cursor-pointer dashboard-metric-card"
-                                    onclick="onDashboardMetricCardClick('available_stock')"
-                                    title="Click to view Available Stock details">
-                                    <div class="metric-info">
-                                        <span class="metric-label" style="font-size: 0.75rem;">In Hand
-                                            (Available)</span>
-                                        <span class="metric-value font-monospace" id="db-stats-available">0</span>
-                                    </div>
-                                    <i class="fa-solid fa-warehouse metric-icon" style="font-size: 1.8rem;"></i>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <!-- Unified Breakdown Table -->
-                <div class="card-custom">
-                    <div class="d-flex justify-content-between align-items-center mb-4 flex-wrap gap-3">
-                        <div class="d-flex align-items-center gap-2">
-                            <h5 class="fw-bold m-0" style="color: #0f5c78; font-size: 0.95rem;">
-                                <i class="fa-solid fa-table me-2"></i>Category & Workorder Wise Stock Breakdown
-                            </h5>
-                            <div class="d-flex align-items-center gap-2" style="font-size: 0.88rem; color: #64748b;">
-                                <label for="cat-work-page-size-select" class="fw-semibold m-0">Show</label>
-                                <select id="cat-work-page-size-select" class="form-select form-select-sm"
-                                    style="width: auto; font-weight: 600; border-radius: 8px;"
-                                    onchange="onDashboardBreakdownPageSizeChange(this.value)">
-                                    <option value="10">10</option>
-                                    <option value="20" selected>20</option>
-                                    <option value="50">50</option>
-                                    <option value="100">100</option>
-                                </select>
-                                <span class="fw-semibold">entries</span>
-                            </div>
-                            <span id="dashboard-breakdown-count-badge"
-                                class="badge bg-light text-secondary border px-2 py-1" style="font-size: 0.75rem;">0
-                                records</span>
-                        </div>
-
-                        <div class="d-flex align-items-center gap-3 flex-wrap">
-                            <!-- Dropdown filter for User Request Wise / Work Order Registered Wise / All -->
-                            <div class="d-flex align-items-center gap-2">
-                                <small class="text-muted fw-semibold" style="white-space: nowrap;">
-                                    <i class="fa-solid fa-layer-group me-1 text-primary"></i>Breakdown View:
-                                </small>
-                                <select id="dashboard-breakdown-view-filter" class="form-control-custom py-1"
-                                    style="width: 220px; height: 36px; font-size: 0.85rem; font-weight: 600;"
-                                    onchange="onDashboardBreakdownViewChange(this.value)">
-                                    <option value="user_request" selected>User Request Wise</option>
-                                    <option value="workorder">Workorder Registered Wise</option>
-                                    <option value="all">All Combined</option>
-                                </select>
-                            </div>
-                            <div class="d-flex align-items-center gap-2">
-                                <small class="text-muted fw-semibold">Search:</small>
-                                <input type="text" id="dashboard-stock-breakdown-search"
-                                    class="form-control-custom py-1"
-                                    style="width: 180px; height: 36px; font-size: 0.85rem;"
-                                    placeholder="Search breakdown..."
-                                    oninput="onDashboardStockBreakdownSearchInput(this.value)">
-                            </div>
-                        </div>
-                    </div>
-                    <div class="table-responsive">
-                        <table class="table grid-table align-middle">
-                            <thead class="table-light">
-                                <tr>
-                                    <th style="width: 60px;">S.No</th>
-                                    <th>Printer Model (Make)</th>
-                                    <th id="th-dashboard-wo-ref" style="display: none;">Work Order Ref</th>
-                                    <th id="th-dashboard-itcell-ref">ITCell Ref No</th>
-                                    <th class="text-center">Workorder Registered Qty</th>
-                                    <!-- <th class="text-center">Workorder Request Qty</th> -->
-                                    <th class="text-center">Inward Qty</th>
-                                    <th class="text-center">User Request Qty</th>
-                                    <th class="text-center">Outward/Issued Qty</th>
-                                    <th class="text-center">In Hand / Available</th>
-                                </tr>
-                            </thead>
-                            <tbody id="dashboard-tbody">
-                                <tr>
-                                    <td colspan="8" class="text-center text-muted py-4">Click "Fetch Data" to view
-                                        dashboard records.</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                    <!-- Client-Side Pagination Controls -->
-                    <div class="d-flex justify-content-between align-items-center mt-3 pt-3 border-top flex-wrap gap-2"
-                        id="dashboard-breakdown-pagination-wrapper">
-                        <div class="text-secondary fw-semibold" id="dashboard-breakdown-pagination-info"
-                            style="font-size: 0.85rem;">
-                            Showing 0 to 0 of 0 entries
-                        </div>
-                        <ul class="pagination pagination-sm m-0" id="dashboard-breakdown-pagination-nav">
-                            <!-- Dynamic pagination items -->
-                        </ul>
-                    </div>
-                </div>
-
-                <!-- Interactive Detailed Records Datatable -->
-                <div class="card-custom mt-4" id="dashboard-details-card"
-                    style="display: none; border: 1px solid rgba(15, 92, 120, 0.12); box-shadow: 0 4px 20px rgba(0, 0, 0, 0.05);">
-                    <div class="d-flex justify-content-between align-items-center mb-4 flex-wrap gap-3">
-                        <h5 class="fw-bold m-0 text-uppercase tracking-wider"
-                            style="color: #0f5c78; font-size: 0.95rem;">
-                            <i class="fa-solid fa-list-check me-2"></i>Detailed Records Breakdown
-                        </h5>
-                        <div class="d-flex align-items-center gap-2 flex-wrap">
-                            <!-- Search Details Box -->
-                            <div class="d-flex align-items-center gap-1">
-                                <small class="text-muted fw-semibold">Search:</small>
-                                <input type="text" id="dashboard-details-search" class="form-control-custom py-1"
-                                    style="width: 180px; height: 36px; font-size: 0.85rem;"
-                                    placeholder="Search records..." oninput="onDashboardDetailsSearchInput(this.value)">
-                            </div>
-                            <!-- Category/Report Type Select -->
-                            <div class="d-flex align-items-center gap-1">
-                                <small class="text-muted fw-semibold">Type:</small>
-                                <select id="dashboard-details-type-select" class="form-control-custom py-1"
-                                    style="width: auto; height: 36px; font-size: 0.85rem;"
-                                    onchange="onDashboardDetailsTypeChange()">
-                                    <option value="workorder_registered">Workorder Registered Qty</option>
-                                    <!-- <option value="workorder_requested">Workorder Model Request</option> -->
-                                    <option value="inward_register">Inward Register</option>
-                                    <option value="user_requested">User Requested</option>
-                                    <option value="outward_register">Outward Register</option>
-                                    <option value="available_stock">In Hand (Available)</option>
-                                </select>
-                            </div>
-
-                            <!-- Printer Make (Categorywise) Filter -->
-                            <div class="d-flex align-items-center gap-1">
-                                <small class="text-muted fw-semibold">Printer:</small>
-                                <select id="dashboard-details-category-filter" class="form-control-custom py-1"
-                                    style="width: auto; height: 36px; font-size: 0.85rem;"
-                                    onchange="applyDashboardDetailsFilters(1)">
-                                    <option value="">-- All Printer Models --</option>
-                                </select>
-                            </div>
-
-                            <!-- Department Filter (dynamically shown) -->
-                            <div class="d-flex align-items-center gap-1" id="dashboard-details-dept-filter-wrapper"
-                                style="display: none;">
-                                <small class="text-muted fw-semibold">Dept:</small>
-                                <select id="dashboard-details-dept-filter" class="form-control-custom py-1"
-                                    style="width: auto; height: 36px; font-size: 0.85rem;"
-                                    onchange="applyDashboardDetailsFilters(1)">
-                                    <option value="">-- All Departments --</option>
-                                </select>
-                            </div>
-
-                            <!-- Stock Status Filter (dynamically shown for available stock) -->
-                            <div class="d-flex align-items-center gap-1" id="dashboard-details-stock-filter-wrapper"
-                                style="display: none;">
-                                <small class="text-muted fw-semibold">Stock Status:</small>
-                                <select id="dashboard-details-stock-filter" class="form-control-custom py-1"
-                                    style="width: auto; height: 36px; font-size: 0.85rem;"
-                                    onchange="applyDashboardDetailsFilters(1)">
-                                    <option value="">-- All Statuses --</option>
-                                    <option value="instock">In Stock (Green)</option>
-                                    <option value="low">Low Stock (Warning)</option>
-                                    <option value="outofstock">Out of Stock (Danger)</option>
-                                </select>
-                            </div>
-
-                        </div>
-                    </div>
-
-                    <div class="table-responsive" style="position: relative; min-height: 150px;">
-                        <!-- Loader -->
-                        <div id="dashboard-details-loader"
-                            class="position-absolute top-50 start-50 translate-middle text-center w-100 h-100 d-none flex-column align-items-center justify-content-center"
-                            style="z-index: 10; background: rgba(255, 255, 255, 0.85);">
-                            <div>
-                                <i class="fa-solid fa-circle-notch fa-spin fa-2x text-primary mb-2"></i>
-                                <div class="fw-semibold text-secondary" style="font-size: 0.88rem;">Loading detailed
-                                    records...</div>
-                            </div>
-                        </div>
-
-                        <table class="table grid-table align-middle">
-                            <thead class="table-light" id="dashboard-details-thead" style="font-size: 0.85rem;">
-                                <!-- Dynamically loaded head -->
-                            </thead>
-                            <tbody id="dashboard-details-tbody" style="font-size: 0.85rem;">
-                                <!-- Dynamically loaded body -->
-                            </tbody>
-                        </table>
-                    </div>
-
-                    <!-- Footer Action/Pagination -->
-                    <div class="d-flex justify-content-between align-items-center mt-3 pt-3 border-top flex-wrap gap-2">
-                        <small class="text-muted fw-semibold" id="dashboard-details-count-badge">0 Records</small>
-                        <nav aria-label="Details pagination" id="dashboard-details-pagination-nav">
-                            <!-- Dynamic pagination links -->
-                        </nav>
-                    </div>
-                </div>
-            </div>
-
-            <!-- ================= REPORT PANEL ================= -->
-            <div id="panel-report" class="view-panel">
+            <!-- ================= DASHBOARD & REPORT PANEL ================= -->
+            <div id="panel-report" class="view-panel active">
                 <div class="section-header">
                     <h1 class="section-title">
                         <i class="fa-solid fa-chart-pie"></i>
@@ -1438,24 +1027,21 @@
                         </div>
                         <i class="fa-solid fa-file-contract metric-icon"></i>
                     </div>
-                    <!--
-                    <div class="metric-card card-purple cursor-pointer"
-                        onclick="onMetricCardClick('workorder_requested')"
-                        title="Click to view Workorder Model Request report">
+                    <div class="metric-card card-cyan cursor-pointer" onclick="onMetricCardClick('user_requests')"
+                        title="Click to view User Request Details report">
                         <div class="metric-info">
-                            <span class="metric-label">Total Requested (IT Cell)</span>
-                            <span class="metric-value" id="stats-workorder-requested">0</span>
+                            <span class="metric-label">Total User Requested</span>
+                            <span class="metric-value" id="stats-user-requested">0</span>
                         </div>
-                        <i class="fa-solid fa-file-circle-check metric-icon"></i>
+                        <i class="fa-solid fa-file-invoice metric-icon"></i>
                     </div>
-                    -->
                     <div class="metric-card card-blue cursor-pointer" onclick="onMetricCardClick('total_stock')"
                         title="Click to view Total Stock report">
                         <div class="metric-info">
                             <span class="metric-label">Total Stock</span>
                             <span class="metric-value" id="stats-inward">0</span>
                         </div>
-                        <i class="fa-solid fa-file-lines metric-icon"></i>
+                        <i class="fa-solid fa-boxes-packing metric-icon"></i>
                     </div>
                     <div class="metric-card card-green cursor-pointer" onclick="onMetricCardClick('delivered')"
                         title="Click to view Total Delivered report">
@@ -1463,7 +1049,7 @@
                             <span class="metric-label">Total Delievered</span>
                             <span class="metric-value" id="stats-distributed">0</span>
                         </div>
-                        <i class="fa-solid fa-truck-fast metric-icon"></i>
+                        <i class="fa-solid fa-truck-ramp-box metric-icon"></i>
                     </div>
                     <div class="metric-card card-amber cursor-pointer" onclick="onMetricCardClick('available_stock')"
                         title="Click to view Available Stock report">
@@ -1883,14 +1469,14 @@
                                 <i class="fa-solid fa-circle-info me-2"></i>Inward Details
                             </h5>
                             <form id="inward-form" onsubmit="submitInward(event)">
-                                <!-- Workorder Reference No -->
+                                <!-- Workorder File No -->
                                 <div class="mb-3">
                                     <label class="form-label" for="inward-ref-select">
-                                        <i class="fa-solid fa-hashtag text-primary me-1"></i> Workorder Reference No. *
+                                        <i class="fa-solid fa-folder-open text-primary me-1"></i> File No. *
                                     </label>
                                     <select id="inward-ref-select" required class="form-control-custom"
                                         onchange="onInwardWorkorderSelectChange(this)">
-                                        <option value="">-- Select Workorder Reference --</option>
+                                        <option value="">-- Select File No. --</option>
                                     </select>
                                 </div>
 
@@ -1903,6 +1489,23 @@
                                         readonly style="background-color: #f1f5f9; font-weight: bold; color: #334155;">
                                 </div>
 
+                                <!-- Delivery Challan (DC) No. -->
+                                <div class="mb-3">
+                                    <label class="form-label" for="inward-dc-no">
+                                        <i class="fa-solid fa-receipt text-primary me-1"></i> Delivery Challan (DC) No.
+                                    </label>
+                                    <input type="text" id="inward-dc-no" class="form-control-custom"
+                                        placeholder="e.g. DC-2026-001" maxlength="100">
+                                </div>
+
+                                <!-- DC Upload Date -->
+                                <div class="mb-3">
+                                    <label class="form-label" for="inward-dc-date">
+                                        <i class="fa-solid fa-calendar-days text-primary me-1"></i> DC Date
+                                    </label>
+                                    <input type="date" id="inward-dc-date" class="form-control-custom">
+                                </div>
+
                                 <!-- Delivery Challan DC Upload -->
                                 <div class="mb-3">
                                     <label class="form-label">
@@ -1946,16 +1549,27 @@
                                 <table class="table table-hover align-middle">
                                     <thead class="table-light">
                                         <tr>
-                                            <th>Printer Model</th>
-                                            <th>Toner Model</th>
-                                            <th class="text-center" style="width: 180px;">Status Quantities</th>
-                                            <th class="text-center" style="width: 120px;">Qty Inward</th>
+                                            <th rowspan="2" class="align-middle">Printer Model</th>
+                                            <th rowspan="2" class="align-middle">Toner Model</th>
+                                            <th colspan="3" class="text-center align-middle"
+                                                style="background-color: #f1f5f9; color: #0f5c78; font-weight: 700; border-bottom: 1px solid #cbd5e1;">
+                                                Status Quantities</th>
+                                            <th rowspan="2" class="text-center align-middle" style="width: 110px;">Qty
+                                                Inward</th>
+                                        </tr>
+                                        <tr class="text-center" style="font-size: 0.75rem; background-color: #f8fafc;">
+                                            <th class="py-1 px-2 text-secondary fw-bold" style="width: 65px;">Po
+                                                Quantity</th>
+                                            <th class="py-1 px-2 text-success fw-bold" style="width: 75px;">Received
+                                            </th>
+                                            <th class="py-1 px-2 fw-bold" style="width: 80px; color: #d97706;">Remaining
+                                            </th>
                                         </tr>
                                     </thead>
                                     <tbody id="inward-items-tbody">
                                         <tr>
-                                            <td colspan="4" class="text-center text-muted py-4">
-                                                Please select a Workorder Reference to view registered models.
+                                            <td colspan="6" class="text-center text-muted py-4">
+                                                Please select a File No. to view registered models.
                                             </td>
                                         </tr>
                                     </tbody>
@@ -2049,6 +1663,14 @@
                                         placeholder="e.g. IT/2026/001" maxlength="45">
                                 </div>
 
+                                <!-- User Requested Date -->
+                                <div class="mb-3">
+                                    <label class="form-label" for="request-date">
+                                        <i class="fa-solid fa-calendar-days text-primary me-1"></i> User Requested Date
+                                    </label>
+                                    <input type="date" id="request-date" class="form-control-custom">
+                                </div>
+
                                 <!-- Department Name -->
                                 <div class="mb-3">
                                     <label class="form-label" for="request-dept">
@@ -2311,157 +1933,190 @@
                 </div>
 
                 <!-- Outward Delivery form -->
-                <div class="card-custom" style="max-width: 790px;">
-                    <form id="outward-form" onsubmit="event.preventDefault(); saveOutwardDelivery(event);">
-                        <!-- Request No Selection -->
-                        <div class="mb-4">
-                            <label class="form-label" for="outward-request-select">
-                                <i class="fa-solid fa-list-check text-primary me-1"></i> Select Active Request *
-                            </label>
-                            <select id="outward-request-select" required class="form-control-custom"
-                                onchange="onOutwardRequestSelection()">
-                                <option value="">-- Select Pending Request --</option>
-                            </select>
-                        </div>
-
-                        <!-- Read only info details -->
-                        <div class="row">
-                            <div class="col-12 col-md-6 mb-3">
-                                <label class="form-label">Department / Office</label>
-                                <input type="text" id="outward-dept-disp" class="form-control-custom" disabled>
-                            </div>
-                            <div class="col-12 col-md-6 mb-3">
-                                <label class="form-label">Printer Model</label>
-                                <input type="text" id="outward-printer-disp" class="form-control-custom" disabled>
-                            </div>
-                            <div class="col-12 col-md-6 mb-3">
-                                <label class="form-label">Toner Model</label>
-                                <input type="text" id="outward-toner-disp" class="form-control-custom" disabled>
-                            </div>
-                            <div class="col-12 col-md-6 mb-3">
-                                <label class="form-label">Quantity Requested</label>
-                                <input type="text" id="outward-qty-req-disp" class="form-control-custom" disabled>
-                            </div>
-                            <div class="col-12 mb-3">
-                                <label class="form-label"><i class="fa-solid fa-boxes-stacked text-success me-1"></i>
-                                    Available Inward Stock</label>
-                                <input type="text" id="outward-avail-stock-disp" class="form-control-custom"
-                                    style="font-weight: 700; color: #166534; background-color: #f0fdf4;" disabled
-                                    placeholder="Select request to view stock">
-                            </div>
-                        </div>
-
-                        <!-- Quantity Issued -->
-                        <div class="mb-4 mt-3">
-                            <label class="form-label" for="outward-qty-delivered">
-                                <i class="fa-solid fa-hashtag text-primary me-1"></i> Quantity Issued *
-                            </label>
-                            <input type="number" id="outward-qty-delivered" required class="form-control-custom"
-                                placeholder="Enter quantity to issue" min="1" step="1">
-                        </div>
-
-                        <!-- Save & Download Button -->
-                        <button type="submit" class="btn-submit mt-3" id="outward-save-btn">
-                            <i class="fa-solid fa-cloud-arrow-down"></i> Save Delivery & Download Acknowledgement
-                        </button>
+                <div class="row">
+                    <!-- Left Column: Outward Details Form -->
+                    <div class="col-12 col-lg-5 mb-4">
+                        <div class="card-custom h-100">
+                            <h5 class="fw-bold mb-4" style="color: #0f5c78;">
+                                <i class="fa-solid fa-truck-ramp-box me-2"></i>Outward Details
+                            </h5>
+                            <form id="outward-form" onsubmit="event.preventDefault(); saveOutwardDelivery(event);">
+                                <!-- Select Active Request (IT Cell Ref No wise) -->
+                                <div class="mb-3">
+                                    <label class="form-label" for="outward-request-select">
+                                        <i class="fa-solid fa-list-check text-primary me-1"></i> Select Active Request *
+                                    </label>
+                                    <select id="outward-request-select" required class="form-control-custom"
+                                        onchange="onOutwardRequestSelection()">
+                                        <option value="">-- Select Pending Request --</option>
+                                    </select>
+                                </div>
 
-                        <!-- Upload Signed Acknowledgement & User Photo Area (Always visible, initially disabled) -->
-                        <div id="outward-upload-area" class="mt-4 pt-3 border-top">
-                            <h6 class="fw-bold mb-3" style="color: #0f5c78;">
-                                <i class="fa-solid fa-clipboard-check me-2"></i>Delivery Proof & Acknowledgement
-                            </h6>
-
-                            <div class="row g-3">
-                                <!-- 1. Signed Acknowledgement File Upload -->
-                                <div class="col-12 col-md-6">
-                                    <label class="form-label fw-bold small text-secondary">
-                                        <i class="fa-solid fa-file-pdf text-danger me-1"></i> Signed Acknowledgement
-                                        (PDF) *
+                                <!-- Department / Office -->
+                                <div class="mb-3">
+                                    <label class="form-label" for="outward-dept-disp">
+                                        <i class="fa-solid fa-building text-primary me-1"></i> Department / Office
                                     </label>
-                                    <div class="file-upload-card" id="outward-upload-card"
-                                        onclick="if(!this.classList.contains('disabled-card')) document.getElementById('outward-final-file').click();"
-                                        style="opacity: 0.65; pointer-events: none; cursor: not-allowed; min-height: 140px;">
-                                        <i class="fa-solid fa-cloud-arrow-up upload-card-icon"></i>
-                                        <span class="upload-card-text" id="outward-final-label">Choose Signed PDF</span>
-                                        <input type="file" id="outward-final-file" accept=".pdf" class="d-none" disabled
-                                            onchange="handleFileSelection(this, 'outward-final-label'); checkOutwardUploadReady();">
-                                    </div>
+                                    <input type="text" id="outward-dept-disp" class="form-control-custom" readonly
+                                        style="background-color: #f1f5f9; font-weight: bold; color: #334155;">
                                 </div>
 
-                                <!-- 2. Receiver / User Image Capture/Upload -->
-                                <div class="col-12 col-md-6">
-                                    <label class="form-label fw-bold small text-secondary">
-                                        <i class="fa-solid fa-camera text-primary me-1"></i> Receiver / User Photo *
+                                <!-- Outward Date -->
+                                <div class="mb-3">
+                                    <label class="form-label" for="outward-date">
+                                        <i class="fa-solid fa-calendar-days text-primary me-1"></i> Outward Date *
                                     </label>
-                                    <div class="card p-2 text-center border-2 border-dashed position-relative d-flex flex-column align-items-center justify-content-center"
-                                        id="outward-photo-card"
-                                        style="border: 2px dashed #cbd5e1; border-radius: 12px; min-height: 140px; background: #f8fafc; opacity: 0.65; pointer-events: none;">
-
-                                        <!-- Placeholder when no photo -->
-                                        <div id="outward-photo-placeholder" class="py-2">
-                                            <i class="fa-solid fa-user-tie text-secondary mb-2"
-                                                style="font-size: 1.8rem; opacity: 0.6;"></i>
-                                            <div class="d-flex gap-2 justify-content-center mt-1 flex-wrap">
-                                                <button type="button" class="btn btn-sm btn-primary fw-semibold px-2"
-                                                    id="outward-camera-btn" onclick="openOutwardCameraModal()"
-                                                    style="border-radius: 8px; font-size: 11px; background-color: #0f5c78; border-color: #0f5c78;">
-                                                    <i class="fa-solid fa-camera me-1"></i> Take Photo
-                                                </button>
-                                                <button type="button"
-                                                    class="btn btn-sm btn-outline-secondary fw-semibold px-2"
-                                                    id="outward-file-photo-btn"
-                                                    onclick="document.getElementById('outward-user-photo-file').click()"
-                                                    style="border-radius: 8px; font-size: 11px;">
-                                                    <i class="fa-solid fa-image me-1"></i> Select File
-                                                </button>
+                                    <input type="date" id="outward-date" required class="form-control-custom">
+                                </div>
+
+                                <!-- Save & Download Button -->
+                                <button type="submit" class="btn-submit mt-3 w-100" id="outward-save-btn">
+                                    <i class="fa-solid fa-cloud-arrow-down me-1"></i> Save Delivery & Download
+                                    Acknowledgement
+                                </button>
+
+                                <!-- Upload Signed Acknowledgement & User Photo Area (Always visible, initially disabled) -->
+                                <div id="outward-upload-area" class="mt-4 pt-3 border-top">
+                                    <h6 class="fw-bold mb-3" style="color: #0f5c78;">
+                                        <i class="fa-solid fa-clipboard-check me-2"></i>Delivery Proof & Acknowledgement
+                                    </h6>
+
+                                    <div class="row g-3">
+                                        <!-- 1. Signed Acknowledgement File Upload -->
+                                        <div class="col-12 col-md-6">
+                                            <label class="form-label fw-bold small text-secondary">
+                                                <i class="fa-solid fa-file-pdf text-danger me-1"></i> Signed
+                                                Acknowledgement (PDF) *
+                                            </label>
+                                            <div class="file-upload-card" id="outward-upload-card"
+                                                onclick="if(!this.classList.contains('disabled-card')) document.getElementById('outward-final-file').click();"
+                                                style="opacity: 0.65; pointer-events: none; cursor: not-allowed; min-height: 140px;">
+                                                <i class="fa-solid fa-cloud-arrow-up upload-card-icon"></i>
+                                                <span class="upload-card-text" id="outward-final-label">Choose Signed
+                                                    PDF</span>
+                                                <input type="file" id="outward-final-file" accept=".pdf" class="d-none"
+                                                    disabled
+                                                    onchange="handleFileSelection(this, 'outward-final-label'); checkOutwardUploadReady();">
                                             </div>
                                         </div>
 
-                                        <!-- Photo Preview when captured or selected -->
-                                        <div id="outward-photo-preview-wrapper"
-                                            class="d-none w-100 position-relative text-center py-1">
-                                            <img id="outward-photo-preview" src="" alt="Receiver Photo Preview"
-                                                style="max-height: 95px; max-width: 100%; border-radius: 8px; object-fit: cover; border: 2px solid #0f5c78; box-shadow: 0 2px 6px rgba(0,0,0,0.15);">
-                                            <div class="mt-1 d-flex justify-content-center gap-2">
-                                                <button type="button"
-                                                    class="btn btn-sm btn-outline-danger py-0 px-2 fw-semibold"
-                                                    style="font-size: 10px; border-radius: 6px;"
-                                                    onclick="clearOutwardPhoto()">
-                                                    <i class="fa-solid fa-trash me-1"></i> Remove
-                                                </button>
-                                                <button type="button"
-                                                    class="btn btn-sm btn-outline-primary py-0 px-2 fw-semibold"
-                                                    style="font-size: 10px; border-radius: 6px;"
-                                                    onclick="openOutwardCameraModal()">
-                                                    <i class="fa-solid fa-rotate me-1"></i> Retake
-                                                </button>
+                                        <!-- 2. Receiver / User Image Capture/Upload -->
+                                        <div class="col-12 col-md-6">
+                                            <label class="form-label fw-bold small text-secondary">
+                                                <i class="fa-solid fa-camera text-primary me-1"></i> Receiver / User
+                                                Photo <span class="text-muted small fw-normal">(Optional)</span>
+                                            </label>
+                                            <div class="card p-2 text-center border-2 border-dashed position-relative d-flex flex-column align-items-center justify-content-center"
+                                                id="outward-photo-card"
+                                                style="border: 2px dashed #cbd5e1; border-radius: 12px; min-height: 140px; background: #f8fafc; opacity: 0.65; pointer-events: none;">
+
+                                                <!-- Placeholder when no photo -->
+                                                <div id="outward-photo-placeholder" class="py-2">
+                                                    <i class="fa-solid fa-user-tie text-secondary mb-2"
+                                                        style="font-size: 1.8rem; opacity: 0.6;"></i>
+                                                    <div class="d-flex gap-2 justify-content-center mt-1 flex-wrap">
+                                                        <button type="button"
+                                                            class="btn btn-sm btn-primary fw-semibold px-2"
+                                                            id="outward-camera-btn" onclick="openOutwardCameraModal()"
+                                                            style="border-radius: 8px; font-size: 11px; background-color: #0f5c78; border-color: #0f5c78;">
+                                                            <i class="fa-solid fa-camera me-1"></i> Take Photo
+                                                        </button>
+                                                        <button type="button"
+                                                            class="btn btn-sm btn-outline-secondary fw-semibold px-2"
+                                                            id="outward-file-photo-btn"
+                                                            onclick="document.getElementById('outward-user-photo-file').click()"
+                                                            style="border-radius: 8px; font-size: 11px;">
+                                                            <i class="fa-solid fa-image me-1"></i> Select File
+                                                        </button>
+                                                    </div>
+                                                </div>
+
+                                                <!-- Photo Preview when captured or selected -->
+                                                <div id="outward-photo-preview-wrapper"
+                                                    class="d-none w-100 position-relative text-center py-1">
+                                                    <img id="outward-photo-preview" src="" alt="Receiver Photo Preview"
+                                                        style="max-height: 95px; max-width: 100%; border-radius: 8px; object-fit: cover; border: 2px solid #0f5c78; box-shadow: 0 2px 6px rgba(0,0,0,0.15);">
+                                                    <div class="mt-1 d-flex justify-content-center gap-2">
+                                                        <button type="button"
+                                                            class="btn btn-sm btn-outline-danger py-0 px-2 fw-semibold"
+                                                            style="font-size: 10px; border-radius: 6px;"
+                                                            onclick="clearOutwardPhoto()">
+                                                            <i class="fa-solid fa-trash me-1"></i> Remove
+                                                        </button>
+                                                        <button type="button"
+                                                            class="btn btn-sm btn-outline-primary py-0 px-2 fw-semibold"
+                                                            style="font-size: 10px; border-radius: 6px;"
+                                                            onclick="openOutwardCameraModal()">
+                                                            <i class="fa-solid fa-rotate me-1"></i> Retake
+                                                        </button>
+                                                    </div>
+                                                </div>
+
+                                                <input type="file" id="outward-user-photo-file" accept="image/*"
+                                                    class="d-none" disabled onchange="handleOutwardPhotoSelect(this)">
                                             </div>
                                         </div>
-
-                                        <input type="file" id="outward-user-photo-file" accept="image/*" class="d-none"
-                                            disabled onchange="handleOutwardPhotoSelect(this)">
                                     </div>
+
+                                    <button type="button" class="btn btn-success w-100 mt-3 py-2 fw-semibold"
+                                        id="outward-upload-btn" onclick="uploadSignedPdfAndPhoto()" disabled
+                                        style="border-radius: 12px; background: linear-gradient(135deg, #15803d, #22c55e); box-shadow: 0 4px 15px rgba(22, 101, 52, 0.2); border: none; color: white;">
+                                        <i class="fa-solid fa-arrow-up-from-bracket me-1"></i> Upload Signed PDF & Photo
+                                    </button>
                                 </div>
-                            </div>
 
-                            <button type="button" class="btn btn-success w-100 mt-3 py-2 fw-semibold"
-                                id="outward-upload-btn" onclick="uploadSignedPdfAndPhoto()" disabled
-                                style="border-radius: 12px; background: linear-gradient(135deg, #15803d, #22c55e); box-shadow: 0 4px 15px rgba(22, 101, 52, 0.2); border: none; color: white;">
-                                <i class="fa-solid fa-arrow-up-from-bracket me-1"></i> Upload Signed PDF & Photo
-                            </button>
+                                <!-- Progress Bar -->
+                                <div class="progress-container" id="outward-progress-container">
+                                    <div class="progress-text">
+                                        <span>Processing...</span>
+                                        <span id="outward-progress-percent">0%</span>
+                                    </div>
+                                    <div class="progress-bar-wrapper">
+                                        <div class="progress-bar-fill" id="outward-progress-fill"></div>
+                                    </div>
+                                </div>
+                            </form>
                         </div>
+                    </div>
 
-                        <!-- Progress Bar -->
-                        <div class="progress-container" id="outward-progress-container">
-                            <div class="progress-text">
-                                <span>Processing...</span>
-                                <span id="outward-progress-percent">0%</span>
-                            </div>
-                            <div class="progress-bar-wrapper">
-                                <div class="progress-bar-fill" id="outward-progress-fill"></div>
+                    <!-- Right Column: Requested Toners & Stock Status Table -->
+                    <div class="col-12 col-lg-7 mb-4">
+                        <div class="card-custom h-100">
+                            <h5 class="fw-bold mb-4" style="color: #0f5c78;">
+                                <i class="fa-solid fa-boxes-stacked me-2"></i>Requested Toners & Stock Status
+                            </h5>
+                            <div class="table-responsive" style="max-height: 480px; overflow-y: auto;">
+                                <table class="table table-hover align-middle">
+                                    <thead class="table-light">
+                                        <tr>
+                                            <th rowspan="2" class="align-middle">Printer Model</th>
+                                            <th rowspan="2" class="align-middle">Toner Model</th>
+                                            <th colspan="3" class="text-center align-middle"
+                                                style="background-color: #f1f5f9; color: #0f5c78; font-weight: 700; border-bottom: 1px solid #cbd5e1;">
+                                                Request Status</th>
+                                            <th rowspan="2" class="text-center align-middle" style="width: 120px;">
+                                                Available Stock</th>
+                                            <th rowspan="2" class="text-center align-middle" style="width: 110px;">Qty
+                                                Issue</th>
+                                        </tr>
+                                        <tr class="text-center" style="font-size: 0.75rem; background-color: #f8fafc;">
+                                            <th class="py-1 px-2 text-secondary fw-bold" style="width: 55px;">Req</th>
+                                            <th class="py-1 px-2 text-success fw-bold" style="width: 55px;">Issued</th>
+                                            <th class="py-1 px-2 fw-bold" style="width: 60px; color: #d97706;">Pending
+                                            </th>
+                                        </tr>
+                                    </thead>
+                                    <tbody id="outward-items-tbody">
+                                        <tr>
+                                            <td colspan="7" class="text-center text-muted py-4">
+                                                Please select an Active Request to view requested toner models.
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
                             </div>
                         </div>
-                    </form>
+                    </div>
                 </div>
 
                 <!-- Outward Delivery History table -->
@@ -2816,7 +2471,6 @@
         </div>
 
     </div>
-    </div>
 
     <!-- Edit Master Printer Model Modal -->
     <div class="modal fade" id="editMasterPrinterModal" tabindex="-1" aria-labelledby="editMasterPrinterModalLabel"
@@ -2971,6 +2625,7 @@
         let departmentsCached = [];
         let zonesCached = [];
         let pendingRequestsCached = [];
+        let pendingRequestsGrouped = {};
         let userRequestsCached = [];
         let inwardHistoryCached = [];
         let outwardHistoryCached = [];
@@ -2994,9 +2649,10 @@
             fetchPrinters();
             fetchDepartmentsList();
             fetchZonesList();
-            // Load vendors map, then default to Dashboard View Data
+            fetchActiveWorkordersForInward();
+            // Load vendors map, then default to Dashboard & Report View Data
             loadVendorsMap(() => {
-                loadDashboardPage();
+                loadReportPage();
             });
         });
 
@@ -3036,11 +2692,7 @@
             if (panel) panel.classList.add('active');
 
             // Trigger data fetches on tab switch
-            if (panelName === 'dashboard') {
-                loadVendorsMap(() => {
-                    loadDashboardPage();
-                });
-            } else if (panelName === 'report') {
+            if (panelName === 'dashboard' || panelName === 'report') {
                 loadVendorsMap(() => {
                     loadReportPage();
                 });
@@ -3063,7 +2715,7 @@
                 resetForm('inward');
                 const tbody = document.getElementById('inward-items-tbody');
                 if (tbody) {
-                    tbody.innerHTML = '<tr><td colspan="4" class="text-center text-muted py-4">Please select a Workorder Reference to view registered models.</td></tr>';
+                    tbody.innerHTML = '<tr><td colspan="6" class="text-center text-muted py-4">Please select a File No. to view registered models.</td></tr>';
                 }
                 fetchActiveWorkordersForInward();
                 loadVendorsMap(() => {
@@ -3182,6 +2834,12 @@
                 const typeSelect = document.getElementById('report-type-select');
                 if (typeSelect) typeSelect.value = 'workorder_register';
                 onReportTypeChange();
+            } else if (cardType === 'user_requests' || cardType === 'user_requested') {
+                const card = document.querySelector('.metrics-grid .card-cyan');
+                if (card) card.style.outline = '3px solid #0891b2';
+                const typeSelect = document.getElementById('report-type-select');
+                if (typeSelect) typeSelect.value = 'user_requests';
+                onReportTypeChange();
             } else if (cardType === 'workorder_requested') {
                 const card = document.querySelector('.metrics-grid .card-purple');
                 if (card) card.style.outline = '3px solid #7c3aed';
@@ -3317,6 +2975,8 @@
             if (prefix === 'request') {
                 const badge = document.getElementById('request-stock-badge');
                 if (badge) badge.classList.add('d-none');
+                const reqDateInput = document.getElementById('request-date');
+                if (reqDateInput) reqDateInput.value = '';
             }
 
             if (prefix === 'workorder-request') {
@@ -3327,18 +2987,32 @@
             }
 
             if (prefix === 'inward') {
+                const cmpInput = document.getElementById('inward-company-name');
+                if (cmpInput) {
+                    cmpInput.removeAttribute('data-vendor-id');
+                    cmpInput.value = '';
+                }
                 const badge = document.getElementById('inward-stock-badge');
                 if (badge) badge.classList.add('d-none');
-                const cmp = document.getElementById('inward-company-name');
-                if (cmp) cmp.value = '';
+                const dcNoInput = document.getElementById('inward-dc-no');
+                if (dcNoInput) dcNoInput.value = '';
+                const dcDateInput = document.getElementById('inward-dc-date');
+                if (dcDateInput) dcDateInput.value = '';
             }
 
             // Reset outward descriptions
             if (prefix === 'outward') {
-                document.getElementById('outward-dept-disp').value = '';
-                document.getElementById('outward-printer-disp').value = '';
-                document.getElementById('outward-toner-disp').value = '';
-                document.getElementById('outward-qty-req-disp').value = '';
+                const deptDisp = document.getElementById('outward-dept-disp');
+                if (deptDisp) deptDisp.value = '';
+                const outDate = document.getElementById('outward-date');
+                if (outDate) outDate.value = '';
+                const reqSel = document.getElementById('outward-request-select');
+                if (reqSel) reqSel.value = '';
+                const tbody = document.getElementById('outward-items-tbody');
+                if (tbody) {
+                    tbody.innerHTML = '<tr><td colspan="7" class="text-center text-muted py-4">Please select an Active Request to view requested toner models.</td></tr>';
+                }
+                clearOutwardPhoto();
                 disableUploadArea();
             }
         }
@@ -3365,6 +3039,9 @@
         // ================= DASHBOARD VIEW LOGIC =================
         let dashboardChartInstance = null;
         let dashboardGroupsCached = [];
+        let dashboardWorkorderGroupsCached = {};
+        let dashboardInwardGroupsCached = {};
+        let dashboardStockGroupsCached = {};
         let dashboardBreakdownCurrentPage = 1;
         let dashboardBreakdownPageSize = 20;
         let activeDashboardDetailsType = '';
@@ -3915,10 +3592,217 @@
                 return true;
             });
 
-            // Populate filters
-            populateDashboardDetailsCategoryFilter(filtered);
-            populateDashboardDetailsDeptFilter(filtered);
-            updateDashboardDetailsStockFilterVisibility();
+            if (activeDashboardDetailsType === 'workorder_registered') {
+                const groups = {};
+                filtered.forEach(item => {
+                    const cleanFile = (item.file_number || '').trim();
+                    const cleanRef = (item.ref_no || '').trim();
+                    const key = cleanFile || cleanRef || ('wo_' + (item.id || Math.random()));
+
+                    if (!groups[key]) {
+                        groups[key] = {
+                            key: key,
+                            file_number: cleanFile,
+                            ref_no: cleanRef,
+                            vendor_name: item.vendor_name || '-',
+                            vendor_id: item.vendor_id,
+                            total_qty_registered: 0,
+                            workorder_start_date: item.workorder_start_date || '',
+                            workorder_end_date: item.workorder_end_date || '',
+                            cdate: item.cdate,
+                            dc_uploads: [],
+                            printer_names: [],
+                            model_names: [],
+                            items: []
+                        };
+                    }
+
+                    groups[key].total_qty_registered += (parseInt(item.total_qty_registered || item.qty_registered || 0) || 0);
+                    groups[key].items.push(item);
+
+                    if (item.printer_name && !groups[key].printer_names.includes(item.printer_name)) {
+                        groups[key].printer_names.push(item.printer_name);
+                    }
+                    if (item.model_name && !groups[key].model_names.includes(item.model_name)) {
+                        groups[key].model_names.push(item.model_name);
+                    }
+                    if (item.workorder_start_date && !groups[key].workorder_start_date) {
+                        groups[key].workorder_start_date = item.workorder_start_date;
+                    }
+                    if (item.workorder_end_date && !groups[key].workorder_end_date) {
+                        groups[key].workorder_end_date = item.workorder_end_date;
+                    }
+                    if (item.dc_uploads && Array.isArray(item.dc_uploads)) {
+                        item.dc_uploads.forEach(f => {
+                            if (f && !groups[key].dc_uploads.includes(f)) groups[key].dc_uploads.push(f);
+                        });
+                    } else if (item.dc_upload && !groups[key].dc_uploads.includes(item.dc_upload)) {
+                        groups[key].dc_uploads.push(item.dc_upload);
+                    }
+                });
+
+                dashboardWorkorderGroupsCached = groups;
+                filtered = Object.values(groups);
+            } else if (activeDashboardDetailsType === 'inward_register') {
+                const groups = {};
+                filtered.forEach(item => {
+                    const cleanFile = (item.file_number || '').trim();
+                    const cleanRef = (item.ref_no || '').trim();
+                    const cleanDcNo = (item.dc_no || '').trim();
+                    const cleanDcUpload = (item.dc_upload || item.dc_uploads || '').toString().trim();
+                    const cdateKey = item.cdate ? String(item.cdate).substring(0, 19) : '';
+
+                    const key = `${cleanRef || 'general'}_${cleanDcNo || 'nodc'}_${cleanDcUpload || ('item_' + (item.id || Math.random()))}_${cdateKey}`;
+
+                    if (!groups[key]) {
+                        groups[key] = {
+                            key: key,
+                            file_number: cleanFile,
+                            ref_no: cleanRef,
+                            company_name: item.company_name,
+                            vendor_name: item.vendor_name || vendorsMap[item.company_name] || item.company_name || '',
+                            dc_no: cleanDcNo || '-',
+                            dc_nos: cleanDcNo ? [cleanDcNo] : [],
+                            qty_registered: 0,
+                            cdate: item.cdate,
+                            dc_date: item.dc_date || '',
+                            order_by: item.order_by || item.updated_by || '',
+                            dc_uploads: [],
+                            printer_names: [],
+                            model_names: [],
+                            items: []
+                        };
+                    }
+
+                    if (cleanFile && !groups[key].file_number) {
+                        groups[key].file_number = cleanFile;
+                    }
+
+                    const qty = parseInt(item.qty_registered || item.inward_qty || 0) || 0;
+                    groups[key].qty_registered += qty;
+                    groups[key].items.push(item);
+
+                    if (cleanDcNo && !groups[key].dc_nos.includes(cleanDcNo)) {
+                        groups[key].dc_nos.push(cleanDcNo);
+                    }
+                    if (item.printer_name && !groups[key].printer_names.includes(item.printer_name)) {
+                        groups[key].printer_names.push(item.printer_name);
+                    }
+                    if (item.model_name && !groups[key].model_names.includes(item.model_name)) {
+                        groups[key].model_names.push(item.model_name);
+                    }
+                    if (item.dc_date && !groups[key].dc_date) {
+                        groups[key].dc_date = item.dc_date;
+                    }
+                    if (item.cdate && (!groups[key].cdate || new Date(item.cdate) > new Date(groups[key].cdate))) {
+                        groups[key].cdate = item.cdate;
+                    }
+                    if (item.order_by && !groups[key].order_by) {
+                        groups[key].order_by = item.order_by;
+                    }
+                    const rawDc = item.dc_upload || item.dc_uploads;
+                    if (rawDc) {
+                        const files = Array.isArray(rawDc) ? rawDc : String(rawDc).split(',').map(s => s.trim()).filter(Boolean);
+                        files.forEach(f => {
+                            if (f && !groups[key].dc_uploads.includes(f)) groups[key].dc_uploads.push(f);
+                        });
+                    }
+                });
+
+                dashboardInwardGroupsCached = groups;
+                filtered = Object.values(groups);
+            } else if (activeDashboardDetailsType === 'user_requested') {
+                const groups = {};
+                filtered.forEach(item => {
+                    const cleanRef = (item.itcell_ref_no || '').trim();
+                    const key = cleanRef || ('req_' + (item.req_no || item.id));
+
+                    if (!groups[key]) {
+                        groups[key] = {
+                            key: key,
+                            itcell_ref_no: cleanRef,
+                            req_no: item.req_no || '',
+                            dept_name: item.dept_name || '-',
+                            dept_id: item.dept_id,
+                            zone_name: item.zone_name || '-',
+                            zone_id: item.zone_id,
+                            qty_requested: 0,
+                            qty_delivered: 0,
+                            request_date: item.request_date || '',
+                            cdate: item.cdate,
+                            user_request_uploads: [],
+                            req_nos: [],
+                            printer_names: [],
+                            model_names: [],
+                            items: []
+                        };
+                    }
+
+                    groups[key].qty_requested += parseInt(item.qty_requested || 0);
+                    groups[key].qty_delivered += parseInt(item.qty_delivered || 0);
+                    groups[key].items.push(item);
+
+                    if (item.req_no && !groups[key].req_nos.includes(item.req_no)) {
+                        groups[key].req_nos.push(item.req_no);
+                    }
+                    if (item.printer_name && !groups[key].printer_names.includes(item.printer_name)) {
+                        groups[key].printer_names.push(item.printer_name);
+                    }
+                    if (item.model_name && !groups[key].model_names.includes(item.model_name)) {
+                        groups[key].model_names.push(item.model_name);
+                    }
+                    if (item.request_date && !groups[key].request_date) {
+                        groups[key].request_date = item.request_date;
+                    }
+                    if (item.cdate && (!groups[key].cdate || new Date(item.cdate) > new Date(groups[key].cdate))) {
+                        groups[key].cdate = item.cdate;
+                    }
+                    if (item.user_request_upload) {
+                        const files = item.user_request_upload.split(',').map(f => (f || '').trim()).filter(Boolean);
+                        files.forEach(f => {
+                            if (!groups[key].user_request_uploads.includes(f)) {
+                                groups[key].user_request_uploads.push(f);
+                            }
+                        });
+                    }
+                });
+
+                filtered = Object.values(groups);
+            } else if (activeDashboardDetailsType === 'available_stock') {
+                const groups = {};
+                filtered.forEach(item => {
+                    const key = (item.printer_name || ('printer_' + (item.pid || Math.random()))).trim();
+                    if (!groups[key]) {
+                        groups[key] = {
+                            key: key,
+                            pid: item.pid,
+                            printer_name: item.printer_name || 'Unknown Printer',
+                            inward_qty: 0,
+                            outward_qty: 0,
+                            available_qty: 0,
+                            printer_names: [item.printer_name].filter(Boolean),
+                            model_names: [],
+                            items: []
+                        };
+                    }
+                    groups[key].inward_qty += (parseInt(item.inward_qty || 0) || 0);
+                    groups[key].outward_qty += (parseInt(item.outward_qty || 0) || 0);
+                    groups[key].available_qty = Math.max(0, groups[key].inward_qty - groups[key].outward_qty);
+                    groups[key].items.push(item);
+
+                    if (item.model_name && !groups[key].model_names.includes(item.model_name)) {
+                        groups[key].model_names.push(item.model_name);
+                    }
+                });
+
+                dashboardStockGroupsCached = groups;
+                filtered = Object.values(groups);
+            }
+
+            // Populate filters
+            populateDashboardDetailsCategoryFilter(filtered);
+            populateDashboardDetailsDeptFilter(filtered);
+            updateDashboardDetailsStockFilterVisibility();
 
             // Save global dataset
             dashboardDetailsFilteredDataset = filtered;
@@ -3949,8 +3833,14 @@
 
             const printerNames = new Set();
             data.forEach(item => {
-                const name = item.printer_name;
-                if (name) printerNames.add(name);
+                if (item.printer_names && Array.isArray(item.printer_names)) {
+                    item.printer_names.forEach(name => {
+                        if (name) printerNames.add(name);
+                    });
+                } else {
+                    const name = item.printer_name;
+                    if (name) printerNames.add(name);
+                }
             });
 
             const sorted = Array.from(printerNames).sort();
@@ -4011,7 +3901,13 @@
 
             // Apply categorywise (Printer Make), department, stock status, and text search filters
             let filtered = dashboardDetailsFilteredDataset.filter(item => {
-                if (selectedCategory && item.printer_name !== selectedCategory) return false;
+                if (selectedCategory) {
+                    if (item.printer_names && Array.isArray(item.printer_names)) {
+                        if (!item.printer_names.includes(selectedCategory)) return false;
+                    } else if (item.printer_name !== selectedCategory) {
+                        return false;
+                    }
+                }
                 if (selectedDept && item.dept_name !== selectedDept) return false;
 
                 if (activeDashboardDetailsType === 'available_stock' && selectedStockStatus) {
@@ -4022,18 +3918,28 @@
                 }
 
                 if (searchQuery) {
+                    const vendorName = vendorsMap[item.company_name] || (!isNaN(item.company_name) ? '' : (item.company_name || ''));
+                    const printerNamesStr = (item.printer_names || []).join(' ');
+                    const modelNamesStr = (item.model_names || []).join(' ');
+                    const dcNosStr = (item.dc_nos || []).join(' ');
                     const fieldsToSearch = [
                         item.ref_no,
                         item.file_number,
                         item.vendor_name,
+                        vendorName,
                         item.printer_name,
                         item.model_name,
                         item.part_code,
                         item.dept_name,
                         item.req_no,
                         item.company_name,
+                        item.dc_no,
+                        item.order_by,
                         item.updated_by,
-                        item.itcell_ref_no
+                        item.itcell_ref_no,
+                        printerNamesStr,
+                        modelNamesStr,
+                        dcNosStr
                     ];
                     const match = fieldsToSearch.some(field =>
                         field && String(field).toLowerCase().includes(searchQuery)
@@ -4064,10 +3970,10 @@
 
             if (data.length === 0) {
                 let cols = 6;
-                if (activeDashboardDetailsType === 'workorder_registered') cols = 10;
+                if (activeDashboardDetailsType === 'workorder_registered') cols = 8;
                 else if (activeDashboardDetailsType === 'workorder_requested') cols = 7;
-                else if (activeDashboardDetailsType === 'inward_register') cols = 8;
-                else if (activeDashboardDetailsType === 'user_requested') cols = 11;
+                else if (activeDashboardDetailsType === 'inward_register') cols = 10;
+                else if (activeDashboardDetailsType === 'user_requested') cols = 10;
                 else if (activeDashboardDetailsType === 'outward_register') cols = 10;
 
                 tbody.innerHTML = `<tr><td colspan="${cols}" class="text-center text-muted py-4">No matching records found for the selected filters.</td></tr>`;
@@ -4080,12 +3986,10 @@
             if (activeDashboardDetailsType === 'workorder_registered') {
                 thead.innerHTML = `
                     <tr>
-                        <th>S.No</th>
-                        <th>Ref No.</th>
+                        <th style="width: 60px;">S.No</th>
                         <th>File No.</th>
+                        <th>Workorder Ref</th>
                         <th>Vendor</th>
-                        <th>Printer Model</th>
-                        <th>Toner Model</th>
                         <th class="text-center">Registered Qty</th>
                         <th>Start Date</th>
                         <th>End Date</th>
@@ -4095,18 +3999,34 @@
                 pagedData.forEach((item, idx) => {
                     const tr = document.createElement('tr');
                     const globalIdx = (dashboardDetailsCurrentPage - 1) * dashboardDetailsPageSize + idx + 1;
-                    const pdfBtn = item.dc_upload
-                        ? `<a href="${resolveUploadUrl(item.dc_upload)}" target="_blank" class="btn-action btn-view-doc"><i class="fa-solid fa-file-pdf"></i> View</a>`
-                        : `<span class="text-muted"><i class="fa-solid fa-ban"></i> N/A</span>`;
+
+                    let pdfBtn = `<span class="text-muted"><i class="fa-solid fa-ban"></i> N/A</span>`;
+                    if (item.dc_uploads && item.dc_uploads.length > 0) {
+                        pdfBtn = item.dc_uploads.map((file, i) => {
+                            const label = item.dc_uploads.length > 1 ? `View ${i + 1}` : `View`;
+                            return `<a href="${resolveUploadUrl(file)}" target="_blank" class="btn-action btn-view-doc m-1" style="font-size: 11px; padding: 4px 8px; white-space: nowrap;"><i class="fa-solid fa-file-pdf"></i> ${label}</a>`;
+                        }).join(' ');
+                    } else if (item.dc_upload) {
+                        pdfBtn = `<a href="${resolveUploadUrl(item.dc_upload)}" target="_blank" class="btn-action btn-view-doc"><i class="fa-solid fa-file-pdf"></i> View</a>`;
+                    }
+
+                    const groupKeyParam = encodeURIComponent(item.key || item.file_number || item.ref_no || '');
+                    const modelsCountBadge = item.items && item.items.length > 1
+                        ? `<br><span class="badge bg-light text-secondary border mt-1" style="cursor: pointer;" onclick="showWorkorderHistoryBreakdownModal('${encodeURIComponent(item.ref_no || '')}', '${encodeURIComponent(item.file_number || '')}', '${groupKeyParam}');" title="Click to view ${item.items.length} toners"><i class="fa-solid fa-layer-group me-1"></i>${item.items.length} Toners</span>`
+                        : (item.items && item.items.length === 1 ? `<br><small class="text-muted font-monospace">${escapeHtml(item.items[0].model_name || '')}</small>` : '');
+
+                    const fileNoLink = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-primary font-monospace" style="border-bottom: 1px dashed #0f5c78; cursor: pointer; font-size: 0.95rem;" onclick="showWorkorderHistoryBreakdownModal('${encodeURIComponent(item.ref_no || '')}', '${encodeURIComponent(item.file_number || '')}', '${groupKeyParam}'); return false;" title="Click to view workorder toners breakdown">${escapeHtml(item.file_number || item.ref_no || '-')}</a>`;
+
+                    const refLink = item.ref_no
+                        ? `<a href="#" class="fw-semibold text-decoration-none text-dark font-monospace" style="cursor: pointer;" onclick="showWorkorderHistoryBreakdownModal('${encodeURIComponent(item.ref_no || '')}', '${encodeURIComponent(item.file_number || '')}', '${groupKeyParam}'); return false;">${escapeHtml(item.ref_no)}</a>`
+                        : '-';
 
                     tr.innerHTML = `
                         <td class="fw-semibold text-secondary">${globalIdx}</td>
-                        <td class="fw-bold text-dark">${escapeHtml(item.ref_no || '')}</td>
-                        <td>${escapeHtml(item.file_number || '')}</td>
+                        <td>${fileNoLink}${modelsCountBadge}</td>
+                        <td>${refLink}</td>
                         <td>${escapeHtml(item.vendor_name || '')}</td>
-                        <td>${escapeHtml(item.printer_name || 'N/A')}</td>
-                        <td><span class="badge-toner-model">${escapeHtml(item.model_name || 'N/A')}</span></td>
-                        <td class="text-center font-monospace fw-bold">${item.total_qty_registered || '0'}</td>
+                        <td class="text-center font-monospace fw-bold text-dark">${item.total_qty_registered || '0'}</td>
                         <td><small class="text-dark fw-semibold">${item.workorder_start_date || 'N/A'}</small></td>
                         <td><small class="text-dark fw-semibold">${item.workorder_end_date || 'N/A'}</small></td>
                         <td class="text-center">${pdfBtn}</td>
@@ -4150,11 +4070,13 @@
             } else if (activeDashboardDetailsType === 'inward_register') {
                 thead.innerHTML = `
                     <tr>
-                        <th>S.No</th>
+                        <th style="width: 60px;">S.No</th>
+                        <th>File No.</th>
+                        <th>Workorder Ref</th>
                         <th>Company Name</th>
-                        <th>Printer Model</th>
-                        <th>Toner Model</th>
+                        <th>DC Number</th>
                         <th class="text-center">Qty Inward</th>
+                        <th>DC Date</th>
                         <th>Created Date</th>
                         <th>Entered By</th>
                         <th class="text-center">DC Document</th>
@@ -4164,19 +4086,42 @@
                     const tr = document.createElement('tr');
                     const globalIdx = (dashboardDetailsCurrentPage - 1) * dashboardDetailsPageSize + idx + 1;
                     const createdDate = formatTimestamp(item.cdate);
+                    const dcDateFormatted = (item.dc_date && String(item.dc_date).trim() !== '' && String(item.dc_date).trim() !== 'null') ? formatDateOnly(item.dc_date) : '-';
+
                     let docBtn = '-';
-                    if (item.dc_upload) {
+                    if (item.dc_uploads && item.dc_uploads.length > 0) {
+                        docBtn = item.dc_uploads.map((file, i) => {
+                            const label = item.dc_uploads.length > 1 ? `View DC ${i + 1}` : `View DC`;
+                            return `<a href="${resolveUploadUrl(file)}" target="_blank" class="btn-action btn-view-doc m-1" style="font-size: 11px; padding: 4px 8px; white-space: nowrap;"><i class="fa-solid fa-file-pdf"></i> ${label}</a>`;
+                        }).join(' ');
+                    } else if (item.dc_upload) {
                         docBtn = `<a href="${resolveUploadUrl(item.dc_upload)}" target="_blank" class="btn-action btn-view-doc"><i class="fa-solid fa-file-pdf"></i> View DC</a>`;
                     }
 
                     const vendorName = vendorsMap[item.company_name] || (!isNaN(item.company_name) ? 'Unknown Vendor (' + item.company_name + ')' : (item.company_name || ''));
-                    tr.innerHTML = `
+                    const groupKeyParam = encodeURIComponent(item.key || item.file_number || item.ref_no || '');
+
+                    const modelsCountBadge = item.items && item.items.length > 1
+                        ? `<br><span class="badge bg-light text-secondary border mt-1" style="cursor: pointer;" onclick="showInwardHistoryBreakdownModal('${encodeURIComponent(item.file_number || '')}', '${encodeURIComponent(item.ref_no || '')}', '${groupKeyParam}');" title="Click to view ${item.items.length} toners in this DC"><i class="fa-solid fa-layer-group me-1"></i>${item.items.length} Toners</span>`
+                        : (item.items && item.items.length === 1 ? `<br><small class="text-muted font-monospace">${escapeHtml(item.items[0].model_name || '')}</small>` : '');
+
+                    const fileNoLink = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-primary font-monospace" style="border-bottom: 1px dashed #0f5c78; cursor: pointer; font-size: 0.95rem;" onclick="showInwardHistoryBreakdownModal('${encodeURIComponent(item.file_number || '')}', '${encodeURIComponent(item.ref_no || '')}', '${groupKeyParam}'); return false;" title="Click to view DC toners breakdown">${escapeHtml(item.file_number || item.ref_no || '-')}</a>`;
+
+                    const refLink = item.ref_no
+                        ? `<a href="#" class="fw-semibold text-decoration-none text-dark font-monospace" style="cursor: pointer;" onclick="showInwardHistoryBreakdownModal('${encodeURIComponent(item.file_number || '')}', '${encodeURIComponent(item.ref_no || '')}', '${groupKeyParam}'); return false;" title="Click to view DC toners breakdown">${escapeHtml(item.ref_no)}</a>`
+                        : '-';
+
+                    const dcNoDisplay = item.dc_nos && item.dc_nos.length > 0 ? item.dc_nos.join(', ') : (item.dc_no || '-');
+
+                    tr.innerHTML = ` 
                         <td class="fw-semibold text-secondary">${globalIdx}</td>
+                        <td>${fileNoLink}${modelsCountBadge}</td> 
+                        <td>${refLink}</td>
                         <td class="fw-bold text-dark">${escapeHtml(vendorName)}</td>
-                        <td>${escapeHtml(item.printer_name || '-')}</td>
-                        <td><span class="badge-toner-model">${escapeHtml(item.model_name || '-')}</span></td>
+                        <td class="font-monospace">${escapeHtml(dcNoDisplay)}</td>
                         <td class="text-center text-primary fw-bold font-monospace">${item.qty_registered}</td>
-                        <td><small class="text-dark fw-semibold">${createdDate}</small></td>
+                        <td><small class="text-dark fw-semibold">${dcDateFormatted}</small></td>
+                        <td><small class="text-muted fw-semibold">${createdDate}</small></td>
                         <td><small class="text-muted">${escapeHtml(item.order_by || '-')}</small></td>
                         <td class="text-center">${docBtn}</td>
                     `;
@@ -4186,14 +4131,13 @@
             } else if (activeDashboardDetailsType === 'user_requested') {
                 thead.innerHTML = `
                     <tr>
-                        <th>S.No</th>
-                        <th>Req. No</th>
+                        <th style="width: 60px;">S.No</th>
                         <th>IT Cell Ref No</th>
                         <th>Department</th>
-                        <th>Printer Model</th>
-                        <th>Toner Model</th>
+                        <th>Zone</th>
                         <th class="text-center">Qty Req</th>
                         <th class="text-center">Qty Delivered</th>
+                        <th>Requested Date</th>
                         <th>Created Date</th>
                         <th class="text-center">Status</th>
                         <th class="text-center">Request Doc</th>
@@ -4203,6 +4147,9 @@
                     const tr = document.createElement('tr');
                     const globalIdx = (dashboardDetailsCurrentPage - 1) * dashboardDetailsPageSize + idx + 1;
                     const createdDate = formatTimestamp(item.cdate);
+                    const reqDateFormatted = (item.request_date && String(item.request_date).trim() !== '' && String(item.request_date).trim() !== 'null')
+                        ? formatDateOnly(item.request_date)
+                        : '-';
                     const reqQty = parseInt(item.qty_requested || 0);
                     const delQty = parseInt(item.qty_delivered || 0);
 
@@ -4214,20 +4161,30 @@
                     }
 
                     let docBtn = '-';
-                    if (item.user_request_upload) {
-                        docBtn = `<a href="${resolveUploadUrl(item.user_request_upload)}" target="_blank" class="btn-action btn-view-doc"><i class="fa-solid fa-file-pdf"></i> View Letter</a>`;
+                    if (item.user_request_uploads && item.user_request_uploads.length > 0) {
+                        const validFiles = [...new Set(item.user_request_uploads.map(f => (f || '').trim()).filter(Boolean))];
+                        if (validFiles.length > 0) {
+                            docBtn = `<a href="${resolveUploadUrl(validFiles[0])}" target="_blank" class="btn-action btn-view-doc" style="font-size: 11px; padding: 4px 10px; white-space: nowrap;"><i class="fa-solid fa-file-pdf"></i> View Letter</a>`;
+                        }
+                    } else if (item.user_request_upload) {
+                        docBtn = `<a href="${resolveUploadUrl(item.user_request_upload)}" target="_blank" class="btn-action btn-view-doc" style="font-size: 11px; padding: 4px 10px; white-space: nowrap;"><i class="fa-solid fa-file-pdf"></i> View Letter</a>`;
                     }
 
+                    const modelsCountBadge = item.items && item.items.length > 1
+                        ? `<br><span class="badge bg-light text-secondary border mt-1" style="cursor: pointer;" onclick="showUserRequestBreakdownModal('${encodeURIComponent(item.itcell_ref_no || item.req_no || '')}');" title="Click to view ${item.items.length} toners"><i class="fa-solid fa-layer-group me-1"></i>${item.items.length} Toners</span>`
+                        : (item.items && item.items.length === 1 ? `<br><small class="text-muted font-monospace">${escapeHtml(item.items[0].model_name || '')}</small>` : '');
+
+                    const refLink = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-primary font-monospace" style="border-bottom: 1px dashed #0f5c78; cursor: pointer; font-size: 0.95rem;" onclick="showUserRequestBreakdownModal('${encodeURIComponent(item.itcell_ref_no || item.req_no || '')}'); return false;" title="Click to view requested toner models">${escapeHtml(item.itcell_ref_no || item.req_no || '-')}</a>`;
+
                     tr.innerHTML = `
                         <td class="fw-semibold text-secondary">${globalIdx}</td>
-                        <td class="fw-bold text-dark">${escapeHtml(item.req_no)}</td>
-                        <td class="font-monospace fw-bold text-dark">${escapeHtml(item.itcell_ref_no || '-')}</td>
-                        <td>${escapeHtml(item.dept_name)}</td>
-                        <td>${escapeHtml(item.printer_name || '-')}</td>
-                        <td><span class="badge-toner-model">${escapeHtml(item.model_name || '-')}</span></td>
-                        <td class="text-center font-monospace fw-bold">${item.qty_requested}</td>
+                        <td>${refLink}${modelsCountBadge}</td>
+                        <td>${escapeHtml(item.dept_name || '-')}</td>
+                        <td>${escapeHtml(item.zone_name || '-')}</td>
+                        <td class="text-center font-monospace fw-bold text-dark">${item.qty_requested}</td>
                         <td class="text-center text-success fw-bold font-monospace">${item.qty_delivered || 0}</td>
-                        <td><small class="text-dark fw-semibold">${createdDate}</small></td>
+                        <td><small class="text-dark fw-semibold">${reqDateFormatted}</small></td>
+                        <td><small class="text-muted fw-semibold">${createdDate}</small></td>
                         <td class="text-center">${statusBadge}</td>
                         <td class="text-center">${docBtn}</td>
                     `;
@@ -4274,7 +4231,7 @@
                             return `<a href="${contextPath + url}" target="_blank" class="btn-action btn-view-photo me-1 mb-1" style="display: inline-flex; align-items: center; gap: 4px;"><i class="fa-solid fa-image"></i> ${label}</a>`;
                         }).join(' ');
                     }
-                    const pdfBtn = `<button type="button" class="btn-action btn-pdf" onclick='downloadPdfAcknowledgement(${JSON.stringify(item)})'><i class="fa-solid fa-file-arrow-down"></i> PDF Ack</button>`;
+                    const pdfBtn = `<button type="button" class="btn-action btn-pdf" onclick="downloadOutwardItemPdfAck(${item.id})"><i class="fa-solid fa-file-arrow-down"></i> PDF Ack</button>`;
 
                     tr.innerHTML = `
                         <td class="fw-semibold text-secondary">${globalIdx}</td>
@@ -4294,12 +4251,12 @@
             } else if (activeDashboardDetailsType === 'available_stock') {
                 thead.innerHTML = `
                     <tr>
-                        <th>S.No</th>
+                        <th style="width: 60px;">S.No</th>
                         <th>Printer Model</th>
-                        <th>Toner Model</th>
                         <th class="text-center">Total Inward</th>
                         <th class="text-center">Total Outward</th>
                         <th class="text-center">Available Stock</th>
+                        <th class="text-center">Stock Status</th>
                     </tr>`;
 
                 pagedData.forEach((item, idx) => {
@@ -4307,19 +4264,29 @@
                     const globalIdx = (dashboardDetailsCurrentPage - 1) * dashboardDetailsPageSize + idx + 1;
                     const available = parseInt(item.available_qty || 0);
                     let availableBadge = `<span class="badge bg-success font-monospace fw-bold">${available}</span>`;
+                    let statusBadge = `<span class="badge bg-success"><i class="fa-solid fa-circle-check me-1"></i>In Stock</span>`;
                     if (available === 0) {
-                        availableBadge = `<span class="badge bg-danger font-monospace fw-bold">Out of stock</span>`;
+                        availableBadge = `<span class="badge bg-danger font-monospace fw-bold">0</span>`;
+                        statusBadge = `<span class="badge bg-danger"><i class="fa-solid fa-circle-xmark me-1"></i>Out of stock</span>`;
                     } else if (available <= 5) {
-                        availableBadge = `<span class="badge bg-warning text-dark font-monospace fw-bold">${available} (Low)</span>`;
+                        availableBadge = `<span class="badge bg-warning text-dark font-monospace fw-bold">${available}</span>`;
+                        statusBadge = `<span class="badge bg-warning text-dark"><i class="fa-solid fa-triangle-exclamation me-1"></i>Low Stock</span>`;
                     }
 
+                    const groupKeyParam = encodeURIComponent(item.key || item.printer_name || '');
+                    const modelsCountBadge = item.items && item.items.length > 1
+                        ? `<br><span class="badge bg-light text-secondary border mt-1" style="cursor: pointer;" onclick="showPrinterStockBreakdownModal('${encodeURIComponent(item.printer_name || '')}', '${groupKeyParam}');" title="Click to view ${item.items.length} toners"><i class="fa-solid fa-layer-group me-1"></i>${item.items.length} Toners</span>`
+                        : (item.items && item.items.length === 1 ? `<br><small class="text-muted font-monospace">${escapeHtml(item.items[0].model_name || '')}</small>` : '');
+
+                    const printerLink = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-primary font-monospace" style="border-bottom: 1px dashed #0f5c78; cursor: pointer; font-size: 0.95rem;" onclick="showPrinterStockBreakdownModal('${encodeURIComponent(item.printer_name || '')}', '${groupKeyParam}'); return false;" title="Click to view printer toners stock breakdown">${escapeHtml(item.printer_name || 'N/A')}</a>`;
+
                     tr.innerHTML = `
                         <td class="fw-semibold text-secondary">${globalIdx}</td>
-                        <td class="fw-semibold text-dark">${escapeHtml(item.printer_name)}</td>
-                        <td><span class="badge-toner-model">${escapeHtml(item.model_name)}</span></td>
-                        <td class="text-center text-primary fw-bold">${item.inward_qty || 0}</td>
-                        <td class="text-center text-success fw-bold">${item.outward_qty || 0}</td>
+                        <td>${printerLink}${modelsCountBadge}</td>
+                        <td class="text-center text-primary fw-bold font-monospace">${item.inward_qty || 0}</td>
+                        <td class="text-center text-success fw-bold font-monospace">${item.outward_qty || 0}</td>
                         <td class="text-center">${availableBadge}</td>
+                        <td class="text-center">${statusBadge}</td>
                     `;
                     tbody.appendChild(tr);
                 });
@@ -4499,31 +4466,31 @@
                 let woRefDisplay = '<span class="text-muted">-</span>';
                 if (item.workOrderRef && item.workOrderRef !== '-') {
                     if (!showItcellRef) {
-                        woRefDisplay = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-primary font-monospace" style="border-bottom: 1px dashed #3b82f6;" onclick="showDashboardTonerBreakdownWithTabAndKey('${escapeHtml(item.key)}', 'summary'); return false;">${escapeHtml(item.workOrderRef)}</a>`;
+                        woRefDisplay = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-primary font-monospace" style="border-bottom: 1px dashed #3b82f6;" onclick="showDashboardTonerBreakdownWithTabAndKey('${encodeURIComponent(item.key)}', 'summary'); return false;">${escapeHtml(item.workOrderRef)}</a>`;
                     } else {
                         woRefDisplay = `<span class="font-monospace fw-semibold text-dark">${escapeHtml(item.workOrderRef)}</span>`;
                     }
                 } else if (!showItcellRef && item.itcellRefNo) {
-                    woRefDisplay = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-primary font-monospace" style="border-bottom: 1px dashed #3b82f6;" onclick="showDashboardTonerBreakdownWithTabAndKey('${escapeHtml(item.key)}', 'summary'); return false;">${escapeHtml(item.itcellRefNo)}</a>`;
+                    woRefDisplay = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-primary font-monospace" style="border-bottom: 1px dashed #3b82f6;" onclick="showDashboardTonerBreakdownWithTabAndKey('${encodeURIComponent(item.key)}', 'summary'); return false;">${escapeHtml(item.itcellRefNo)}</a>`;
                 }
 
                 // Render ITCell Ref No as a clickable link/action
-                const itcellRefLink = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-primary" style="border-bottom: 1px dashed #3b82f6;" onclick="showDashboardTonerBreakdownWithTabAndKey('${escapeHtml(item.key)}', 'summary'); return false;">${escapeHtml(item.itcellRefNo)}</a>`;
+                const itcellRefLink = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-primary" style="border-bottom: 1px dashed #3b82f6;" onclick="showDashboardTonerBreakdownWithTabAndKey('${encodeURIComponent(item.key)}', 'summary'); return false;">${escapeHtml(item.itcellRefNo)}</a>`;
 
                 const woBtn = item.workorderQty > 0
-                    ? `<a href="#" class="fw-bold text-decoration-none text-dark" style="border-bottom: 1px dashed #64748b;" onclick="showDashboardTonerBreakdownWithTabAndKey('${escapeHtml(item.key)}', 'workorder'); return false;">${item.workorderQty}</a>`
+                    ? `<a href="#" class="fw-bold text-decoration-none text-dark" style="border-bottom: 1px dashed #64748b;" onclick="showDashboardTonerBreakdownWithTabAndKey('${encodeURIComponent(item.key)}', 'workorder'); return false;">${item.workorderQty}</a>`
                     : `<span class="text-muted">0</span>`;
 
                 const inwardBtn = item.inwardQty > 0
-                    ? `<a href="#" class="fw-bold text-decoration-none text-primary" style="border-bottom: 1px dashed #3b82f6;" onclick="showDashboardTonerBreakdownWithTabAndKey('${escapeHtml(item.key)}', 'inward'); return false;">${item.inwardQty}</a>`
+                    ? `<a href="#" class="fw-bold text-decoration-none text-primary" style="border-bottom: 1px dashed #3b82f6;" onclick="showDashboardTonerBreakdownWithTabAndKey('${encodeURIComponent(item.key)}', 'inward'); return false;">${item.inwardQty}</a>`
                     : `<span class="text-muted">0</span>`;
 
                 const userReqBtn = item.requestedQty > 0
-                    ? `<a href="#" class="fw-bold text-decoration-none text-secondary" style="border-bottom: 1px dashed #64748b;" onclick="showDashboardTonerBreakdownWithTabAndKey('${escapeHtml(item.key)}', 'userrequest'); return false;">${item.requestedQty}</a>`
+                    ? `<a href="#" class="fw-bold text-decoration-none text-secondary" style="border-bottom: 1px dashed #64748b;" onclick="showDashboardTonerBreakdownWithTabAndKey('${encodeURIComponent(item.key)}', 'userrequest'); return false;">${item.requestedQty}</a>`
                     : `<span class="text-muted">0</span>`;
 
                 const outwardBtn = item.outwardQty > 0
-                    ? `<a href="#" class="fw-bold text-decoration-none text-success" style="border-bottom: 1px dashed #10b981;" onclick="showDashboardTonerBreakdownWithTabAndKey('${escapeHtml(item.key)}', 'outward'); return false;">${item.outwardQty}</a>`
+                    ? `<a href="#" class="fw-bold text-decoration-none text-success" style="border-bottom: 1px dashed #10b981;" onclick="showDashboardTonerBreakdownWithTabAndKey('${encodeURIComponent(item.key)}', 'outward'); return false;">${item.outwardQty}</a>`
                     : `<span class="text-muted">0</span>`;
 
                 let cellsHtml = `
@@ -4566,39 +4533,84 @@
             showDashboardTonerBreakdownWithTabAndKey(refNo, tabName, tid);
         }
 
-        function showDashboardTonerBreakdownWithTabAndKey(groupKey, tabName, tid) {
-            let group = dashboardGroupsCached.find(g => g.key === groupKey);
+        function showDashboardTonerBreakdownWithTabAndKey(rawGroupKey, tabName, tid) {
+            const groupKey = decodeURIComponent(rawGroupKey || '').trim();
+            let group = (dashboardGroupsCached || []).find(g => g.key === groupKey);
+            if (!group) {
+                group = (dashboardGroupsCached || []).find(g =>
+                    (g.itcellRefNo && String(g.itcellRefNo).trim().toLowerCase() === groupKey.toLowerCase()) ||
+                    (g.workOrderRef && String(g.workOrderRef).trim().toLowerCase() === groupKey.toLowerCase()) ||
+                    (g.key && String(g.key).toLowerCase() === groupKey.toLowerCase())
+                );
+            }
+
             if (!group) {
-                group = dashboardGroupsCached.find(g => g.itcellRefNo === groupKey || g.workOrderRef === groupKey);
+                const cleanKey = groupKey.toLowerCase();
+                const matchingReq = (userRequestsCached || []).find(r =>
+                    String(r.itcell_ref_no || '').trim().toLowerCase() === cleanKey ||
+                    String(r.req_no || '').trim().toLowerCase() === cleanKey
+                );
+                const matchingWo = (workorderHistoryCached || []).find(w =>
+                    String(w.ref_no || '').trim().toLowerCase() === cleanKey ||
+                    String(w.file_number || '').trim().toLowerCase() === cleanKey
+                );
+                const matchingOut = (outwardHistoryCached || []).find(o =>
+                    String(o.itcell_ref_no || '').trim().toLowerCase() === cleanKey ||
+                    String(o.req_no || '').trim().toLowerCase() === cleanKey
+                );
+
+                const refFound = (matchingReq ? matchingReq.itcell_ref_no : null) ||
+                    (matchingOut ? matchingOut.itcell_ref_no : null) ||
+                    (matchingWo ? matchingWo.ref_no : null) ||
+                    groupKey;
+                const woFound = (matchingWo ? matchingWo.file_number : '-') || '-';
+                const printerFound = (matchingReq ? matchingReq.printer_name : null) ||
+                    (matchingOut ? matchingOut.printer_name : null) ||
+                    (matchingWo ? matchingWo.printer_name : 'All Printers') ||
+                    'All Printers';
+                const pidFound = (matchingReq ? matchingReq.pid : null) ||
+                    (matchingOut ? matchingOut.pid : null) ||
+                    (matchingWo ? matchingWo.pid : '') ||
+                    '';
+
+                group = {
+                    key: groupKey,
+                    itcellRefNo: refFound || 'General / Direct',
+                    workOrderRef: woFound || '-',
+                    printerName: printerFound || 'Unknown Printer',
+                    pid: pidFound,
+                    tonerSplits: {}
+                };
             }
-            if (!group) return;
 
             activeDbBreakdownKey = group.key;
-            activeDbBreakdownItcell = group.itcellRefNo;
-            activeDbBreakdownWo = group.workOrderRef;
-            activeDbBreakdownPrinterName = group.printerName;
-            activeDbBreakdownPid = group.pid;
+            activeDbBreakdownItcell = group.itcellRefNo || '';
+            activeDbBreakdownWo = group.workOrderRef || '-';
+            activeDbBreakdownPrinterName = group.printerName || '';
+            activeDbBreakdownPid = group.pid || '';
 
             const refEl = document.getElementById('db-breakdown-ref');
             if (refEl) {
                 if (group.workOrderRef && group.workOrderRef !== '-') {
-                    refEl.innerHTML = `<span class="text-primary font-monospace">${escapeHtml(group.itcellRefNo)}</span> <small class="text-muted d-block" style="font-size: 0.75rem;">(WO Ref: ${escapeHtml(group.workOrderRef)})</small>`;
+                    refEl.innerHTML = `<span class="text-primary font-monospace">${escapeHtml(group.itcellRefNo || '-')}</span> <small class="text-muted d-block" style="font-size: 0.75rem;">(WO Ref: ${escapeHtml(group.workOrderRef)})</small>`;
                 } else {
-                    refEl.innerHTML = `<span class="text-primary font-monospace">${escapeHtml(group.itcellRefNo)}</span>`;
+                    refEl.innerHTML = `<span class="text-primary font-monospace">${escapeHtml(group.itcellRefNo || '-')}</span>`;
                 }
             }
 
             const printerEl = document.getElementById('db-breakdown-printer');
             if (printerEl) {
-                printerEl.textContent = group.printerName;
+                printerEl.textContent = group.printerName || '-';
             }
 
             // Populate Toner Filter dropdown
             const selectEl = document.getElementById('db-breakdown-toner-filter');
             if (selectEl) {
                 selectEl.innerHTML = '<option value="">All Toner Models</option>';
+                const existingTids = new Set();
                 if (group.tonerSplits) {
                     Object.values(group.tonerSplits).forEach(split => {
+                        existingTids.add(String(split.tid));
                         const opt = document.createElement('option');
                         opt.value = split.tid;
                         opt.textContent = split.tonerModel;
@@ -4608,6 +4620,17 @@
                         selectEl.appendChild(opt);
                     });
                 }
+                // If tonerSplits was empty, add toners from printer / history
+                if (existingTids.size === 0 && tonersCached && tonersCached.length > 0) {
+                    const filteredToners = group.pid ? tonersCached.filter(t => String(t.pid) === String(group.pid)) : tonersCached;
+                    filteredToners.forEach(t => {
+                        const opt = document.createElement('option');
+                        opt.value = t.tid || t.id;
+                        opt.textContent = t.model_name || t.toner_model || 'Toner';
+                        if (String(t.tid || t.id) === String(tid)) opt.selected = true;
+                        selectEl.appendChild(opt);
+                    });
+                }
             }
 
             // Reset active tab class to selected tab
@@ -4628,8 +4651,11 @@
             currentDbBreakdownTab = tabName || 'summary';
             switchDbBreakdownTab(currentDbBreakdownTab);
 
-            const myModal = new bootstrap.Modal(document.getElementById('dashboardTonerBreakdownModal'));
-            myModal.show();
+            const modalEl = document.getElementById('dashboardTonerBreakdownModal');
+            if (modalEl) {
+                const myModal = bootstrap.Modal.getOrCreateInstance(modalEl);
+                myModal.show();
+            }
         }
 
         function onDbBreakdownTonerFilterChange() {
@@ -4647,6 +4673,9 @@
             const woRef = activeDbBreakdownWo;
             const printerName = activeDbBreakdownPrinterName;
             const pid = activeDbBreakdownPid;
+            const cleanRef = String(itcellRef || '').trim().toLowerCase();
+            const cleanWo = String(woRef || '').trim().toLowerCase();
+            const cleanPid = String(pid || '').trim();
             const selectedTid = document.getElementById('db-breakdown-toner-filter')?.value || '';
 
             if (tabName === 'summary') {
@@ -4662,9 +4691,63 @@
                     </tr>
                 `;
 
-                const group = dashboardGroupsCached.find(g => g.key === activeDbBreakdownKey) ||
-                    dashboardGroupsCached.find(g => g.itcellRefNo === itcellRef);
-                let splits = group ? Object.values(group.tonerSplits || {}) : [];
+                const group = (dashboardGroupsCached || []).find(g => g.key === activeDbBreakdownKey) ||
+                    (dashboardGroupsCached || []).find(g => String(g.itcellRefNo || '').trim().toLowerCase() === cleanRef) ||
+                    { tonerSplits: {} };
+                let splits = Object.values(group.tonerSplits || {});
+
+                // Fallback: Dynamically generate splits from cached data if splits is empty
+                if (splits.length === 0) {
+                    const dynSplits = {};
+                    const processItem = (item, type, qty) => {
+                        const tid = item.tid || 0;
+                        const modelName = item.model_name || item.toner_model || 'Toner Model';
+                        if (!dynSplits[tid]) {
+                            dynSplits[tid] = {
+                                tid: tid,
+                                tonerModel: modelName,
+                                workorderQty: 0,
+                                inwardQty: 0,
+                                requestedQty: 0,
+                                outwardQty: 0
+                            };
+                        }
+                        if (type === 'wo') dynSplits[tid].workorderQty += qty;
+                        if (type === 'inward') dynSplits[tid].inwardQty += qty;
+                        if (type === 'req') dynSplits[tid].requestedQty += qty;
+                        if (type === 'outward') dynSplits[tid].outwardQty += qty;
+                    };
+
+                    (workorderHistoryCached || []).forEach(item => {
+                        if (cleanPid && cleanPid !== '0' && String(item.pid) !== cleanPid) return;
+                        const itemRef = String(item.ref_no || '').trim().toLowerCase();
+                        const itemWo = String(item.file_number || '').trim().toLowerCase();
+                        if (itemRef === cleanRef || (cleanWo && cleanWo !== '-' && itemWo === cleanWo) || (!cleanRef && !cleanWo)) {
+                            processItem(item, 'wo', parseInt(item.total_qty_registered || 0) || 0);
+                        }
+                    });
+
+                    (inwardHistoryCached || []).forEach(item => {
+                        if (cleanPid && cleanPid !== '0' && String(item.pid) !== cleanPid) return;
+                        const itemRef = String(item.ref_no || '').trim().toLowerCase();
+                        const itemWo = String(item.file_number || '').trim().toLowerCase();
+                        if (itemRef === cleanRef || (cleanWo && cleanWo !== '-' && itemWo === cleanWo) || (!cleanRef && !cleanWo)) {
+                            processItem(item, 'inward', parseInt(item.qty_registered || 0) || 0);
+                        }
+                    });
+
+                    (userRequestsCached || []).forEach(item => {
+                        if (cleanPid && cleanPid !== '0' && String(item.pid) !== cleanPid) return;
+                        const itemRef = String(item.itcell_ref_no || item.req_no || '').trim().toLowerCase();
+                        if (itemRef === cleanRef || (cleanRef === 'general / direct' && !item.itcell_ref_no) || (!cleanRef && !cleanWo)) {
+                            processItem(item, 'req', parseInt(item.qty_requested || 0) || 0);
+                            processItem(item, 'outward', parseInt(item.qty_delivered || 0) || 0);
+                        }
+                    });
+
+                    splits = Object.values(dynSplits);
+                }
+
                 if (selectedTid) {
                     splits = splits.filter(s => String(s.tid) === String(selectedTid));
                 }
@@ -4724,14 +4807,20 @@
                     </tr>
                 `;
 
-                const filtered = workorderHistoryCached.filter(item => {
-                    if (String(item.pid) !== String(pid)) return false;
+                let filtered = (workorderHistoryCached || []).filter(item => {
+                    if (cleanPid && cleanPid !== '0' && String(item.pid) !== cleanPid) return false;
                     if (selectedTid && String(item.tid) !== String(selectedTid)) return false;
-                    const matchItcell = String(item.ref_no) === String(itcellRef);
-                    const matchWo = woRef && woRef !== '-' && String(item.file_number) === String(woRef);
-                    return matchItcell || matchWo;
+                    const itemRef = String(item.ref_no || '').trim().toLowerCase();
+                    const itemWo = String(item.file_number || '').trim().toLowerCase();
+                    const matchItcell = cleanRef && cleanRef !== '-' && cleanRef !== 'general / direct' && itemRef === cleanRef;
+                    const matchWo = cleanWo && cleanWo !== '-' && itemWo === cleanWo;
+                    return matchItcell || matchWo || (cleanRef === 'general / direct' && !item.ref_no);
                 });
 
+                if (filtered.length === 0 && cleanPid && cleanPid !== '0') {
+                    filtered = (workorderHistoryCached || []).filter(item => String(item.pid) === cleanPid && (!selectedTid || String(item.tid) === String(selectedTid)));
+                }
+
                 if (filtered.length === 0) {
                     tbody.innerHTML = '<tr><td colspan="9" class="text-center text-muted py-4">No matching workorder records found.</td></tr>';
                     return;
@@ -4772,14 +4861,20 @@
                     </tr>
                 `;
 
-                const filtered = inwardHistoryCached.filter(item => {
-                    if (String(item.pid) !== String(pid)) return false;
+                let filtered = (inwardHistoryCached || []).filter(item => {
+                    if (cleanPid && cleanPid !== '0' && String(item.pid) !== cleanPid) return false;
                     if (selectedTid && String(item.tid) !== String(selectedTid)) return false;
-                    const matchItcell = String(item.ref_no) === String(itcellRef);
-                    const matchWo = woRef && woRef !== '-' && String(item.file_number) === String(woRef);
-                    return matchItcell || matchWo;
+                    const itemRef = String(item.ref_no || '').trim().toLowerCase();
+                    const itemWo = String(item.file_number || '').trim().toLowerCase();
+                    const matchItcell = cleanRef && cleanRef !== '-' && cleanRef !== 'general / direct' && itemRef === cleanRef;
+                    const matchWo = cleanWo && cleanWo !== '-' && itemWo === cleanWo;
+                    return matchItcell || matchWo || (cleanRef === 'general / direct' && !item.ref_no);
                 });
 
+                if (filtered.length === 0 && cleanPid && cleanPid !== '0') {
+                    filtered = (inwardHistoryCached || []).filter(item => String(item.pid) === cleanPid && (!selectedTid || String(item.tid) === String(selectedTid)));
+                }
+
                 if (filtered.length === 0) {
                     tbody.innerHTML = '<tr><td colspan="9" class="text-center text-muted py-4">No matching inward records found.</td></tr>';
                     return;
@@ -4823,14 +4918,33 @@
                     </tr>
                 `;
 
-                const filtered = userRequestsCached.filter(item => {
-                    if (String(item.pid) !== String(pid)) return false;
+                const normRef = cleanRef.replace(/[\s\-_/]/g, '');
+                const normWo = cleanWo.replace(/[\s\-_/]/g, '');
+
+                let filtered = (userRequestsCached || []).filter(item => {
+                    if (cleanPid && cleanPid !== '0' && String(item.pid) !== cleanPid) return false;
                     if (selectedTid && String(item.tid) !== String(selectedTid)) return false;
-                    const matchItcell = String(item.itcell_ref_no) === String(itcellRef);
-                    const matchWo = woRef && woRef !== '-' && String(item.itcell_ref_no) === String(woRef);
-                    return matchItcell || matchWo;
+                    const itemRef = String(item.itcell_ref_no || '').trim().toLowerCase();
+                    const itemReq = String(item.req_no || '').trim().toLowerCase();
+                    const normItemRef = itemRef.replace(/[\s\-_/]/g, '');
+                    const normItemReq = itemReq.replace(/[\s\-_/]/g, '');
+
+                    const matchItcell = cleanRef && cleanRef !== '-' && (
+                        itemRef === cleanRef ||
+                        itemReq === cleanRef ||
+                        (normRef && (normItemRef === normRef || normItemReq === normRef || (normRef.length >= 3 && (normItemRef.includes(normRef) || normRef.includes(normItemRef)))))
+                    );
+                    const matchWo = cleanWo && cleanWo !== '-' && (
+                        itemRef === cleanWo ||
+                        (normWo && normItemRef === normWo)
+                    );
+                    return matchItcell || matchWo || (cleanRef === 'general / direct' && (!item.itcell_ref_no || String(item.itcell_ref_no).trim() === ''));
                 });
 
+                if (filtered.length === 0 && cleanPid && cleanPid !== '0') {
+                    filtered = (userRequestsCached || []).filter(item => String(item.pid) === cleanPid && (!selectedTid || String(item.tid) === String(selectedTid)));
+                }
+
                 if (filtered.length === 0) {
                     tbody.innerHTML = '<tr><td colspan="10" class="text-center text-muted py-4">No matching user request records found.</td></tr>';
                     return;
@@ -4846,7 +4960,7 @@
                         <td class="fw-semibold text-secondary">${index + 1}</td>
                         <td class="fw-bold text-dark font-monospace">${escapeHtml(item.req_no || '-')}</td>
                         <td class="fw-bold text-dark font-monospace">${escapeHtml(item.itcell_ref_no || '')}</td>
-                        <td>${escapeHtml(item.dept_name)}</td>
+                        <td>${escapeHtml(item.dept_name || '-')}</td>
                         <td><span class="badge-toner-model">${escapeHtml(item.model_name || 'N/A')}</span></td>
                         <td class="text-center font-monospace fw-bold">${item.qty_requested || '0'}</td>
                         <td class="text-center font-monospace fw-bold text-success">${item.qty_delivered || '0'}</td>
@@ -4872,15 +4986,35 @@
                     </tr>
                 `;
 
-                const filtered = userRequestsCached.filter(item => {
-                    if (String(item.pid) !== String(pid)) return false;
+                const normRef = cleanRef.replace(/[\s\-_/]/g, '');
+                const normWo = cleanWo.replace(/[\s\-_/]/g, '');
+                const sourceList = (outwardHistoryCached && outwardHistoryCached.length > 0) ? outwardHistoryCached : (userRequestsCached || []);
+
+                let filtered = sourceList.filter(item => {
+                    if (cleanPid && cleanPid !== '0' && String(item.pid) !== cleanPid) return false;
                     if (selectedTid && String(item.tid) !== String(selectedTid)) return false;
                     if (parseInt(item.qty_delivered || 0) <= 0) return false;
-                    const matchItcell = String(item.itcell_ref_no) === String(itcellRef);
-                    const matchWo = woRef && woRef !== '-' && String(item.itcell_ref_no) === String(woRef);
-                    return matchItcell || matchWo;
+                    const itemRef = String(item.itcell_ref_no || '').trim().toLowerCase();
+                    const itemReq = String(item.req_no || '').trim().toLowerCase();
+                    const normItemRef = itemRef.replace(/[\s\-_/]/g, '');
+                    const normItemReq = itemReq.replace(/[\s\-_/]/g, '');
+
+                    const matchItcell = cleanRef && cleanRef !== '-' && (
+                        itemRef === cleanRef ||
+                        itemReq === cleanRef ||
+                        (normRef && (normItemRef === normRef || normItemReq === normRef || (normRef.length >= 3 && (normItemRef.includes(normRef) || normRef.includes(normItemRef)))))
+                    );
+                    const matchWo = cleanWo && cleanWo !== '-' && (
+                        itemRef === cleanWo ||
+                        (normWo && normItemRef === normWo)
+                    );
+                    return matchItcell || matchWo || (cleanRef === 'general / direct' && (!item.itcell_ref_no || String(item.itcell_ref_no).trim() === ''));
                 });
 
+                if (filtered.length === 0 && cleanPid && cleanPid !== '0') {
+                    filtered = sourceList.filter(item => String(item.pid) === cleanPid && parseInt(item.qty_delivered || 0) > 0 && (!selectedTid || String(item.tid) === String(selectedTid)));
+                }
+
                 if (filtered.length === 0) {
                     tbody.innerHTML = '<tr><td colspan="9" class="text-center text-muted py-4">No matching outward register records found.</td></tr>';
                     return;
@@ -4897,6 +5031,10 @@
                         ? `<a href="${contextPath + userReqPhotoUrl}" target="_blank" class="btn btn-outline-primary btn-sm p-1 px-2 ms-1" style="border-radius: 6px; font-size: 11px; white-space: nowrap;"><i class="fa-solid fa-image"></i> View Photo</a>`
                         : '';
 
+                    const itemOutwardDate = (item.outward_date && String(item.outward_date).trim() !== '' && String(item.outward_date).trim() !== 'null')
+                        ? formatDateOnly(item.outward_date)
+                        : formatTimestamp(item.updated_date || item.cdate);
+
                     tr.innerHTML = `
                         <td class="fw-semibold text-secondary">${index + 1}</td>
                         <td class="fw-bold text-dark font-monospace">${escapeHtml(item.req_no || '-')}</td>
@@ -4904,7 +5042,7 @@
                         <td>${escapeHtml(item.dept_name || 'N/A')}</td>
                         <td><span class="badge-toner-model">${escapeHtml(item.model_name || 'N/A')}</span></td>
                         <td class="text-center font-monospace fw-bold text-success">${item.qty_delivered || '0'}</td>
-                        <td><small class="text-muted fw-semibold">${formatTimestamp(item.updated_date || item.cdate)}</small></td>
+                        <td><small class="text-muted fw-semibold">${itemOutwardDate}</small></td>
                         <td><small class="text-muted">${escapeHtml(item.updated_by || '-')}</small></td>
                         <td class="text-center">${pdfBtn}${photoBtn}</td>
                     `;
@@ -5279,34 +5417,21 @@
             // Calculate totals
             const totalWorkorder = filteredWorkorders.reduce((sum, item) => sum + (parseInt(item.total_qty_registered || item.qty_registered || 0) || 0), 0);
             const totalInward = filteredInward.reduce((sum, item) => sum + (parseInt(item.qty_registered || item.inward_qty || 0) || 0), 0);
+            const totalUserRequested = filteredRequests.reduce((sum, item) => sum + (parseInt(item.qty_requested || item.request_qty || item.req_qty || 0) || 0), 0);
             const totalDistributed = filteredRequests.reduce((sum, item) => sum + (parseInt(item.qty_delivered || item.outward_qty || 0) || 0), 0);
 
-            // Available stock calculation
-            let availableStock = 0;
-            if (stockSummaryCached && stockSummaryCached.length > 0 && (!selectedDept || selectedDept === '')) {
-                const matchedStock = stockSummaryCached.filter(item => matchPrinter(item) && matchToner(item));
-                if (matchedStock.length > 0) {
-                    availableStock = Math.max(0, matchedStock.reduce((sum, item) => sum + Math.max(0, parseInt(item.available_qty || 0)), 0));
-                } else {
-                    availableStock = Math.max(0, totalInward - totalDistributed);
-                }
-            } else {
-                const allDeliveredForPrinterToner = (userRequestsCached || [])
-                    .filter(item => matchPrinter(item) && matchToner(item))
-                    .reduce((sum, item) => sum + (parseInt(item.qty_delivered || 0) || 0), 0);
-                const allInwardForPrinterToner = (inwardHistoryCached || [])
-                    .filter(item => matchPrinter(item) && matchToner(item))
-                    .reduce((sum, item) => sum + (parseInt(item.qty_registered || 0) || 0), 0);
-                availableStock = Math.max(0, allInwardForPrinterToner - allDeliveredForPrinterToner);
-            }
+            // Available stock calculation (Strictly Total Stock - Total Delivered)
+            const availableStock = Math.max(0, totalInward - totalDistributed);
 
             // Update DOM metrics
             const woEl = document.getElementById('stats-workorder-registered');
+            const userReqEl = document.getElementById('stats-user-requested');
             const inwardEl = document.getElementById('stats-inward');
             const distributedEl = document.getElementById('stats-distributed');
             const stockEl = document.getElementById('stats-stock');
 
             if (woEl) woEl.textContent = totalWorkorder;
+            if (userReqEl) userReqEl.textContent = totalUserRequested;
             if (inwardEl) inwardEl.textContent = totalInward;
             if (distributedEl) distributedEl.textContent = totalDistributed;
             if (stockEl) stockEl.textContent = availableStock;
@@ -5314,6 +5439,10 @@
 
         let reportCurrentPage = 1;
         let REPORT_PAGE_SIZE = 20;
+        let reportWorkorderGroupsCached = {};
+        let reportInwardGroupsCached = {};
+        let reportStockGroupsCached = {};
+        let inwardTableGroupsCached = {};
 
         function onPageSizeChange(val) {
             REPORT_PAGE_SIZE = parseInt(val) || 20;
@@ -5519,33 +5648,87 @@
                 return tid !== undefined && tid !== null && String(tid) === String(selectedToner);
             };
 
-            // 1. User Request Details Report
+            // 1. User Request Details Report (Grouped by IT Cell Ref No)
             if (reportType === 'user_requests') {
                 titleEl.innerHTML = `<i class="fa-solid fa-file-invoice me-2"></i>User Request Details Report`;
                 thead.innerHTML = `
                     <tr>
-                        <th>S.No</th>
-                        <th>Req. No</th>
+                        <th style="width: 60px;">S.No</th>
                         ${getSortHeader('IT Cell Ref No', 'itcell_ref_no')}
-                        <th>Department</th>
-                        <th>Printer Model</th>
-                        <th>Toner Model</th>
+                        ${getSortHeader('Department', 'dept_name')}
+                        ${getSortHeader('Zone', 'zone_name')}
                         ${getSortHeader('Qty Req', 'qty_requested', 'text-center')}
                         ${getSortHeader('Qty Delivered', 'qty_delivered', 'text-center')}
+                        ${getSortHeader('Requested Date', 'request_date')}
                         ${getSortHeader('Created Date', 'cdate')}
                         <th class="text-center">Status</th>
                         <th class="text-center">Request Doc</th>
                     </tr>`;
 
-                let filtered = (userRequestsCached || []).filter(item => {
-                    if (!matchPrinter(item)) return false;
-                    if (!matchToner(item)) return false;
+                // Group records by IT Cell Ref No
+                const groups = {};
+                (userRequestsCached || []).forEach(item => {
+                    if (!matchPrinter(item)) return;
+                    if (!matchToner(item)) return;
                     if (selectedDept) {
-                        const dName = (item.dept_name).trim().toLowerCase();
-                        if (dName !== selectedDept.toLowerCase()) return false;
+                        const dName = (item.dept_name || '').trim().toLowerCase();
+                        if (dName !== selectedDept.toLowerCase()) return;
                     }
-                    if (!matchesReportPeriod(item.cdate)) return false;
+                    if (!matchesReportPeriod(item.request_date || item.cdate)) return;
+
+                    const cleanRef = (item.itcell_ref_no || '').trim();
+                    const key = cleanRef || ('req_' + (item.req_no || item.id));
+
+                    if (!groups[key]) {
+                        groups[key] = {
+                            itcell_ref_no: cleanRef,
+                            req_no: item.req_no || '',
+                            dept_name: item.dept_name || '-',
+                            dept_id: item.dept_id,
+                            zone_name: item.zone_name || '-',
+                            zone_id: item.zone_id,
+                            qty_requested: 0,
+                            qty_delivered: 0,
+                            request_date: item.request_date || '',
+                            cdate: item.cdate,
+                            user_request_uploads: [],
+                            req_nos: [],
+                            printer_names: [],
+                            model_names: [],
+                            items: []
+                        };
+                    }
+
+                    groups[key].qty_requested += parseInt(item.qty_requested || 0);
+                    groups[key].qty_delivered += parseInt(item.qty_delivered || 0);
+                    groups[key].items.push(item);
+
+                    if (item.req_no && !groups[key].req_nos.includes(item.req_no)) {
+                        groups[key].req_nos.push(item.req_no);
+                    }
+                    if (item.printer_name && !groups[key].printer_names.includes(item.printer_name)) {
+                        groups[key].printer_names.push(item.printer_name);
+                    }
+                    if (item.model_name && !groups[key].model_names.includes(item.model_name)) {
+                        groups[key].model_names.push(item.model_name);
+                    }
+                    if (item.request_date && !groups[key].request_date) {
+                        groups[key].request_date = item.request_date;
+                    }
+                    if (item.cdate && (!groups[key].cdate || new Date(item.cdate) > new Date(groups[key].cdate))) {
+                        groups[key].cdate = item.cdate;
+                    }
+                    if (item.user_request_upload) {
+                        const files = item.user_request_upload.split(',').map(f => (f || '').trim()).filter(Boolean);
+                        files.forEach(f => {
+                            if (!groups[key].user_request_uploads.includes(f)) {
+                                groups[key].user_request_uploads.push(f);
+                            }
+                        });
+                    }
+                });
 
+                let filtered = Object.values(groups).filter(item => {
                     const reqQty = parseInt(item.qty_requested || 0);
                     const delQty = parseInt(item.qty_delivered || 0);
                     let status = 'Pending';
@@ -5555,7 +5738,10 @@
                     if (selectedStatus && status !== selectedStatus) return false;
 
                     if (searchQuery) {
-                        const searchStr = `${item.req_no || ''} ${item.itcell_ref_no || ''} ${item.dept_name || ''} ${item.printer_name || ''} ${item.model_name || ''}`.toLowerCase();
+                        const reqNosStr = (item.req_nos || []).join(' ');
+                        const printerNamesStr = (item.printer_names || []).join(' ');
+                        const modelNamesStr = (item.model_names || []).join(' ');
+                        const searchStr = `${item.itcell_ref_no || ''} ${reqNosStr} ${item.dept_name || ''} ${item.zone_name || ''} ${printerNamesStr} ${modelNamesStr}`.toLowerCase();
                         if (!searchStr.includes(searchQuery)) return false;
                     }
                     return true;
@@ -5570,7 +5756,7 @@
                 reportCurrentPage = Math.min(Math.max(1, reportCurrentPage), totalPages);
 
                 if (filtered.length === 0) {
-                    tbody.innerHTML = `<tr><td colspan="11" class="text-center text-muted py-4">No matching user request records found.</td></tr>`;
+                    tbody.innerHTML = `<tr><td colspan="10" class="text-center text-muted py-4">No matching user request records found.</td></tr>`;
                     renderReportPaginationNav(1, 0);
                     return;
                 }
@@ -5581,6 +5767,9 @@
                     const tr = document.createElement('tr');
                     const globalIdx = (reportCurrentPage - 1) * REPORT_PAGE_SIZE + idx + 1;
                     const createdDate = formatTimestamp(item.cdate);
+                    const reqDateFormatted = (item.request_date && String(item.request_date).trim() !== '' && String(item.request_date).trim() !== 'null')
+                        ? formatDateOnly(item.request_date)
+                        : '-';
                     const reqQty = parseInt(item.qty_requested || 0);
                     const delQty = parseInt(item.qty_delivered || 0);
 
@@ -5592,20 +5781,28 @@
                     }
 
                     let docBtn = '-';
-                    if (item.user_request_upload) {
-                        docBtn = `<a href="${resolveUploadUrl(item.user_request_upload)}" target="_blank" class="btn-action btn-view-doc"><i class="fa-solid fa-file-pdf"></i> View Letter</a>`;
+                    if (item.user_request_uploads && item.user_request_uploads.length > 0) {
+                        const validFiles = [...new Set(item.user_request_uploads.map(f => (f || '').trim()).filter(Boolean))];
+                        if (validFiles.length > 0) {
+                            docBtn = `<a href="${resolveUploadUrl(validFiles[0])}" target="_blank" class="btn-action btn-view-doc" style="font-size: 11px; padding: 4px 10px; white-space: nowrap;"><i class="fa-solid fa-file-pdf"></i> View Letter</a>`;
+                        }
                     }
 
+                    const modelsCountBadge = item.items && item.items.length > 1
+                        ? `<br><span class="badge bg-light text-secondary border mt-1" style="cursor: pointer;" onclick="showUserRequestBreakdownModal('${encodeURIComponent(item.itcell_ref_no || item.req_no || '')}');" title="Click to view ${item.items.length} toners"><i class="fa-solid fa-layer-group me-1"></i>${item.items.length} Toners</span>`
+                        : (item.items && item.items.length === 1 ? `<br><small class="text-muted font-monospace">${escapeHtml(item.items[0].model_name || '')}</small>` : '');
+
+                    const refLink = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-primary font-monospace" style="border-bottom: 1px dashed #0f5c78; cursor: pointer; font-size: 0.95rem;" onclick="showUserRequestBreakdownModal('${encodeURIComponent(item.itcell_ref_no || item.req_no || '')}'); return false;" title="Click to view requested toner models">${escapeHtml(item.itcell_ref_no || item.req_no || '-')}</a>`;
+
                     tr.innerHTML = `
                         <td class="fw-semibold text-secondary">${globalIdx}</td>
-                        <td class="fw-bold text-dark">${escapeHtml(item.req_no)}</td>
-                        <td class="font-monospace fw-bold text-dark">${escapeHtml(item.itcell_ref_no || '-')}</td>
+                        <td>${refLink}${modelsCountBadge}</td>
                         <td>${escapeHtml(item.dept_name || '-')}</td>
-                        <td>${escapeHtml(item.printer_name || '-')}</td>
-                        <td><span class="badge-toner-model">${escapeHtml(item.model_name || '-')}</span></td>
-                        <td class="text-center font-monospace fw-bold">${item.qty_requested}</td>
+                        <td>${escapeHtml(item.zone_name || '-')}</td>
+                        <td class="text-center font-monospace fw-bold text-dark">${item.qty_requested}</td>
                         <td class="text-center text-success fw-bold font-monospace">${item.qty_delivered || 0}</td>
-                        <td><small class="text-dark fw-semibold">${createdDate}</small></td>
+                        <td><small class="text-dark fw-semibold">${reqDateFormatted}</small></td>
+                        <td><small class="text-muted fw-semibold">${createdDate}</small></td>
                         <td class="text-center">${statusBadge}</td>
                         <td class="text-center">${docBtn}</td>
                     `;
@@ -5614,33 +5811,85 @@
 
                 renderReportPaginationNav(totalPages, filtered.length);
             }
-            // 1b. Workorder Register Report
+            // 1b. Workorder Register Report (Grouped by File No / Ref No)
             else if (reportType === 'workorder_register') {
                 titleEl.innerHTML = `<i class="fa-solid fa-file-contract me-2"></i>Workorder Register Report`;
                 thead.innerHTML = `
                     <tr>
-                        <th>S.No</th>
-                        ${getSortHeader('Ref No.', 'ref_no')}
-                        <th>File No.</th>
-                        <th>Vendor</th>
-                        <th>Printer Model</th>
-                        <th>Toner Model</th>
+                        <th style="width: 60px;">S.No</th> 
+                        ${getSortHeader('File No.', 'file_number')}
+                        ${getSortHeader('Workorder Ref', 'ref_no')}
+                        ${getSortHeader('Vendor', 'vendor_name')}
                         ${getSortHeader('Registered Qty', 'total_qty_registered', 'text-center')}
                         ${getSortHeader('Start Date', 'workorder_start_date')}
                         ${getSortHeader('End Date', 'workorder_end_date')}
                         <th class="text-center">DC Copy</th>
                     </tr>`;
 
-                let filtered = (workorderHistoryCached || []).filter(item => {
-                    if (!matchPrinter(item)) return false;
-                    if (!matchToner(item)) return false;
+                // Group records by File No (or Ref No)
+                const groups = {};
+                (workorderHistoryCached || []).forEach(item => {
+                    if (!matchPrinter(item)) return;
+                    if (!matchToner(item)) return;
                     if (selectedFileNo) {
                         const itemFileNo = (item.file_number || '').trim().toLowerCase();
-                        if (itemFileNo !== selectedFileNo.toLowerCase()) return false;
+                        if (itemFileNo !== selectedFileNo.toLowerCase()) return;
+                    }
+                    if (!matchesReportPeriod(item.workorder_start_date || item.cdate)) return;
+
+                    const cleanFile = (item.file_number || '').trim();
+                    const cleanRef = (item.ref_no || '').trim();
+                    const key = cleanFile || cleanRef || ('wo_' + (item.id || Math.random()));
+
+                    if (!groups[key]) {
+                        groups[key] = {
+                            key: key,
+                            file_number: cleanFile,
+                            ref_no: cleanRef,
+                            vendor_name: item.vendor_name || '-',
+                            vendor_id: item.vendor_id,
+                            total_qty_registered: 0,
+                            workorder_start_date: item.workorder_start_date || '',
+                            workorder_end_date: item.workorder_end_date || '',
+                            cdate: item.cdate,
+                            dc_uploads: [],
+                            printer_names: [],
+                            model_names: [],
+                            items: []
+                        };
+                    }
+
+                    groups[key].total_qty_registered += (parseInt(item.total_qty_registered || item.qty_registered || 0) || 0);
+                    groups[key].items.push(item);
+
+                    if (item.printer_name && !groups[key].printer_names.includes(item.printer_name)) {
+                        groups[key].printer_names.push(item.printer_name);
+                    }
+                    if (item.model_name && !groups[key].model_names.includes(item.model_name)) {
+                        groups[key].model_names.push(item.model_name);
+                    }
+                    if (item.workorder_start_date && !groups[key].workorder_start_date) {
+                        groups[key].workorder_start_date = item.workorder_start_date;
                     }
-                    if (!matchesReportPeriod(item.workorder_start_date || item.cdate)) return false;
+                    if (item.workorder_end_date && !groups[key].workorder_end_date) {
+                        groups[key].workorder_end_date = item.workorder_end_date;
+                    }
+                    if (item.dc_uploads && Array.isArray(item.dc_uploads)) {
+                        item.dc_uploads.forEach(f => {
+                            if (f && !groups[key].dc_uploads.includes(f)) groups[key].dc_uploads.push(f);
+                        });
+                    } else if (item.dc_upload && !groups[key].dc_uploads.includes(item.dc_upload)) {
+                        groups[key].dc_uploads.push(item.dc_upload);
+                    }
+                });
+
+                reportWorkorderGroupsCached = groups;
+
+                let filtered = Object.values(groups).filter(item => {
                     if (searchQuery) {
-                        const searchStr = `${item.ref_no || ''} ${item.file_number || ''} ${item.vendor_name || ''} ${item.printer_name || ''} ${item.model_name || ''}`.toLowerCase();
+                        const printerNamesStr = (item.printer_names || []).join(' ');
+                        const modelNamesStr = (item.model_names || []).join(' ');
+                        const searchStr = `${item.ref_no || ''} ${item.file_number || ''} ${item.vendor_name || ''} ${printerNamesStr} ${modelNamesStr}`.toLowerCase();
                         if (!searchStr.includes(searchQuery)) return false;
                     }
                     return true;
@@ -5655,7 +5904,7 @@
                 reportCurrentPage = Math.min(Math.max(1, reportCurrentPage), totalPages);
 
                 if (filtered.length === 0) {
-                    tbody.innerHTML = `<tr><td colspan="10" class="text-center text-muted py-4">No matching workorders found.</td></tr>`;
+                    tbody.innerHTML = `<tr><td colspan="8" class="text-center text-muted py-4">No matching workorders found.</td></tr>`;
                     renderReportPaginationNav(1, 0);
                     return;
                 }
@@ -5665,18 +5914,32 @@
                 pagedData.forEach((item, idx) => {
                     const tr = document.createElement('tr');
                     const globalIdx = (reportCurrentPage - 1) * REPORT_PAGE_SIZE + idx + 1;
-                    const pdfBtn = item.dc_upload
-                        ? `<a href="${resolveUploadUrl(item.dc_upload)}" target="_blank" class="btn-action btn-view-doc"><i class="fa-solid fa-file-pdf"></i> View</a>`
-                        : `<span class="text-muted"><i class="fa-solid fa-ban"></i> N/A</span>`;
+
+                    let pdfBtn = `<span class="text-muted"><i class="fa-solid fa-ban"></i> N/A</span>`;
+                    if (item.dc_uploads && item.dc_uploads.length > 0) {
+                        pdfBtn = item.dc_uploads.map((file, i) => {
+                            const label = item.dc_uploads.length > 1 ? `View ${i + 1}` : `View`;
+                            return `<a href="${resolveUploadUrl(file)}" target="_blank" class="btn-action btn-view-doc m-1" style="font-size: 11px; padding: 4px 8px; white-space: nowrap;"><i class="fa-solid fa-file-pdf"></i> ${label}</a>`;
+                        }).join(' ');
+                    }
+
+                    const groupKeyParam = encodeURIComponent(item.key || item.file_number || item.ref_no || '');
+                    const modelsCountBadge = item.items && item.items.length > 1
+                        ? `<br><span class="badge bg-light text-secondary border mt-1" style="cursor: pointer;" onclick="showWorkorderHistoryBreakdownModal('${encodeURIComponent(item.ref_no || '')}', '${encodeURIComponent(item.file_number || '')}', '${groupKeyParam}');" title="Click to view ${item.items.length} toners"><i class="fa-solid fa-layer-group me-1"></i>${item.items.length} Toners</span>`
+                        : (item.items && item.items.length === 1 ? `<br><small class="text-muted font-monospace">${escapeHtml(item.items[0].model_name || '')}</small>` : '');
+
+                    const fileNoLink = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-primary font-monospace" style="border-bottom: 1px dashed #0f5c78; cursor: pointer; font-size: 0.95rem;" onclick="showWorkorderHistoryBreakdownModal('${encodeURIComponent(item.ref_no || '')}', '${encodeURIComponent(item.file_number || '')}', '${groupKeyParam}'); return false;" title="Click to view workorder toners breakdown">${escapeHtml(item.file_number || item.ref_no || '-')}</a>`;
+
+                    const refLink = item.ref_no
+                        ? `<a href="#" class="fw-semibold text-decoration-none text-dark font-monospace" style="cursor: pointer;" onclick="showWorkorderHistoryBreakdownModal('${encodeURIComponent(item.ref_no || '')}', '${encodeURIComponent(item.file_number || '')}', '${groupKeyParam}'); return false;">${escapeHtml(item.ref_no)}</a>`
+                        : '-';
 
                     tr.innerHTML = `
                         <td class="fw-semibold text-secondary">${globalIdx}</td>
-                        <td class="fw-bold text-dark">${escapeHtml(item.ref_no || '')}</td>
-                        <td>${escapeHtml(item.file_number || '')}</td>
+                        <td>${fileNoLink}${modelsCountBadge}</td>
+                        <td>${refLink}</td>
                         <td>${escapeHtml(item.vendor_name || '')}</td>
-                        <td>${escapeHtml(item.printer_name || 'N/A')}</td>
-                        <td><span class="badge-toner-model">${escapeHtml(item.model_name || 'N/A')}</span></td>
-                        <td class="text-center font-monospace fw-bold">${item.total_qty_registered || '0'}</td>
+                        <td class="text-center font-monospace fw-bold text-dark">${item.total_qty_registered || '0'}</td>
                         <td><small class="text-dark fw-semibold">${item.workorder_start_date || 'N/A'}</small></td>
                         <td><small class="text-dark fw-semibold">${item.workorder_end_date || 'N/A'}</small></td>
                         <td class="text-center">${pdfBtn}</td>
@@ -5751,30 +6014,102 @@
 
                 renderReportPaginationNav(totalPages, filtered.length);
             }
-            // 2. Inward Register Stock Report
+            // 2. Inward Register Stock Report (Grouped per DC Delivery Transaction)
             else if (reportType === 'inward_stock') {
                 titleEl.innerHTML = `<i class="fa-solid fa-boxes-packing me-2"></i>Inward Register Stock Report`;
                 thead.innerHTML = `
                     <tr>
-                        <th>S.No</th>
-                        <th>Workorder Ref</th>
-                        <th>File No.</th>
-                        <th>Company Name</th>
-                        <th>Printer Model</th>
-                        <th>Toner Model</th>
-                        <th class="text-center">Qty Inward</th>
+                        <th style="width: 60px;">S.No</th>
+                        ${getSortHeader('File No.', 'file_number')}
+                        ${getSortHeader('Workorder Ref', 'ref_no')}
+                        ${getSortHeader('Company Name', 'company_name')}
+                        <th>DC Number</th>
+                        ${getSortHeader('Qty Inward', 'qty_registered', 'text-center')}
+                        ${getSortHeader('DC Date', 'dc_date')}
                         ${getSortHeader('Created Date', 'cdate')}
                         <th>Entered By</th>
                         <th class="text-center">DC Document</th>
                     </tr>`;
 
-                let filtered = (inwardHistoryCached || []).filter(item => {
-                    if (!matchPrinter(item)) return false;
-                    if (!matchToner(item)) return false;
-                    if (!matchesReportPeriod(item.cdate)) return false;
-                    if (searchQuery) {
+                // Group records per distinct DC delivery transaction
+                const groups = {};
+                (inwardHistoryCached || []).forEach(item => {
+                    if (!matchPrinter(item)) return;
+                    if (!matchToner(item)) return;
+                    if (!matchesReportPeriod(item.cdate)) return;
+
+                    const cleanFile = (item.file_number || '').trim();
+                    const cleanRef = (item.ref_no || '').trim();
+                    const cleanDcNo = (item.dc_no || '').trim();
+                    const cleanDcUpload = (item.dc_upload || item.dc_uploads || '').toString().trim();
+                    const cdateKey = item.cdate ? String(item.cdate).substring(0, 19) : '';
+
+                    const key = `${cleanRef || 'general'}_${cleanDcNo || 'nodc'}_${cleanDcUpload || ('item_' + (item.id || Math.random()))}_${cdateKey}`;
+
+                    if (!groups[key]) {
+                        groups[key] = {
+                            key: key,
+                            file_number: cleanFile,
+                            ref_no: cleanRef,
+                            company_name: item.company_name,
+                            vendor_name: item.vendor_name || vendorsMap[item.company_name] || item.company_name || '',
+                            dc_no: cleanDcNo || '-',
+                            dc_nos: cleanDcNo ? [cleanDcNo] : [],
+                            qty_registered: 0,
+                            cdate: item.cdate,
+                            dc_date: item.dc_date || '',
+                            order_by: item.order_by || item.updated_by || '',
+                            dc_uploads: [],
+                            printer_names: [],
+                            model_names: [],
+                            items: []
+                        };
+                    }
+
+                    if (cleanFile && !groups[key].file_number) {
+                        groups[key].file_number = cleanFile;
+                    }
+
+                    const qty = parseInt(item.qty_registered || item.inward_qty || 0) || 0;
+                    groups[key].qty_registered += qty;
+                    groups[key].items.push(item);
+
+                    if (cleanDcNo && !groups[key].dc_nos.includes(cleanDcNo)) {
+                        groups[key].dc_nos.push(cleanDcNo);
+                    }
+                    if (item.printer_name && !groups[key].printer_names.includes(item.printer_name)) {
+                        groups[key].printer_names.push(item.printer_name);
+                    }
+                    if (item.model_name && !groups[key].model_names.includes(item.model_name)) {
+                        groups[key].model_names.push(item.model_name);
+                    }
+                    if (item.dc_date && !groups[key].dc_date) {
+                        groups[key].dc_date = item.dc_date;
+                    }
+                    if (item.cdate && (!groups[key].cdate || new Date(item.cdate) > new Date(groups[key].cdate))) {
+                        groups[key].cdate = item.cdate;
+                    }
+                    if (item.order_by && !groups[key].order_by) {
+                        groups[key].order_by = item.order_by;
+                    }
+                    const rawDc = item.dc_upload || item.dc_uploads;
+                    if (rawDc) {
+                        const files = Array.isArray(rawDc) ? rawDc : String(rawDc).split(',').map(s => s.trim()).filter(Boolean);
+                        files.forEach(f => {
+                            if (f && !groups[key].dc_uploads.includes(f)) groups[key].dc_uploads.push(f);
+                        });
+                    }
+                });
+
+                reportInwardGroupsCached = groups;
+
+                let filtered = Object.values(groups).filter(item => {
+                    if (searchQuery) {
                         const vendorName = vendorsMap[item.company_name] || (!isNaN(item.company_name) ? '' : (item.company_name || ''));
-                        const searchStr = `${item.ref_no || ''} ${item.file_number || ''} ${vendorName} ${item.printer_name || ''} ${item.model_name || ''} ${item.order_by || ''}`.toLowerCase();
+                        const printerNamesStr = (item.printer_names || []).join(' ');
+                        const modelNamesStr = (item.model_names || []).join(' ');
+                        const dcNosStr = (item.dc_nos || []).join(' ');
+                        const searchStr = `${item.ref_no || ''} ${item.file_number || ''} ${vendorName} ${dcNosStr} ${printerNamesStr} ${modelNamesStr} ${item.order_by || ''}`.toLowerCase();
                         if (!searchStr.includes(searchQuery)) return false;
                     }
                     return true;
@@ -5800,21 +6135,40 @@
                     const tr = document.createElement('tr');
                     const globalIdx = (reportCurrentPage - 1) * REPORT_PAGE_SIZE + idx + 1;
                     const createdDate = formatTimestamp(item.cdate);
+                    const dcDateFormatted = (item.dc_date && String(item.dc_date).trim() !== '' && String(item.dc_date).trim() !== 'null') ? formatDateOnly(item.dc_date) : '-';
+
                     let docBtn = '-';
-                    if (item.dc_upload) {
-                        docBtn = `<a href="${resolveUploadUrl(item.dc_upload)}" target="_blank" class="btn-action btn-view-doc"><i class="fa-solid fa-file-pdf"></i> View DC</a>`;
+                    if (item.dc_uploads && item.dc_uploads.length > 0) {
+                        docBtn = item.dc_uploads.map((file, i) => {
+                            const label = item.dc_uploads.length > 1 ? `View DC ${i + 1}` : `View DC`;
+                            return `<a href="${resolveUploadUrl(file)}" target="_blank" class="btn-action btn-view-doc m-1" style="font-size: 11px; padding: 4px 8px; white-space: nowrap;"><i class="fa-solid fa-file-pdf"></i> ${label}</a>`;
+                        }).join(' ');
                     }
 
                     const vendorName = vendorsMap[item.company_name] || (!isNaN(item.company_name) ? 'Unknown Vendor (' + item.company_name + ')' : (item.company_name || ''));
-                    tr.innerHTML = `
+                    const groupKeyParam = encodeURIComponent(item.key || item.file_number || item.ref_no || '');
+
+                    const modelsCountBadge = item.items && item.items.length > 1
+                        ? `<br><span class="badge bg-light text-secondary border mt-1" style="cursor: pointer;" onclick="showInwardHistoryBreakdownModal('${encodeURIComponent(item.file_number || '')}', '${encodeURIComponent(item.ref_no || '')}', '${groupKeyParam}');" title="Click to view ${item.items.length} toners in this DC"><i class="fa-solid fa-layer-group me-1"></i>${item.items.length} Toners</span>`
+                        : (item.items && item.items.length === 1 ? `<br><small class="text-muted font-monospace">${escapeHtml(item.items[0].model_name || '')}</small>` : '');
+
+                    const fileNoLink = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-primary font-monospace" style="border-bottom: 1px dashed #0f5c78; cursor: pointer; font-size: 0.95rem;" onclick="showInwardHistoryBreakdownModal('${encodeURIComponent(item.file_number || '')}', '${encodeURIComponent(item.ref_no || '')}', '${groupKeyParam}'); return false;" title="Click to view DC toners breakdown">${escapeHtml(item.file_number || item.ref_no || '-')}</a>`;
+
+                    const refLink = item.ref_no
+                        ? `<a href="#" class="fw-semibold text-decoration-none text-dark font-monospace" style="cursor: pointer;" onclick="showInwardHistoryBreakdownModal('${encodeURIComponent(item.file_number || '')}', '${encodeURIComponent(item.ref_no || '')}', '${groupKeyParam}'); return false;" title="Click to view DC toners breakdown">${escapeHtml(item.ref_no)}</a>`
+                        : '-';
+
+                    const dcNoDisplay = item.dc_nos && item.dc_nos.length > 0 ? item.dc_nos.join(', ') : (item.dc_no || '-');
+
+                    tr.innerHTML = ` 
                         <td class="fw-semibold text-secondary">${globalIdx}</td>
-                        <td class="fw-bold text-dark">${escapeHtml(item.ref_no || '-')}</td>
-                        <td class="fw-bold text-dark">${escapeHtml(item.file_number || '-')}</td>
+                        <td>${fileNoLink}${modelsCountBadge}</td> 
+                        <td>${refLink}</td>
                         <td class="fw-bold text-dark">${escapeHtml(vendorName)}</td>
-                        <td>${escapeHtml(item.printer_name || '-')}</td>
-                        <td><span class="badge-toner-model">${escapeHtml(item.model_name || '-')}</span></td>
+                        <td class="font-monospace">${escapeHtml(dcNoDisplay)}</td>
                         <td class="text-center text-primary fw-bold font-monospace">${item.qty_registered}</td>
-                        <td><small class="text-dark fw-semibold">${createdDate}</small></td>
+                        <td><small class="text-dark fw-semibold">${dcDateFormatted}</small></td>
+                        <td><small class="text-muted fw-semibold">${createdDate}</small></td>
                         <td><small class="text-muted">${escapeHtml(item.order_by || '-')}</small></td>
                         <td class="text-center">${docBtn}</td>
                     `;
@@ -5825,22 +6179,54 @@
             }
             // 3. Current Stock Summary
             else if (reportType === 'stock_summary') {
-                titleEl.innerHTML = `<i class="fa-solid fa-warehouse me-2"></i>Current Stock Summary`;
+                titleEl.innerHTML = `<i class="fa-solid fa-boxes-stacked me-2"></i>Current Stock Summary`;
                 thead.innerHTML = `
                     <tr>
-                        <th>S.No</th>
-                        <th>Printer Model</th>
-                        <th>Toner Model</th>
-                        <th class="text-center">Total Inward</th>
-                        <th class="text-center">Total Outward</th>
-                        <th class="text-center">Available Stock</th>
+                        <th style="width: 60px;">S.No</th>
+                        ${getSortHeader('Printer Model', 'printer_name')}
+                        ${getSortHeader('Total Inward', 'inward_qty', 'text-center')}
+                        ${getSortHeader('Total Outward', 'outward_qty', 'text-center')}
+                        ${getSortHeader('Available Stock', 'available_qty', 'text-center')}
+                        <th class="text-center">Stock Status</th>
                     </tr>`;
 
-                let filtered = (stockSummaryCached || []).filter(item => {
-                    if (!matchPrinter(item)) return false;
-                    if (!matchToner(item)) return false;
+                // Group records Printer Model-wise
+                const groups = {};
+                (stockSummaryCached || []).forEach(item => {
+                    if (!matchPrinter(item)) return;
+                    if (!matchToner(item)) return;
+
+                    const key = (item.printer_name || ('printer_' + (item.pid || Math.random()))).trim();
+                    if (!groups[key]) {
+                        groups[key] = {
+                            key: key,
+                            pid: item.pid,
+                            printer_name: item.printer_name || 'Unknown Printer',
+                            inward_qty: 0,
+                            outward_qty: 0,
+                            available_qty: 0,
+                            printer_names: [item.printer_name].filter(Boolean),
+                            model_names: [],
+                            items: []
+                        };
+                    }
+                    groups[key].inward_qty += (parseInt(item.inward_qty || 0) || 0);
+                    groups[key].outward_qty += (parseInt(item.outward_qty || 0) || 0);
+                    groups[key].available_qty = Math.max(0, groups[key].inward_qty - groups[key].outward_qty);
+                    groups[key].items.push(item);
+
+                    if (item.model_name && !groups[key].model_names.includes(item.model_name)) {
+                        groups[key].model_names.push(item.model_name);
+                    }
+                });
+
+                reportStockGroupsCached = groups;
+                dashboardStockGroupsCached = Object.assign({}, dashboardStockGroupsCached, groups);
+
+                let filtered = Object.values(groups).filter(item => {
                     if (searchQuery) {
-                        const searchStr = `${item.printer_name || ''} ${item.model_name || ''}`.toLowerCase();
+                        const modelNamesStr = (item.model_names || []).join(' ');
+                        const searchStr = `${item.printer_name || ''} ${modelNamesStr}`.toLowerCase();
                         if (!searchStr.includes(searchQuery)) return false;
                     }
                     return true;
@@ -5865,14 +6251,31 @@
                 pagedData.forEach((item, idx) => {
                     const tr = document.createElement('tr');
                     const globalIdx = (reportCurrentPage - 1) * REPORT_PAGE_SIZE + idx + 1;
-                    const avail = Math.max(0, parseInt(item.available_qty || 0));
+                    const available = parseInt(item.available_qty || 0);
+                    let availableBadge = `<span class="badge bg-success font-monospace fw-bold">${available}</span>`;
+                    let statusBadge = `<span class="badge bg-success"><i class="fa-solid fa-circle-check me-1"></i>In Stock</span>`;
+                    if (available === 0) {
+                        availableBadge = `<span class="badge bg-danger font-monospace fw-bold">0</span>`;
+                        statusBadge = `<span class="badge bg-danger"><i class="fa-solid fa-circle-xmark me-1"></i>Out of stock</span>`;
+                    } else if (available <= 5) {
+                        availableBadge = `<span class="badge bg-warning text-dark font-monospace fw-bold">${available}</span>`;
+                        statusBadge = `<span class="badge bg-warning text-dark"><i class="fa-solid fa-triangle-exclamation me-1"></i>Low Stock</span>`;
+                    }
+
+                    const groupKeyParam = encodeURIComponent(item.key || item.printer_name || '');
+                    const modelsCountBadge = item.items && item.items.length > 1
+                        ? `<br><span class="badge bg-light text-secondary border mt-1" style="cursor: pointer;" onclick="showPrinterStockBreakdownModal('${encodeURIComponent(item.printer_name || '')}', '${groupKeyParam}');" title="Click to view ${item.items.length} toners"><i class="fa-solid fa-layer-group me-1"></i>${item.items.length} Toners</span>`
+                        : (item.items && item.items.length === 1 ? `<br><small class="text-muted font-monospace">${escapeHtml(item.items[0].model_name || '')}</small>` : '');
+
+                    const printerLink = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-primary font-monospace" style="border-bottom: 1px dashed #0f5c78; cursor: pointer; font-size: 0.95rem;" onclick="showPrinterStockBreakdownModal('${encodeURIComponent(item.printer_name || '')}', '${groupKeyParam}'); return false;" title="Click to view printer toners stock breakdown">${escapeHtml(item.printer_name || 'N/A')}</a>`;
+
                     tr.innerHTML = `
                         <td class="fw-semibold text-secondary">${globalIdx}</td>
-                        <td class="fw-semibold text-dark">${escapeHtml(item.printer_name)}</td>
-                        <td><span class="badge-toner-model">${escapeHtml(item.model_name)}</span></td>
-                        <td class="text-center text-primary fw-bold">${item.inward_qty}</td>
-                        <td class="text-center text-success fw-bold">${item.outward_qty}</td>
-                        <td class="text-center fw-bold ${avail <= 2 ? 'text-danger animate-pulse' : 'text-dark'}">${avail}</td>
+                        <td>${printerLink}${modelsCountBadge}</td>
+                        <td class="text-center text-primary fw-bold font-monospace">${item.inward_qty || 0}</td>
+                        <td class="text-center text-success fw-bold font-monospace">${item.outward_qty || 0}</td>
+                        <td class="text-center">${availableBadge}</td>
+                        <td class="text-center">${statusBadge}</td>
                     `;
                     tbody.appendChild(tr);
                 });
@@ -5884,28 +6287,93 @@
                 titleEl.innerHTML = `<i class="fa-solid fa-truck-moving me-2"></i>Outward Distribution History`;
                 thead.innerHTML = `
                     <tr>
-                        <th>S.No</th>
-                        <th>Req. No</th>
-                        <th>Department</th>
-                        <th>Printer Model</th>
-                        <th>Toner Model</th>
+                        <th style="width: 60px;">S.No</th>
+                        ${getSortHeader('IT Cell Ref No', 'itcell_ref_no')}
+                        ${getSortHeader('Department', 'dept_name')}
+                        ${getSortHeader('Zone', 'zone_name')}
                         ${getSortHeader('Qty Req', 'qty_requested', 'text-center')}
                         ${getSortHeader('Qty Issued', 'qty_delivered', 'text-center')}
-                        ${getSortHeader('Requested Date', 'cdate')}
-                        <th>Issued Date</th>
+                        ${getSortHeader('Requested Date', 'request_date')}
+                        ${getSortHeader('Issued Date', 'updated_date')}
                         <th class="text-center">Action</th>
                     </tr>`;
 
-                let filtered = (outwardHistoryCached || []).filter(item => {
-                    if (!matchPrinter(item)) return false;
-                    if (!matchToner(item)) return false;
+                // Group records by IT Cell Ref No
+                const groups = {};
+                (outwardHistoryCached || []).forEach(item => {
+                    if (!matchPrinter(item)) return;
+                    if (!matchToner(item)) return;
                     if (selectedDept) {
-                        const dName = (item.dept_name).trim().toLowerCase();
-                        if (dName !== selectedDept.toLowerCase()) return false;
+                        const dName = (item.dept_name || '').trim().toLowerCase();
+                        if (dName !== selectedDept.toLowerCase()) return;
+                    }
+                    if (!matchesReportPeriod(item.updated_date || item.cdate)) return;
+
+                    const cleanRef = (item.itcell_ref_no || '').trim();
+                    const key = cleanRef || ('req_' + (item.req_no || item.id));
+
+                    if (!groups[key]) {
+                        groups[key] = {
+                            itcell_ref_no: cleanRef,
+                            req_no: item.req_no || '',
+                            dept_name: item.dept_name || '-',
+                            dept_id: item.dept_id,
+                            zone_name: item.zone_name || '-',
+                            zone_id: item.zone_id,
+                            qty_requested: 0,
+                            qty_delivered: 0,
+                            request_date: item.request_date || item.cdate || '',
+                            updated_date: item.updated_date || item.cdate || '',
+                            cdate: item.cdate,
+                            final_delivered_uploads: [],
+                            receiver_photos: [],
+                            req_nos: [],
+                            printer_names: [],
+                            model_names: [],
+                            items: []
+                        };
+                    }
+
+                    groups[key].qty_requested += parseInt(item.qty_requested || 0);
+                    groups[key].qty_delivered += parseInt(item.qty_delivered || 0);
+                    groups[key].items.push(item);
+
+                    if (item.req_no && !groups[key].req_nos.includes(item.req_no)) {
+                        groups[key].req_nos.push(item.req_no);
+                    }
+                    if (item.printer_name && !groups[key].printer_names.includes(item.printer_name)) {
+                        groups[key].printer_names.push(item.printer_name);
+                    }
+                    if (item.model_name && !groups[key].model_names.includes(item.model_name)) {
+                        groups[key].model_names.push(item.model_name);
+                    }
+                    if (item.updated_date && (!groups[key].updated_date || new Date(item.updated_date) > new Date(groups[key].updated_date))) {
+                        groups[key].updated_date = item.updated_date;
+                    }
+                    if (item.final_delivered_upload) {
+                        const files = item.final_delivered_upload.split(',').map(f => (f || '').trim()).filter(Boolean);
+                        files.forEach(f => {
+                            if (!groups[key].final_delivered_uploads.includes(f)) {
+                                groups[key].final_delivered_uploads.push(f);
+                            }
+                        });
+                    }
+                    if (item.receiver_photo) {
+                        const files = item.receiver_photo.split(',').map(f => (f || '').trim()).filter(Boolean);
+                        files.forEach(f => {
+                            if (!groups[key].receiver_photos.includes(f)) {
+                                groups[key].receiver_photos.push(f);
+                            }
+                        });
                     }
-                    if (!matchesReportPeriod(item.updated_date || item.cdate)) return false;
+                });
+
+                let filtered = Object.values(groups).filter(item => {
                     if (searchQuery) {
-                        const searchStr = `${item.req_no || ''} ${item.dept_name || ''} ${item.printer_name || ''} ${item.model_name || ''}`.toLowerCase();
+                        const reqNosStr = (item.req_nos || []).join(' ');
+                        const printerNamesStr = (item.printer_names || []).join(' ');
+                        const modelNamesStr = (item.model_names || []).join(' ');
+                        const searchStr = `${item.itcell_ref_no || ''} ${reqNosStr} ${item.dept_name || ''} ${item.zone_name || ''} ${printerNamesStr} ${modelNamesStr}`.toLowerCase();
                         if (!searchStr.includes(searchQuery)) return false;
                     }
                     return true;
@@ -5920,7 +6388,7 @@
                 reportCurrentPage = Math.min(Math.max(1, reportCurrentPage), totalPages);
 
                 if (filtered.length === 0) {
-                    tbody.innerHTML = `<tr><td colspan="10" class="text-center text-muted py-4">No matching outward records found.</td></tr>`;
+                    tbody.innerHTML = `<tr><td colspan="9" class="text-center text-muted py-4">No matching outward records found.</td></tr>`;
                     renderReportPaginationNav(1, 0);
                     return;
                 }
@@ -5930,40 +6398,49 @@
                 pagedData.forEach((item, idx) => {
                     const tr = document.createElement('tr');
                     const globalIdx = (reportCurrentPage - 1) * REPORT_PAGE_SIZE + idx + 1;
-                    const reqDateFormatted = formatTimestamp(item.cdate);
+                    const reqDateFormatted = (item.request_date && String(item.request_date).trim() !== '' && String(item.request_date).trim() !== 'null')
+                        ? formatDateOnly(item.request_date)
+                        : (formatTimestamp(item.cdate) || '-');
                     const dateFormatted = formatTimestamp(item.updated_date);
+
                     let docBtn = '';
-                    if (item.final_delivered_upload) {
-                        const paths = item.final_delivered_upload.split(',');
-                        docBtn = paths.map((p, index) => {
+                    if (item.final_delivered_uploads && item.final_delivered_uploads.length > 0) {
+                        docBtn = item.final_delivered_uploads.map((p, index) => {
                             const trimmed = p.trim();
                             const url = trimmed.startsWith('.') ? trimmed.substring(1) : trimmed;
-                            const label = paths.length > 1 ? `View Doc ${index + 1}` : `View Doc`;
-                            return `<a href="${contextPath + url}" target="_blank" class="btn-action btn-view-doc me-1 mb-1" style="display: inline-flex; align-items: center; gap: 4px;"><i class="fa-solid fa-file-pdf"></i> ${label}</a>`;
+                            const label = item.final_delivered_uploads.length > 1 ? `Doc ${index + 1}` : `Doc`;
+                            return `<a href="${contextPath + url}" target="_blank" class="btn-action btn-view-doc me-1 mb-1" style="font-size: 11px; padding: 4px 8px; display: inline-flex; align-items: center; gap: 4px;"><i class="fa-solid fa-file-pdf"></i> ${label}</a>`;
                         }).join(' ');
                     }
+
                     let photoBtn = '';
-                    if (item.receiver_photo) {
-                        const photos = item.receiver_photo.split(',');
-                        photoBtn = photos.map((p, pIdx) => {
+                    if (item.receiver_photos && item.receiver_photos.length > 0) {
+                        photoBtn = item.receiver_photos.map((p, pIdx) => {
                             const trimmed = p.trim();
                             const url = trimmed.startsWith('.') ? trimmed.substring(1) : trimmed;
-                            const label = photos.length > 1 ? `View Photo ${pIdx + 1}` : `View Photo`;
-                            return `<a href="${contextPath + url}" target="_blank" class="btn-action btn-view-photo me-1 mb-1" style="display: inline-flex; align-items: center; gap: 4px;"><i class="fa-solid fa-image"></i> ${label}</a>`;
+                            const label = item.receiver_photos.length > 1 ? `Photo ${pIdx + 1}` : `Photo`;
+                            return `<a href="${contextPath + url}" target="_blank" class="btn-action btn-view-photo me-1 mb-1" style="font-size: 11px; padding: 4px 8px; display: inline-flex; align-items: center; gap: 4px;"><i class="fa-solid fa-image"></i> ${label}</a>`;
                         }).join(' ');
                     }
-                    const pdfBtn = `<button type="button" class="btn-action btn-pdf" onclick='downloadPdfAcknowledgement(${JSON.stringify(item)})'><i class="fa-solid fa-file-arrow-down"></i> PDF Ack</button>`;
+
+                    const groupRefParam = item.itcell_ref_no || item.req_no || (item.items && item.items[0] ? item.items[0].req_no : '');
+                    const pdfBtn = `<button type="button" class="btn-action btn-pdf mb-1" style="font-size: 11px; padding: 4px 8px;" onclick="downloadOutwardGroupPdfAck('${encodeURIComponent(groupRefParam)}')"><i class="fa-solid fa-file-arrow-down"></i> PDF Ack</button>`;
+
+                    const modelsCountBadge = item.items && item.items.length > 1
+                        ? `<br><span class="badge bg-light text-secondary border mt-1" style="cursor: pointer;" onclick="showOutwardBreakdownModal('${encodeURIComponent(groupRefParam)}');" title="Click to view ${item.items.length} toners"><i class="fa-solid fa-layer-group me-1"></i>${item.items.length} Toners</span>`
+                        : (item.items && item.items.length === 1 ? `<br><small class="text-muted font-monospace">${escapeHtml(item.items[0].model_name || '')}</small>` : '');
+
+                    const refLink = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-primary font-monospace" style="border-bottom: 1px dashed #0f5c78; cursor: pointer; font-size: 0.95rem;" onclick="showOutwardBreakdownModal('${encodeURIComponent(groupRefParam)}'); return false;" title="Click to view distributed toner breakdown">${escapeHtml(item.itcell_ref_no || item.req_no || '-')}</a>`;
 
                     tr.innerHTML = `
                         <td class="fw-semibold text-secondary">${globalIdx}</td>
-                        <td class="fw-bold text-dark">${escapeHtml(item.req_no)}</td>
-                        <td>${escapeHtml(item.dept_name)}</td>
-                        <td>${escapeHtml(item.printer_name || '-')}</td>
-                        <td><span class="badge-toner-model">${escapeHtml(item.model_name || '-')}</span></td>
-                        <td class="text-center font-monospace fw-bold">${item.qty_requested}</td>
+                        <td>${refLink}${modelsCountBadge}</td>
+                        <td>${escapeHtml(item.dept_name || '-')}</td>
+                        <td>${escapeHtml(item.zone_name || '-')}</td>
+                        <td class="text-center font-monospace fw-bold text-dark">${item.qty_requested}</td>
                         <td class="text-center text-success fw-bold font-monospace">${item.qty_delivered || 0}</td>
                         <td><small class="text-dark fw-semibold">${reqDateFormatted}</small></td>
-                        <td><small class="text-dark fw-semibold">${dateFormatted}</small></td>
+                        <td><small class="text-muted fw-semibold">${dateFormatted}</small></td>
                         <td class="text-center">${docBtn}${photoBtn}${pdfBtn}</td>
                     `;
                     tbody.appendChild(tr);
@@ -5975,11 +6452,20 @@
 
         // ================= EXPORT TO EXCEL LOGIC =================
         function exportReportToExcel() {
-            const reportTitleEl = document.getElementById('report-dynamic-title');
-            let rawTitle = reportTitleEl ? reportTitleEl.innerText.trim() : "Toner_Report";
+            let table = document.querySelector("#dynamic-report-card table");
+            let rawTitle = "Toner_Report";
+
+            const reqPanel = document.getElementById('panel-request');
+            if (reqPanel && reqPanel.classList.contains('active')) {
+                table = reqPanel.querySelector(".grid-table");
+                rawTitle = "User_Request_Details_History";
+            } else {
+                const reportTitleEl = document.getElementById('report-dynamic-title');
+                if (reportTitleEl) rawTitle = reportTitleEl.innerText.trim();
+            }
+
             let cleanFileName = rawTitle.replace(/[^a-zA-Z0-9]/g, "_") + "_" + new Date().toISOString().slice(0, 10) + ".xlsx";
 
-            const table = document.querySelector("#dynamic-report-card table");
             if (!table) {
                 showNotification('warning', 'Export Warning', 'No report table found to export.');
                 return;
@@ -6103,7 +6589,7 @@
                 })
                 .catch(err => {
                     console.error("Error loading inward history:", err);
-                    const errHtml = `<tr><td colspan="10" class="text-center text-danger py-4">Error loading inward details.</td></tr>`;
+                    const errHtml = `<tr><td colspan="12" class="text-center text-danger py-4">Error loading inward details.</td></tr>`;
                     if (document.getElementById('inward-history-table-body')) {
                         document.getElementById('inward-history-table-body').innerHTML = errHtml;
                     }
@@ -6120,69 +6606,97 @@
                 thead.innerHTML = `
                     <tr>
                         <th>Sr. No.</th>
-                        ${getInwardSortHeader('Workorder Ref', 'ref_no')}
                         ${getInwardSortHeader('File No.', 'file_number')}
+                        ${getInwardSortHeader('Workorder Ref', 'ref_no')}
                         ${getInwardSortHeader('Company Name', 'company_name')}
+                        ${getInwardSortHeader('DC No.', 'dc_no')}
                         ${getInwardSortHeader('Printer Model', 'printer_name')}
                         ${getInwardSortHeader('Qty Registered', 'qty_workorder_registered', 'text-center')}
                         ${getInwardSortHeader('Qty Inward', 'qty_registered', 'text-center')}
+                        ${getInwardSortHeader('DC Date', 'dc_date')}
                         ${getInwardSortHeader('Created Date', 'cdate')}
                         ${getInwardSortHeader('Entered By', 'order_by')}
                         ${showDoc ? '<th class="text-center">DC Document</th>' : ''}
                     </tr>`;
             }
 
-            // Group records by ref_no + pid
+            // Group records by distinct DC delivery transaction
             const groups = {};
             (data || []).forEach(item => {
                 const cleanRef = (item.ref_no || '').trim();
-                const key = `${cleanRef || 'general'}_${item.pid || 0}`;
+                const cleanFile = (item.file_number || '').trim();
+                const cleanDcNo = (item.dc_no || '').trim();
+                const cleanDcUpload = (item.dc_upload || item.dc_uploads || '').toString().trim();
+                const cdateKey = item.cdate ? String(item.cdate).substring(0, 19) : '';
+
+                // Unique group key per DC delivery upload transaction:
+                const key = `${cleanRef || 'general'}_${cleanDcNo || 'nodc'}_${cleanDcUpload || ('item_' + (item.id || Math.random()))}_${cdateKey}`;
+
                 if (!groups[key]) {
                     groups[key] = {
+                        key: key,
                         ref_no: cleanRef,
-                        file_number: item.file_number || '',
+                        file_number: cleanFile,
                         company_name: item.company_name,
+                        vendor_name: item.vendor_name || vendorsMap[item.company_name] || item.company_name || '',
                         pid: item.pid,
                         printer_name: item.printer_name || 'N/A',
+                        printer_names: [],
+                        model_names: [],
                         qty_workorder_registered: 0,
                         qty_registered: 0,
+                        dc_no: cleanDcNo || '-',
+                        dc_date: item.dc_date || '',
                         cdate: item.cdate,
-                        order_by: item.order_by,
-                        dc_uploads: []
+                        order_by: item.order_by || item.updated_by || '',
+                        dc_uploads: [],
+                        items: []
                     };
                 }
-                if (item.file_number && !groups[key].file_number) {
-                    groups[key].file_number = item.file_number;
+
+                if (cleanFile && !groups[key].file_number) {
+                    groups[key].file_number = cleanFile;
                 }
-                groups[key].qty_workorder_registered += parseInt(item.qty_workorder_registered || 0);
-                groups[key].qty_registered += parseInt(item.qty_registered || 0);
 
+                const qty = parseInt(item.qty_registered || item.inward_qty || 0) || 0;
+                groups[key].qty_registered += qty;
+                groups[key].qty_workorder_registered += parseInt(item.qty_workorder_registered || 0) || 0;
+                groups[key].items.push(item);
+
+                if (item.printer_name && !groups[key].printer_names.includes(item.printer_name)) {
+                    groups[key].printer_names.push(item.printer_name);
+                }
+                if (item.model_name && !groups[key].model_names.includes(item.model_name)) {
+                    groups[key].model_names.push(item.model_name);
+                }
+                if (item.dc_date && !groups[key].dc_date) {
+                    groups[key].dc_date = item.dc_date;
+                }
                 if (item.cdate && (!groups[key].cdate || new Date(item.cdate) > new Date(groups[key].cdate))) {
                     groups[key].cdate = item.cdate;
+                }
+                if (item.order_by && !groups[key].order_by) {
                     groups[key].order_by = item.order_by;
                 }
-                if (item.dc_uploads) {
-                    const files = item.dc_uploads.split(',').filter(Boolean);
-                    files.forEach(f => {
-                        if (!groups[key].dc_uploads.includes(f)) {
-                            groups[key].dc_uploads.push(f);
-                        }
-                    });
-                } else if (item.dc_upload) {
-                    const files = item.dc_upload.split(',').filter(Boolean);
+
+                const rawDc = item.dc_upload || item.dc_uploads;
+                if (rawDc) {
+                    const files = Array.isArray(rawDc) ? rawDc : String(rawDc).split(',').map(s => s.trim()).filter(Boolean);
                     files.forEach(f => {
-                        if (!groups[key].dc_uploads.includes(f)) {
+                        if (f && !groups[key].dc_uploads.includes(f)) {
                             groups[key].dc_uploads.push(f);
                         }
                     });
                 }
             });
+
+            inwardTableGroupsCached = groups;
             const groupedList = Object.values(groups);
 
             let filtered = groupedList.filter(item => {
                 if (!inwardSearchQuery) return true;
                 const vendorName = vendorsMap[item.company_name] || (!isNaN(item.company_name) ? '' : (item.company_name || ''));
-                const searchStr = `${item.ref_no || ''} ${item.file_number || ''} ${vendorName} ${item.printer_name || ''} ${item.order_by || ''}`.toLowerCase();
+                const searchStr = `${item.ref_no || ''} ${item.file_number || ''} ${vendorName} ${item.dc_no || ''} ${item.printer_name || ''} ${item.order_by || ''}`.toLowerCase();
                 return searchStr.includes(inwardSearchQuery);
             });
 
@@ -6218,7 +6732,7 @@
             const totalPages = Math.ceil(filtered.length / inwardPageSize) || 1;
             inwardCurrentPage = Math.min(Math.max(1, inwardCurrentPage), totalPages);
 
-            const colSpan = showDoc ? 10 : 9;
+            const colSpan = showDoc ? 12 : 11;
             if (filtered.length === 0) {
                 tbody.innerHTML = `<tr><td colspan="${colSpan}" class="text-center text-muted py-4">No inward records found.</td></tr>`;
                 renderTablePaginationNav('inward-pagination-info', 'inward-pagination-nav', inwardCurrentPage, inwardPageSize, 1, 0, (p) => renderInwardTable(tbodyId, data, showDoc, p));
@@ -6231,6 +6745,7 @@
                 const tr = document.createElement('tr');
                 const globalIdx = (inwardCurrentPage - 1) * inwardPageSize + index + 1;
                 const createdDate = formatTimestamp(item.cdate);
+                const dcDateFormatted = (item.dc_date && String(item.dc_date).trim() !== '' && String(item.dc_date).trim() !== 'null') ? formatDateOnly(item.dc_date) : '-';
                 let docBtn = '-';
                 if (showDoc && item.dc_uploads && item.dc_uploads.length > 0) {
                     docBtn = item.dc_uploads.map((file, i) => {
@@ -6240,17 +6755,33 @@
                 }
 
                 const vendorName = vendorsMap[item.company_name] || (!isNaN(item.company_name) ? 'Unknown Vendor (' + item.company_name + ')' : (item.company_name || ''));
-                const refLink = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-secondary" style="border-bottom: 1px dashed #64748b;" onclick="showWorkorderRequestsBreakdownModal('${escapeHtml(item.ref_no)}', ${item.pid}); return false;">${escapeHtml(item.ref_no || '')}</a>`;
+                const groupKeyParam = encodeURIComponent(item.key || '');
+
+                const modelsCountBadge = item.items && item.items.length > 1
+                    ? `<br><span class="badge bg-light text-secondary border mt-1" style="cursor: pointer;" onclick="showInwardHistoryBreakdownModal('${encodeURIComponent(item.file_number || '')}', '${encodeURIComponent(item.ref_no || '')}', '${groupKeyParam}');" title="Click to view ${item.items.length} toners in this DC"><i class="fa-solid fa-layer-group me-1"></i>${item.items.length} Toners</span>`
+                    : (item.items && item.items.length === 1 ? `<br><small class="text-muted font-monospace">${escapeHtml(item.items[0].model_name || '')}</small>` : '');
+
+                const fileNoLink = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-primary font-monospace" style="border-bottom: 1px dashed #0f5c78; cursor: pointer; font-size: 0.95rem;" onclick="showInwardHistoryBreakdownModal('${encodeURIComponent(item.file_number || '')}', '${encodeURIComponent(item.ref_no || '')}', '${groupKeyParam}'); return false;" title="Click to view DC toners breakdown">${escapeHtml(item.file_number || item.ref_no || '-')}</a>`;
+
+                const refLink = item.ref_no
+                    ? `<a href="#" class="fw-semibold text-decoration-none text-dark font-monospace" style="cursor: pointer;" onclick="showInwardHistoryBreakdownModal('${encodeURIComponent(item.file_number || '')}', '${encodeURIComponent(item.ref_no || '')}', '${groupKeyParam}'); return false;" title="Click to view DC toners breakdown">${escapeHtml(item.ref_no)}</a>`
+                    : '-';
+
+                const printerDisplay = item.printer_names && item.printer_names.length > 1
+                    ? item.printer_names.join(', ')
+                    : (item.printer_name || (item.printer_names && item.printer_names[0]) || 'N/A');
 
                 let rowHtml = `
                     <td class="fw-semibold text-secondary">${globalIdx}</td>
-                    <td class="fw-bold text-dark">${refLink}</td>
-                    <td class="fw-bold text-dark">${escapeHtml(item.file_number || '-')}</td>
+                    <td>${fileNoLink}${modelsCountBadge}</td>
+                    <td>${refLink}</td>
                     <td class="fw-bold text-dark">${escapeHtml(vendorName)}</td>
-                    <td>${escapeHtml(item.printer_name || '-')}</td>
-                    <td class="text-center text-primary fw-bold font-monospace">${item.qty_workorder_registered || 0}</td>
+                    <td class="fw-semibold text-dark font-monospace">${escapeHtml(item.dc_no || '-')}</td>
+                    <td>${escapeHtml(printerDisplay)}</td>
+                    <td class="text-center text-secondary font-monospace">${item.qty_workorder_registered > 0 ? item.qty_workorder_registered : '-'}</td>
                     <td class="text-center text-primary fw-bold font-monospace">${item.qty_registered}</td>
-                    <td><small class="text-dark fw-semibold">${createdDate}</small></td>
+                    <td><small class="text-dark fw-semibold">${dcDateFormatted}</small></td>
+                    <td><small class="text-muted fw-semibold">${createdDate}</small></td>
                     <td><small class="text-muted">${escapeHtml(item.order_by || '-')}</small></td>
                 `;
                 if (showDoc) {
@@ -6544,28 +7075,40 @@
             if (!tbody) return;
             if (typeof targetPage === 'number') userReqCurrentPage = targetPage;
 
-            // Group records by itcell_ref_no + pid
+            // Group records purely by itcell_ref_no
             const groups = {};
             (data || []).forEach(item => {
-                //console.log(item);
                 const cleanRef = (item.itcell_ref_no || '').trim();
-                const key = `${cleanRef || 'general'}_${item.pid || 0}`;
+                const key = cleanRef || ('id_' + (item.id || Math.random()));
                 if (!groups[key]) {
                     groups[key] = {
                         itcell_ref_no: cleanRef,
                         dept_name: item.dept_name || 'N/A',
+                        dept_id: item.dept_id,
                         zone_name: item.zone_name || 'N/A',
+                        zone_id: item.zone_id,
                         pid: item.pid,
                         printer_name: item.printer_name || 'N/A',
+                        printer_names: [],
                         qty_requested: 0,
                         qty_delivered: 0,
+                        request_date: item.request_date || '',
                         cdate: item.cdate,
                         user_request_uploads: [],
-                        req_nos: []
+                        req_nos: [],
+                        items: []
                     };
                 }
                 groups[key].qty_requested += parseInt(item.qty_requested || 0);
                 groups[key].qty_delivered += parseInt(item.qty_delivered || 0);
+                groups[key].items.push(item);
+
+                if (item.printer_name && String(item.printer_name).trim()) {
+                    const pName = String(item.printer_name).trim();
+                    if (!groups[key].printer_names.includes(pName)) {
+                        groups[key].printer_names.push(pName);
+                    }
+                }
 
                 if (item.req_no && String(item.req_no).trim()) {
                     const cleanReqNo = String(item.req_no).trim();
@@ -6574,6 +7117,10 @@
                     }
                 }
 
+                if (item.request_date && !groups[key].request_date) {
+                    groups[key].request_date = item.request_date;
+                }
+
                 if (item.cdate && (!groups[key].cdate || new Date(item.cdate) > new Date(groups[key].cdate))) {
                     groups[key].cdate = item.cdate;
                 }
@@ -6588,12 +7135,13 @@
             });
             const groupedList = Object.values(groups);
 
-            // Filter by Request No, Department, Zone, Printer Model, and Month first (applies to metrics and table)
+            // Filter by Request No / IT Cell Ref, Department, Zone, Printer Model, and Month
             const deptMonthFiltered = groupedList.filter(item => {
                 if (userReqNoFilter) {
                     const filterVal = userReqNoFilter.trim().toLowerCase();
                     const hasReqNo = (item.req_nos && item.req_nos.some(rn => rn.toLowerCase() === filterVal)) ||
-                        (item.req_no && item.req_no.toLowerCase() === filterVal);
+                        (item.req_no && item.req_no.toLowerCase() === filterVal) ||
+                        (item.itcell_ref_no && item.itcell_ref_no.toLowerCase() === filterVal);
                     if (!hasReqNo) {
                         return false;
                     }
@@ -6611,12 +7159,14 @@
                     }
                 }
                 if (userReqPrinterFilter) {
-                    if (String(item.pid) !== String(userReqPrinterFilter)) {
+                    const hasPrinter = item.items && item.items.some(it => String(it.pid) === String(userReqPrinterFilter));
+                    if (!hasPrinter && String(item.pid) !== String(userReqPrinterFilter)) {
                         return false;
                     }
                 }
                 if (userReqMonthFilter) {
-                    const itemYm = getUserReqYearMonth(item.cdate);
+                    const dateToCheck = item.request_date || item.cdate;
+                    const itemYm = getUserReqYearMonth(dateToCheck);
                     if (itemYm !== userReqMonthFilter) {
                         return false;
                     }
@@ -6624,7 +7174,7 @@
                 return true;
             });
 
-            // Update status counts on the metric cards based on Request No, Department & Month filter
+            // Update status counts on the metric cards based on filters
             const totalCount = deptMonthFiltered.length;
             let deliveredCount = 0;
             let partialCount = 0;
@@ -6657,13 +7207,12 @@
                 thead.innerHTML = `
                     <tr>
                         <th>S.No</th>
-                        ${getUserReqSortHeader('Req. No', 'req_no')}
                         ${getUserReqSortHeader('IT Cell Ref No', 'itcell_ref_no')}
                         ${getUserReqSortHeader('Department', 'dept_name')}
                         ${getUserReqSortHeader('Zone', 'zone_name')}
-                        ${getUserReqSortHeader('Printer Model', 'printer_name')}
                         ${getUserReqSortHeader('Department Qty Requested', 'qty_requested', 'text-center')}
                         ${getUserReqSortHeader('Qty Delivered', 'qty_delivered', 'text-center')}
+                        ${getUserReqSortHeader('Requested Date', 'request_date')}
                         ${getUserReqSortHeader('Created Date', 'cdate')}
                         <th class="text-center">Status</th>
                         ${showDoc ? '<th class="text-center">Request Doc</th>' : ''}
@@ -6684,7 +7233,8 @@
 
                 if (!userReqSearchQuery) return true;
                 const reqNosStr = (item.req_nos || []).join(' ');
-                const searchStr = `${reqNosStr} ${item.req_no || ''} ${item.itcell_ref_no || ''} ${item.dept_id || ''} ${item.zone_name || ''} ${item.printer_name || ''}`.toLowerCase();
+                const printerNamesStr = (item.printer_names || []).join(' ');
+                const searchStr = `${reqNosStr} ${item.itcell_ref_no || ''} ${item.dept_name || ''} ${item.dept_id || ''} ${item.zone_name || ''} ${printerNamesStr}`.toLowerCase();
                 return searchStr.includes(userReqSearchQuery);
             });
 
@@ -6695,14 +7245,12 @@
                     if (userReqSortColumn === 'qty_requested' || userReqSortColumn === 'qty_delivered') {
                         valA = parseInt(valA || 0);
                         valB = parseInt(valB || 0);
-                    } else if (userReqSortColumn === 'cdate') {
+                    } else if (userReqSortColumn === 'cdate' || userReqSortColumn === 'request_date') {
                         valA = valA ? new Date(valA).getTime() : 0;
                         valB = valB ? new Date(valB).getTime() : 0;
-                    } else if (userReqSortColumn === 'req_no') {
-                        valA = (a.req_nos && a.req_nos.length > 0) ? a.req_nos.join(', ') : (a.req_no || '');
-                        valB = (b.req_nos && b.req_nos.length > 0) ? b.req_nos.join(', ') : (b.req_no || '');
-                        valA = valA.toLowerCase();
-                        valB = valB.toLowerCase();
+                    } else if (userReqSortColumn === 'itcell_ref_no') {
+                        valA = (a.itcell_ref_no || '').toString().toLowerCase();
+                        valB = (b.itcell_ref_no || '').toString().toLowerCase();
                     } else {
                         valA = (valA || '').toString().toLowerCase();
                         valB = (valB || '').toString().toLowerCase();
@@ -6720,7 +7268,7 @@
             const totalPages = Math.ceil(filtered.length / userReqPageSize) || 1;
             userReqCurrentPage = Math.min(Math.max(1, userReqCurrentPage), totalPages);
 
-            const colSpan = showDoc ? 12 : 11;
+            const colSpan = showDoc ? 11 : 10;
             if (filtered.length === 0) {
                 tbody.innerHTML = `<tr><td colspan="${colSpan}" class="text-center text-muted py-4">No request records found.</td></tr>`;
                 renderTablePaginationNav('user-req-pagination-info', 'user-req-pagination-nav', userReqCurrentPage, userReqPageSize, 1, 0, (p) => renderUserRequestsTable(tbodyId, data, showDoc, p));
@@ -6733,6 +7281,9 @@
                 const tr = document.createElement('tr');
                 const globalIdx = (userReqCurrentPage - 1) * userReqPageSize + index + 1;
                 const createdDate = formatTimestamp(item.cdate);
+                const reqDateFormatted = (item.request_date && String(item.request_date).trim() !== '' && String(item.request_date).trim() !== 'null')
+                    ? formatDateOnly(item.request_date)
+                    : '-';
                 const reqQty = parseInt(item.qty_requested || 0);
                 const delQty = parseInt(item.qty_delivered || 0);
 
@@ -6751,29 +7302,17 @@
                     }
                 }
 
-                const refLink = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-secondary" style="border-bottom: 1px dashed #64748b;" onclick="showUserRequestBreakdownModal('${escapeHtml(item.itcell_ref_no)}', ${item.pid}); return false;">${escapeHtml(item.itcell_ref_no || '')}</a>`;
-
-                let reqNoHtml = '-';
-                if (item.req_nos && item.req_nos.length > 4) {
-                    const shown = item.req_nos.slice(0, 3).map(escapeHtml).join(', ');
-                    const remaining = item.req_nos.length - 3;
-                    reqNoHtml = `${shown}, <a href="#" class="badge bg-light text-primary border ms-1" style="cursor: pointer; text-decoration: none; font-size: 11px; vertical-align: middle;" onclick="showUserRequestBreakdownModal('${escapeHtml(item.itcell_ref_no)}', ${item.pid}); return false;" title="Click to view all ${item.req_nos.length} requests">... (+${remaining} more)</a>`;
-                } else if (item.req_nos && item.req_nos.length > 0) {
-                    reqNoHtml = item.req_nos.map(escapeHtml).join(', ');
-                } else if (item.req_no) {
-                    reqNoHtml = escapeHtml(item.req_no);
-                }
+                const refLink = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-primary" style="border-bottom: 1px dashed #0f5c78; cursor: pointer;" onclick="showUserRequestBreakdownModal('${encodeURIComponent(item.itcell_ref_no || item.req_no || '')}'); return false;" title="Click to view all requested printer models and toners">${escapeHtml(item.itcell_ref_no || '-')}</a>`;
 
                 let rowHtml = `
                     <td class="fw-semibold text-secondary">${globalIdx}</td>
-                    <td class="fw-bold text-dark font-monospace">${reqNoHtml}</td>
                     <td class="fw-bold text-dark">${refLink}</td>
-                    <td>${escapeHtml(item.dept_name)}</td>
+                    <td>${escapeHtml(item.dept_name)}</td> 
                     <td>${escapeHtml(item.zone_name)}</td>
-                    <td>${escapeHtml(item.printer_name || '-')}</td>
-                    <td class="text-center font-monospace fw-bold">${item.qty_requested}</td>
+                    <td class="text-center font-monospace fw-bold text-dark">${item.qty_requested}</td>
                     <td class="text-center text-success font-monospace fw-bold">${item.qty_delivered || 0}</td>
-                    <td><small class="text-dark fw-semibold">${createdDate}</small></td>
+                    <td><small class="text-dark fw-semibold">${reqDateFormatted}</small></td>
+                    <td><small class="text-muted fw-semibold">${createdDate}</small></td>
                     <td class="text-center">${statusBadge}</td>
                 `;
                 if (showDoc) {
@@ -6781,18 +7320,10 @@
                 }
                 rowHtml += `
                     <td class="text-center" style="white-space: nowrap;">
-                        <!--
-                        <button type="button" class="btn btn-sm btn-primary fw-bold px-2 py-1 me-1" 
-                                style="border-radius: 20px; font-size: 11px; background-color: #0f5c78; border-color: #0f5c78; box-shadow: 0 2px 4px rgba(15, 92, 120, 0.15);"
-                                onclick="showUserRequestBreakdownModal('${escapeHtml(item.itcell_ref_no)}', ${item.pid})"
-                                title="Click to view all requested models for this reference">
-                            <i class="fa-solid fa-eye"></i> View
-                        </button>
-                        -->
                         <button type="button" class="btn btn-sm btn-outline-warning text-dark fw-bold px-2 py-1" 
                                 style="border-radius: 20px; font-size: 11px; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);"
-                                onclick="openEditUserRequestByGroup('${escapeHtml(item.itcell_ref_no)}', ${item.pid})"
-                                title="Edit this user request">
+                                onclick="openEditUserRequestByGroup('${escapeHtml(item.itcell_ref_no)}')"
+                                title="Edit requested models">
                             <i class="fa-solid fa-pen-to-square"></i> Edit
                         </button>
                     </td>
@@ -6864,22 +7395,82 @@
             if (thead) {
                 thead.innerHTML = `
                     <tr>
-                        <th>S.No</th>
-                        ${getOutwardSortHeader('Req. No', 'req_no')} 
+                        <th style="width: 60px;">S.No</th>
+                        ${getOutwardSortHeader('Req. No / IT Cell Ref', 'itcell_ref_no')} 
                         ${getOutwardSortHeader('Department', 'dept_name')}
-                        ${getOutwardSortHeader('Printer Model', 'printer_name')}
-                        ${getOutwardSortHeader('Toner Model', 'model_name')}
-                        ${getOutwardSortHeader('Qty Req', 'qty_requested', 'text-center')}
-                        ${getOutwardSortHeader('Qty Issued', 'qty_delivered', 'text-center')}
+                        ${getOutwardSortHeader('Total Qty Req', 'qty_requested', 'text-center')}
+                        ${getOutwardSortHeader('Total Qty Issued', 'qty_delivered', 'text-center')}
                         ${getOutwardSortHeader('Requested Date', 'cdate')}
-                        ${getOutwardSortHeader('Issued Date', 'updated_date')}
+                        ${getOutwardSortHeader('Outward Date', 'outward_date')}
                         <th class="text-center">Action</th>
                     </tr>`;
             }
 
-            let filtered = (data || []).filter(item => {
+            // Group outward records by IT Cell Ref No / Req No
+            const groups = {};
+            (data || []).forEach(item => {
+                const cleanRef = (item.itcell_ref_no && String(item.itcell_ref_no).trim() !== '' && String(item.itcell_ref_no).trim() !== 'null')
+                    ? String(item.itcell_ref_no).trim()
+                    : (item.req_no && String(item.req_no).trim() !== '' ? String(item.req_no).trim() : ('OUT-' + item.id));
+
+                const key = cleanRef;
+                if (!groups[key]) {
+                    groups[key] = {
+                        groupKey: key,
+                        itcell_ref_no: item.itcell_ref_no || '',
+                        req_no: item.req_no || '',
+                        dept_name: item.dept_name || item.dept_id || '-',
+                        zone_name: item.zone_name || item.zone_id || '',
+                        qty_requested: 0,
+                        qty_delivered: 0,
+                        cdate: item.cdate || null,
+                        request_date: item.request_date || null,
+                        outward_date: item.outward_date || null,
+                        updated_date: item.updated_date || null,
+                        final_delivered_uploads: [],
+                        receiver_photos: [],
+                        items: []
+                    };
+                }
+                groups[key].qty_requested += parseInt(item.qty_requested || 0);
+                groups[key].qty_delivered += parseInt(item.qty_delivered || 0);
+                groups[key].items.push(item);
+
+                if (item.request_date && !groups[key].request_date) {
+                    groups[key].request_date = item.request_date;
+                }
+                if (item.outward_date && !groups[key].outward_date) {
+                    groups[key].outward_date = item.outward_date;
+                }
+                if (item.cdate && (!groups[key].cdate || new Date(item.cdate) > new Date(groups[key].cdate))) {
+                    groups[key].cdate = item.cdate;
+                }
+                if (item.updated_date && (!groups[key].updated_date || new Date(item.updated_date) > new Date(groups[key].updated_date))) {
+                    groups[key].updated_date = item.updated_date;
+                }
+                if (item.final_delivered_upload) {
+                    const paths = item.final_delivered_upload.split(',').map(p => p.trim()).filter(Boolean);
+                    paths.forEach(p => {
+                        if (!groups[key].final_delivered_uploads.includes(p)) {
+                            groups[key].final_delivered_uploads.push(p);
+                        }
+                    });
+                }
+                if (item.receiver_photo) {
+                    const photos = item.receiver_photo.split(',').map(p => p.trim()).filter(Boolean);
+                    photos.forEach(p => {
+                        if (!groups[key].receiver_photos.includes(p)) {
+                            groups[key].receiver_photos.push(p);
+                        }
+                    });
+                }
+            });
+            const groupedList = Object.values(groups);
+
+            let filtered = groupedList.filter(item => {
                 if (!outwardSearchQuery) return true;
-                const searchStr = `${item.req_no || ''} ${item.dept_name || ''} ${item.printer_name || ''} ${item.model_name || ''}`.toLowerCase();
+                const itemsSearchStr = (item.items || []).map(it => `${it.req_no || ''} ${it.printer_name || ''} ${it.model_name || ''} ${it.part_code || ''}`).join(' ');
+                const searchStr = `${item.itcell_ref_no || ''} ${item.req_no || ''} ${item.dept_name || ''} ${item.zone_name || ''} ${itemsSearchStr}`.toLowerCase();
                 return searchStr.includes(outwardSearchQuery);
             });
 
@@ -6890,7 +7481,7 @@
                     if (outwardSortColumn === 'qty_requested' || outwardSortColumn === 'qty_delivered') {
                         valA = parseInt(valA || 0);
                         valB = parseInt(valB || 0);
-                    } else if (outwardSortColumn === 'cdate' || outwardSortColumn === 'updated_date') {
+                    } else if (outwardSortColumn === 'cdate' || outwardSortColumn === 'request_date' || outwardSortColumn === 'updated_date' || outwardSortColumn === 'outward_date') {
                         valA = valA ? new Date(valA).getTime() : 0;
                         valB = valB ? new Date(valB).getTime() : 0;
                     } else {
@@ -6911,7 +7502,7 @@
             outwardCurrentPage = Math.min(Math.max(1, outwardCurrentPage), totalPages);
 
             if (filtered.length === 0) {
-                tbody.innerHTML = `<tr><td colspan="10" class="text-center text-muted py-4">No outward records found.</td></tr>`;
+                tbody.innerHTML = `<tr><td colspan="8" class="text-center text-muted py-4">No outward records found.</td></tr>`;
                 renderTablePaginationNav('outward-pagination-info', 'outward-pagination-nav', outwardCurrentPage, outwardPageSize, 1, 0, (p) => renderOutwardTable(tbodyId, data, p));
                 return;
             }
@@ -6921,41 +7512,62 @@
             pagedData.forEach((item, index) => {
                 const tr = document.createElement('tr');
                 const globalIdx = (outwardCurrentPage - 1) * outwardPageSize + index + 1;
-                const reqDateFormatted = formatTimestamp(item.cdate);
-                const dateFormatted = formatTimestamp(item.updated_date);
+                const reqDateFormatted = (item.request_date && String(item.request_date).trim() !== '' && String(item.request_date).trim() !== 'null')
+                    ? formatDateOnly(item.request_date)
+                    : formatTimestamp(item.cdate);
+                const dateFormatted = (item.outward_date && String(item.outward_date).trim() !== '' && String(item.outward_date).trim() !== 'null')
+                    ? formatDateOnly(item.outward_date)
+                    : formatTimestamp(item.updated_date);
                 let docBtn = '';
-                if (item.final_delivered_upload) {
-                    const paths = item.final_delivered_upload.split(',');
-                    docBtn = paths.map((p, index) => {
+                if (item.final_delivered_uploads && item.final_delivered_uploads.length > 0) {
+                    docBtn = item.final_delivered_uploads.map((p, pIdx) => {
                         const trimmed = p.trim();
                         const url = trimmed.startsWith('.') ? trimmed.substring(1) : trimmed;
-                        const label = paths.length > 1 ? `View Doc ${index + 1}` : `View Doc`;
+                        const label = item.final_delivered_uploads.length > 1 ? `Doc ${pIdx + 1}` : `View Doc`;
                         return `<a href="${contextPath + url}" target="_blank" class="btn-action btn-view-doc me-1 mb-1" style="display: inline-flex; align-items: center; gap: 4px;"><i class="fa-solid fa-file-pdf"></i> ${label}</a>`;
                     }).join(' ');
                 }
                 let photoBtn = '';
-                if (item.receiver_photo) {
-                    const photos = item.receiver_photo.split(',');
-                    photoBtn = photos.map((p, pIdx) => {
+                if (item.receiver_photos && item.receiver_photos.length > 0) {
+                    photoBtn = item.receiver_photos.map((p, pIdx) => {
                         const trimmed = p.trim();
                         const url = trimmed.startsWith('.') ? trimmed.substring(1) : trimmed;
-                        const label = photos.length > 1 ? `View Photo ${pIdx + 1}` : `View Photo`;
+                        const label = item.receiver_photos.length > 1 ? `Photo ${pIdx + 1}` : `View Photo`;
                         return `<a href="${contextPath + url}" target="_blank" class="btn-action btn-view-photo me-1 mb-1" style="display: inline-flex; align-items: center; gap: 4px;"><i class="fa-solid fa-image"></i> ${label}</a>`;
                     }).join(' ');
                 }
-                const pdfBtn = `<button type="button" class="btn-action btn-pdf" onclick='downloadPdfAcknowledgement(${JSON.stringify(item)})'><i class="fa-solid fa-file-arrow-down"></i> PDF Ack</button>`;
+
+                const refIdentifier = item.itcell_ref_no || item.req_no || item.groupKey;
+                const encodedRef = encodeURIComponent(refIdentifier);
+                const viewBtn = `<button type="button" class="btn btn-sm btn-primary fw-bold px-3 py-1 me-1 mb-1" 
+                                        style="border-radius: 20px; font-size: 11px; background-color: #0f5c78; border-color: #0f5c78; box-shadow: 0 2px 4px rgba(15, 92, 120, 0.15);"
+                                        onclick="showOutwardBreakdownModal('${encodedRef}')"
+                                        title="Click to view all toners and models in this outward dispatch">
+                                    <i class="fa-solid fa-eye me-1"></i> View (${item.items.length})
+                                </button>`;
+
+                const pdfBtn = `<button type="button" class="btn-action btn-pdf me-1 mb-1" onclick="downloadOutwardGroupPdfAck('${encodedRef}')"><i class="fa-solid fa-file-arrow-down"></i> PDF Ack</button>`;
+
+                const refLink = `<a href="#" class="fw-bold text-decoration-none d-inline-block text-primary font-monospace" style="border-bottom: 1px dashed #0f5c78; cursor: pointer; font-size: 0.95rem;" onclick="showOutwardBreakdownModal('${encodedRef}'); return false;" title="Click to view all toners and models">${escapeHtml(item.itcell_ref_no || item.req_no || '-')}</a>`;
+
+                const subReqDisplay = (item.itcell_ref_no && item.req_no && item.items.length === 1)
+                    ? `<br><small class="text-muted font-monospace">${escapeHtml(item.req_no)}</small>`
+                    : (item.items.length > 1 ? `<br><span class="badge bg-light text-secondary border mt-1" style="cursor: pointer;" onclick="showOutwardBreakdownModal('${encodedRef}')"><i class="fa-solid fa-layer-group me-1"></i>${item.items.length} Models</span>` : '');
 
                 tr.innerHTML = `
                     <td class="fw-semibold text-secondary">${globalIdx}</td>
-                    <td class="fw-bold text-dark">${escapeHtml(item.req_no)}</td>
-                    <td>${escapeHtml(item.dept_name)}</td>
-                    <td>${escapeHtml(item.printer_name)}</td>
-                    <td><span class="badge-toner-model">${escapeHtml(item.model_name)}</span></td>
-                    <td class="text-center font-monospace fw-bold">${item.qty_requested}</td>
+                    <td>${refLink}${subReqDisplay}</td>
+                    <td>${escapeHtml(item.dept_name || '-')}</td>
+                    <td class="text-center font-monospace fw-bold text-dark">${item.qty_requested}</td>
                     <td class="text-center text-success fw-bold font-monospace">${item.qty_delivered}</td>
                     <td><small class="text-dark fw-semibold">${reqDateFormatted}</small></td>
-                    <td><small class="text-muted">${dateFormatted}</small></td>
-                    <td class="text-center">${docBtn}${photoBtn}${pdfBtn}</td>
+                    <td><small class="text-dark fw-semibold">${dateFormatted}</small></td>
+                    <td class="text-center" style="white-space: nowrap;">
+                        ${viewBtn}
+                        ${docBtn}
+                        ${photoBtn}
+                        ${pdfBtn}
+                    </td>
                 `;
                 tbody.appendChild(tr);
             });
@@ -6963,66 +7575,284 @@
             renderTablePaginationNav('outward-pagination-info', 'outward-pagination-nav', outwardCurrentPage, outwardPageSize, totalPages, filtered.length, (p) => renderOutwardTable(tbodyId, data, p));
         }
 
+        window.downloadOutwardItemPdfAck = function (id) {
+            const item = (outwardHistoryCached || []).find(it => String(it.id) === String(id)) ||
+                (userRequestsCached || []).find(it => String(it.id) === String(id));
+            if (item) {
+                downloadPdfAcknowledgement(item);
+            }
+        };
+
+        window.downloadOutwardGroupPdfAck = function (rawRef) {
+            const refIdentifier = decodeURIComponent(rawRef || '').trim();
+            const cleanRef = refIdentifier.toLowerCase();
+            const normRef = cleanRef.replace(/[\s\-_/]/g, '');
+
+            let filtered = (outwardHistoryCached || []).filter(item => {
+                const itemItcell = String(item.itcell_ref_no || '').trim().toLowerCase();
+                const itemReq = String(item.req_no || '').trim().toLowerCase();
+                const normItcell = itemItcell.replace(/[\s\-_/]/g, '');
+                const normReq = itemReq.replace(/[\s\-_/]/g, '');
+                const itemFallback = ('out-' + item.id).toLowerCase();
+                const itemId = String(item.id || '').trim().toLowerCase();
+
+                return (itemItcell && (itemItcell === cleanRef || (normRef && normItcell === normRef))) ||
+                    (itemReq && (itemReq === cleanRef || (normRef && normReq === normRef))) ||
+                    (itemFallback === cleanRef) ||
+                    (itemId === cleanRef) ||
+                    String(item.itcell_ref_no || '').trim() === refIdentifier ||
+                    String(item.req_no || '').trim() === refIdentifier;
+            });
 
+            if (filtered.length === 0 && userRequestsCached && userRequestsCached.length > 0) {
+                filtered = userRequestsCached.filter(item => {
+                    if (parseInt(item.qty_delivered || 0) <= 0) return false;
+                    const itemItcell = String(item.itcell_ref_no || '').trim().toLowerCase();
+                    const itemReq = String(item.req_no || '').trim().toLowerCase();
+                    const normItcell = itemItcell.replace(/[\s\-_/]/g, '');
+                    const normReq = itemReq.replace(/[\s\-_/]/g, '');
+
+                    return (itemItcell && (itemItcell === cleanRef || (normRef && normItcell === normRef))) ||
+                        (itemReq && (itemReq === cleanRef || (normRef && normReq === normRef))) ||
+                        String(item.itcell_ref_no || '').trim() === refIdentifier ||
+                        String(item.req_no || '').trim() === refIdentifier;
+                });
+            }
 
-        // ================= INWARD UPLOAD API =================
-        let vendorsMap = {};
-        let inwardRequestItems = [];
-
-        function loadVendorsMap(callback) {
-            if (Object.keys(vendorsMap).length > 0) {
-                if (callback) callback();
-                return;
+            if (filtered.length > 0) {
+                const first = filtered[0];
+                const groupObj = {
+                    itcell_ref_no: first.itcell_ref_no || refIdentifier,
+                    req_no: first.req_no || refIdentifier,
+                    dept_name: first.dept_name || first.dept_id || '-',
+                    outward_date: first.outward_date || (first.updated_date ? formatDateOnly(first.updated_date) : '-'),
+                    items: filtered
+                };
+                downloadPdfAcknowledgement(groupObj);
             }
-            fetch(contextPath + 'gccservicepaymenttracker/api/vendors')
-                .then(res => res.json())
-                .then(data => {
-                    data.forEach(v => {
-                        vendorsMap[v.id] = v.vendor_name;
-                    });
-                    if (callback) callback();
-                })
-                .catch(err => console.error("Error loading vendors map:", err));
-        }
+        };
 
-        function fetchActiveWorkordersForInward() {
-            const select = document.getElementById('inward-ref-select');
-            if (!select) return;
-            select.innerHTML = '<option value="">-- Loading Workorders... --</option>';
+        function showOutwardBreakdownModal(rawRef) {
+            if (!rawRef) return;
+            const refIdentifier = decodeURIComponent(rawRef).trim();
+            const cleanRef = refIdentifier.toLowerCase();
+            const normRef = cleanRef.replace(/[\s\-_/]/g, '');
 
-            fetch(contextPath + 'gcctonermanagement/api/workorders/active')
-                .then(res => res.json())
-                .then(data => {
-                    select.innerHTML = '<option value="">-- Select Workorder Reference --</option>';
-                    data.forEach(ref => {
-                        const opt = document.createElement('option');
-                        opt.value = ref;
-                        opt.textContent = ref;
-                        select.appendChild(opt);
-                    });
-                })
-                .catch(err => {
-                    console.error("Error loading active workorders: ", err);
-                    select.innerHTML = '<option value="">-- Failed to load workorders --</option>';
+            const proceedWithRender = () => {
+                let filtered = (outwardHistoryCached || []).filter(item => {
+                    const itemItcell = String(item.itcell_ref_no || '').trim().toLowerCase();
+                    const itemReq = String(item.req_no || '').trim().toLowerCase();
+                    const normItcell = itemItcell.replace(/[\s\-_/]/g, '');
+                    const normReq = itemReq.replace(/[\s\-_/]/g, '');
+                    const itemFallback = ('out-' + item.id).toLowerCase();
+                    const itemId = String(item.id || '').trim().toLowerCase();
+
+                    return (itemItcell && (itemItcell === cleanRef || (normRef && normItcell === normRef))) ||
+                        (itemReq && (itemReq === cleanRef || (normRef && normReq === normRef))) ||
+                        (itemFallback === cleanRef) ||
+                        (itemId === cleanRef) ||
+                        String(item.itcell_ref_no || '').trim() === refIdentifier ||
+                        String(item.req_no || '').trim() === refIdentifier;
                 });
-        }
 
-        // Backward compatibility
-        function fetchActiveWorkorderRequests() {
-            fetchActiveWorkordersForInward();
-        }
+                if (filtered.length === 0 && userRequestsCached && userRequestsCached.length > 0) {
+                    filtered = userRequestsCached.filter(item => {
+                        if (parseInt(item.qty_delivered || 0) <= 0) return false;
+                        const itemItcell = String(item.itcell_ref_no || '').trim().toLowerCase();
+                        const itemReq = String(item.req_no || '').trim().toLowerCase();
+                        const normItcell = itemItcell.replace(/[\s\-_/]/g, '');
+                        const normReq = itemReq.replace(/[\s\-_/]/g, '');
+
+                        return (itemItcell && (itemItcell === cleanRef || (normRef && normItcell === normRef))) ||
+                            (itemReq && (itemReq === cleanRef || (normRef && normReq === normRef))) ||
+                            String(item.itcell_ref_no || '').trim() === refIdentifier ||
+                            String(item.req_no || '').trim() === refIdentifier;
+                    });
+                }
 
-        function onInwardWorkorderSelectChange(select) {
-            const refNo = select.value;
-            const cmpInput = document.getElementById('inward-company-name');
-            const tbody = document.getElementById('inward-items-tbody');
+                if (filtered.length === 0) {
+                    showNotification('warning', 'No Details', 'No outward items found for this reference.');
+                    return;
+                }
 
-            if (cmpInput) {
-                cmpInput.value = '';
-                cmpInput.removeAttribute('data-vendor-id');
-            }
-            if (tbody) {
-                tbody.innerHTML = '<tr><td colspan="4" class="text-center text-muted py-4">Please select a Workorder Reference to view registered models.</td></tr>';
+                const first = filtered[0];
+                const refDisplay = first.itcell_ref_no || first.req_no || refIdentifier;
+                document.getElementById('outward-breakdown-ref').textContent = refDisplay;
+                document.getElementById('outward-breakdown-dept').textContent = first.dept_name || first.dept_id || '-';
+
+                const outwardDateFormatted = (first.outward_date && String(first.outward_date).trim() !== '' && String(first.outward_date).trim() !== 'null')
+                    ? formatDateOnly(first.outward_date)
+                    : (formatTimestamp(first.updated_date) || '-');
+                document.getElementById('outward-breakdown-date').textContent = outwardDateFormatted;
+
+                let totalReq = 0;
+                let totalIssued = 0;
+                const tbody = document.getElementById('outward-breakdown-table-body');
+                tbody.innerHTML = '';
+
+                filtered.forEach((item, index) => {
+                    const reqQty = parseInt(item.qty_requested || 0);
+                    const delQty = parseInt(item.qty_delivered || 0);
+                    totalReq += reqQty;
+                    totalIssued += delQty;
+
+                    const reqDateFormatted = (item.request_date && String(item.request_date).trim() !== '' && String(item.request_date).trim() !== 'null')
+                        ? formatDateOnly(item.request_date)
+                        : (formatTimestamp(item.cdate) || '-');
+
+                    const itemOutwardDate = (item.outward_date && String(item.outward_date).trim() !== '' && String(item.outward_date).trim() !== 'null')
+                        ? formatDateOnly(item.outward_date)
+                        : (formatTimestamp(item.updated_date) || '-');
+
+                    let docBtn = '';
+                    if (item.final_delivered_upload) {
+                        const paths = item.final_delivered_upload.split(',');
+                        docBtn = paths.map((p, pIdx) => {
+                            const trimmed = p.trim();
+                            const url = trimmed.startsWith('.') ? trimmed.substring(1) : trimmed;
+                            const label = paths.length > 1 ? `Doc ${pIdx + 1}` : `View Doc`;
+                            return `<a href="${contextPath + url}" target="_blank" class="btn-action btn-view-doc me-1 mb-1" style="font-size: 11px; padding: 3px 8px; display: inline-flex; align-items: center; gap: 4px;"><i class="fa-solid fa-file-pdf"></i> ${label}</a>`;
+                        }).join(' ');
+                    }
+
+                    let photoBtn = '';
+                    if (item.receiver_photo) {
+                        const photos = item.receiver_photo.split(',');
+                        photoBtn = photos.map((p, pIdx) => {
+                            const trimmed = p.trim();
+                            const url = trimmed.startsWith('.') ? trimmed.substring(1) : trimmed;
+                            const label = photos.length > 1 ? `Photo ${pIdx + 1}` : `View Photo`;
+                            return `<a href="${contextPath + url}" target="_blank" class="btn-action btn-view-photo me-1 mb-1" style="font-size: 11px; padding: 3px 8px; display: inline-flex; align-items: center; gap: 4px;"><i class="fa-solid fa-image"></i> ${label}</a>`;
+                        }).join(' ');
+                    }
+
+                    const singlePdfBtn = `<button type="button" class="btn btn-sm btn-outline-danger fw-semibold px-2 py-1" style="border-radius: 6px; font-size: 11px; white-space: nowrap;" onclick="downloadOutwardItemPdfAck(${item.id})"><i class="fa-solid fa-file-pdf me-1"></i> PDF Ack</button>`;
+
+                    const tr = document.createElement('tr');
+                    tr.innerHTML = `
+                        <td class="fw-semibold text-secondary text-center">${index + 1}</td>
+                        <td class="fw-bold text-dark font-monospace">${escapeHtml(item.req_no || '-')}</td>
+                        <td>${escapeHtml(item.printer_name || '-')}</td>
+                        <td>
+                            <span class="badge-toner-model">${escapeHtml(item.model_name || '-')}</span>
+                            ${item.part_code ? `<small class="text-muted d-block font-monospace">${escapeHtml(item.part_code)}</small>` : ''}
+                        </td>
+                        <td class="text-center font-monospace fw-bold">${reqQty}</td>
+                        <td class="text-center text-success font-monospace fw-bold">${delQty}</td>
+                        <td><small class="text-dark fw-semibold">${reqDateFormatted}</small></td>
+                        <td><small class="text-dark fw-semibold">${itemOutwardDate}</small></td>
+                        <td class="text-center">${docBtn || photoBtn ? (docBtn + ' ' + photoBtn) : '<span class="text-muted">-</span>'}</td>
+                        
+                    `;
+                    tbody.appendChild(tr);
+                    // <td class="text-center">${singlePdfBtn}</td>
+                });
+
+                // Update modal summary badges
+                const totalReqEl = document.getElementById('outward-breakdown-total-req');
+                if (totalReqEl) totalReqEl.textContent = totalReq;
+                const totalIssuedEl = document.getElementById('outward-breakdown-total-issued');
+                if (totalIssuedEl) totalIssuedEl.textContent = totalIssued;
+
+                // Set grouped PDF Ack button action
+                const pdfAckBtn = document.getElementById('outward-breakdown-pdf-btn');
+                if (pdfAckBtn) {
+                    pdfAckBtn.onclick = function () {
+                        downloadOutwardGroupPdfAck(encodeURIComponent(refIdentifier));
+                    };
+                }
+
+                // Show Bootstrap Modal safely
+                const modalEl = document.getElementById('outwardBreakdownModal');
+                if (modalEl) {
+                    const myModal = bootstrap.Modal.getOrCreateInstance(modalEl);
+                    myModal.show();
+                }
+            };
+
+            if (!outwardHistoryCached || outwardHistoryCached.length === 0) {
+                fetch(contextPath + 'gcctonermanagement/api/outward/list')
+                    .then(res => res.json())
+                    .then(data => {
+                        outwardHistoryCached = data || [];
+                        proceedWithRender();
+                    })
+                    .catch(err => {
+                        console.error("Error fetching outward list for breakdown:", err);
+                        proceedWithRender();
+                    });
+            } else {
+                proceedWithRender();
+            }
+        }
+
+
+
+        // ================= INWARD UPLOAD API =================
+        let vendorsMap = {};
+        let inwardRequestItems = [];
+
+        function loadVendorsMap(callback) {
+            if (Object.keys(vendorsMap).length > 0) {
+                if (callback) callback();
+                return;
+            }
+            fetch(contextPath + 'gccservicepaymenttracker/api/vendors')
+                .then(res => res.json())
+                .then(data => {
+                    data.forEach(v => {
+                        vendorsMap[v.id] = v.vendor_name;
+                    });
+                    if (callback) callback();
+                })
+                .catch(err => console.error("Error loading vendors map:", err));
+        }
+
+        function fetchActiveWorkordersForInward() {
+            const select = document.getElementById('inward-ref-select');
+            if (!select) return;
+            select.innerHTML = '<option value="">-- Loading File Numbers... --</option>';
+
+            fetch(contextPath + 'gcctonermanagement/api/workorders/active')
+                .then(res => res.json())
+                .then(data => {
+                    select.innerHTML = '<option value="">-- Select File No. --</option>';
+                    data.forEach(item => {
+                        const opt = document.createElement('option');
+                        if (typeof item === 'object' && item !== null) {
+                            const ref = item.ref_no || '';
+                            const fileNo = item.file_number || '';
+                            opt.value = ref || fileNo;
+                            opt.textContent = fileNo ? (ref ? `${fileNo} (${ref})` : fileNo) : ref;
+                        } else {
+                            opt.value = item;
+                            opt.textContent = item;
+                        }
+                        select.appendChild(opt);
+                    });
+                })
+                .catch(err => {
+                    console.error("Error loading active workorders: ", err);
+                    select.innerHTML = '<option value="">-- Failed to load file numbers --</option>';
+                });
+        }
+
+        // Backward compatibility
+        function fetchActiveWorkorderRequests() {
+            fetchActiveWorkordersForInward();
+        }
+
+        function onInwardWorkorderSelectChange(select) {
+            const refNo = select.value;
+            const cmpInput = document.getElementById('inward-company-name');
+            const tbody = document.getElementById('inward-items-tbody');
+
+            if (cmpInput) {
+                cmpInput.value = '';
+                cmpInput.removeAttribute('data-vendor-id');
+            }
+            if (tbody) {
+                tbody.innerHTML = '<tr><td colspan="6" class="text-center text-muted py-4">Please select a File No. to view registered models.</td></tr>';
             }
 
             inwardRequestItems = [];
@@ -7049,7 +7879,7 @@
                     if (tbody) {
                         tbody.innerHTML = '';
                         if (!data || data.length === 0) {
-                            tbody.innerHTML = '<tr><td colspan="4" class="text-center text-muted py-4">No registered models found for this workorder.</td></tr>';
+                            tbody.innerHTML = '<tr><td colspan="6" class="text-center text-muted py-4">No registered models found for this workorder.</td></tr>';
                             return;
                         }
 
@@ -7060,18 +7890,20 @@
 
                             const tr = document.createElement('tr');
                             tr.innerHTML = `
-                                <td>${escapeHtml(item.printer_name || '-')}</td>
+                                <td class="fw-semibold text-dark">${escapeHtml(item.printer_name || '-')}</td>
                                 <td>
                                     <span class="badge-toner-model">${escapeHtml(item.model_name || '-')}</span>
                                     <br>
                                     <small class="text-secondary">Part: ${escapeHtml(item.part_code || 'N/A')}</small>
                                 </td>
-                                <td>
-                                    <div style="font-size: 11px; display: flex; flex-direction: column; gap: 2px;">
-                                        <span class="badge bg-secondary text-white">Reg: ${regQty}</span>
-                                        <span class="badge bg-success text-white">Received: ${rcvQty}</span>
-                                        <span class="badge ${remaining > 0 ? 'bg-warning text-dark' : 'bg-danger text-white'}">Remaining: ${remaining}</span>
-                                    </div>
+                                <td class="text-center">
+                                    <span class="badge bg-secondary font-monospace px-2 py-1" style="font-size: 0.82rem;">${regQty}</span>
+                                </td>
+                                <td class="text-center">
+                                    <span class="badge bg-success font-monospace px-2 py-1" style="font-size: 0.82rem;">${rcvQty}</span>
+                                </td>
+                                <td class="text-center">
+                                    <span class="badge ${remaining > 0 ? 'bg-warning text-dark' : 'bg-danger text-white'} font-monospace px-2 py-1" style="font-size: 0.82rem;">${remaining}</span>
                                 </td>
                                 <td class="text-center">
                                     <input type="number" class="form-control form-control-sm inward-item-qty-input font-monospace fw-bold text-center" 
@@ -7081,7 +7913,7 @@
                                            data-remaining="${remaining}"
                                            min="0" 
                                            max="${remaining}" 
-                                           value="${remaining > 0 ? remaining : 0}" 
+                                           value="0" 
                                            placeholder="0"
                                            ${remaining <= 0 ? 'disabled' : ''}>
                                 </td>
@@ -7102,10 +7934,14 @@
             const refNo = document.getElementById('inward-ref-select').value;
             const companyNameInput = document.getElementById('inward-company-name');
             const companyName = (companyNameInput.getAttribute('data-vendor-id') || companyNameInput.value).trim();
+            const dcNoInput = document.getElementById('inward-dc-no');
+            const dcNo = dcNoInput ? dcNoInput.value.trim() : '';
+            const dcDateInput = document.getElementById('inward-dc-date');
+            const dcDate = dcDateInput ? dcDateInput.value.trim() : '';
             const dcInput = document.getElementById('inward-dc-file');
 
             if (!refNo || !companyName) {
-                showNotification('warning', 'Missing Fields', 'Please select a Workorder Reference.');
+                showNotification('warning', 'Missing Fields', 'Please select a File No.');
                 return;
             }
 
@@ -7167,6 +8003,8 @@
             const formData = new FormData();
             formData.append('refNo', refNo);
             formData.append('companyName', companyName);
+            formData.append('dcNo', dcNo);
+            formData.append('dcDate', dcDate);
             formData.append('itemsJson', JSON.stringify(items));
             formData.append('dcFile', dcInput.files[0]);
 
@@ -7211,7 +8049,7 @@
                                 resetForm('inward');
                                 const tbody = document.getElementById('inward-items-tbody');
                                 if (tbody) {
-                                    tbody.innerHTML = '<tr><td colspan="4" class="text-center text-muted py-4">Please select a Workorder Reference to view requested models.</td></tr>';
+                                    tbody.innerHTML = '<tr><td colspan="6" class="text-center text-muted py-4">Please select a File No. to view registered models.</td></tr>';
                                 }
                                 fetchInwardHistory();
                                 switchView('inward');
@@ -7328,6 +8166,8 @@
             const deptId = document.getElementById('request-dept').value.trim();
             const zoneEl = document.getElementById('request-zone');
             const zoneId = zoneEl ? zoneEl.value.trim() : '';
+            const reqDateInput = document.getElementById('request-date');
+            const requestDate = reqDateInput ? reqDateInput.value.trim() : '';
             const urInput = document.getElementById('request-user-file');
 
             if (!itcellRefNo) {
@@ -7349,6 +8189,7 @@
             formData.append('itcellRefNo', itcellRefNo);
             formData.append('deptId', deptId);
             formData.append('zoneId', zoneId);
+            formData.append('requestDate', requestDate);
             formData.append('itemsJson', JSON.stringify(requestItems));
             formData.append('userRequestFile', urInput.files[0]);
 
@@ -7428,6 +8269,8 @@
             document.getElementById('edit-request-req-no').value = item.req_no || '-';
             document.getElementById('edit-request-itcell').value = item.itcell_ref_no || '';
             document.getElementById('edit-request-qty').value = item.qty_requested || 1;
+            const editDateInput = document.getElementById('edit-request-date');
+            if (editDateInput) editDateInput.value = item.request_date || '';
 
             // Reset file input
             const fileInput = document.getElementById('edit-request-file');
@@ -7508,13 +8351,16 @@
                 if (breakdownModal) breakdownModal.hide();
             }
 
-            const editModal = new bootstrap.Modal(document.getElementById('editUserRequestModal'));
-            editModal.show();
+            const editModalEl = document.getElementById('editUserRequestModal');
+            if (editModalEl) {
+                const editModal = bootstrap.Modal.getOrCreateInstance(editModalEl);
+                editModal.show();
+            }
         }
 
         function openEditUserRequestByGroup(itcellRefNo, pid) {
             const items = (userRequestsCached || []).filter(r =>
-                String(r.itcell_ref_no) === String(itcellRefNo) &&
+                String(r.itcell_ref_no).trim() === String(itcellRefNo).trim() &&
                 (pid === undefined || pid === null || String(r.pid) === String(pid))
             );
             if (items.length === 1) {
@@ -7590,6 +8436,10 @@
             formData.append('pid', pid);
             formData.append('tid', tid);
             formData.append('qtyRequested', qtyRequested);
+            const editDateInput = document.getElementById('edit-request-date');
+            if (editDateInput) {
+                formData.append('requestDate', editDateInput.value.trim());
+            }
 
             if (fileInput && fileInput.files.length > 0) {
                 formData.append('userRequestFile', fileInput.files[0]);
@@ -7859,10 +8709,17 @@
                 .then(res => res.json())
                 .then(data => {
                     select.innerHTML = '<option value="">-- Select Workorder Reference --</option>';
-                    data.forEach(ref => {
+                    data.forEach(item => {
                         const opt = document.createElement('option');
-                        opt.value = ref;
-                        opt.textContent = ref;
+                        if (typeof item === 'object' && item !== null) {
+                            const ref = (item.ref_no || '').trim();
+                            const fileNo = (item.file_number || '').trim();
+                            opt.value = ref || fileNo;
+                            opt.textContent = fileNo ? (ref ? `${fileNo} (${ref})` : fileNo) : ref;
+                        } else {
+                            opt.value = item;
+                            opt.textContent = item;
+                        }
                         select.appendChild(opt);
                     });
                 })
@@ -8254,16 +9111,60 @@
                         }
                         return normalized;
                     });
-                    const select = document.getElementById('outward-request-select');
-                    select.innerHTML = '<option value="">-- Select Pending Request --</option>';
-                    pendingRequestsCached.forEach(req => {
-                        const opt = document.createElement('option');
-                        opt.value = req.id;
-                        const stock = req.available_stock !== undefined ? parseInt(req.available_stock) : 0;
-                        const modelInfo = (req.printer_name ? req.printer_name + ' - ' : '') + (req.model_name || '');
-                        opt.textContent = `${req.req_no} - Dept: ${req.dept_name} (Printer: ${req.printer_name} Stock: ${stock})`;
-                        select.appendChild(opt);
+
+                    // Group pending requests by IT Cell Reference No (fallback to req_no if empty)
+                    pendingRequestsGrouped = {};
+                    pendingRequestsCached.forEach(item => {
+                        const groupKey = (item.itcell_ref_no && item.itcell_ref_no.trim() !== '' && item.itcell_ref_no.trim() !== 'null')
+                            ? item.itcell_ref_no.trim()
+                            : (item.req_no || 'REQ-' + item.id);
+                        if (!pendingRequestsGrouped[groupKey]) {
+                            pendingRequestsGrouped[groupKey] = [];
+                        }
+                        pendingRequestsGrouped[groupKey].push(item);
                     });
+
+                    const select = document.getElementById('outward-request-select');
+                    if (select) {
+                        const currentVal = select.value;
+                        select.innerHTML = '<option value="">-- Select Pending Request --</option>';
+
+                        // Sort keys in ascending order by IT Cell request number (e.g. IT Cell/Toner/1, 2, ... 126)
+                        const extractNum = (s) => {
+                            if (!s) return 0;
+                            const m1 = String(s).match(/Toner\s*\/\s*(\d+)/i);
+                            if (m1) return parseInt(m1[1], 10);
+                            const m2 = String(s).match(/\/(\d+)\b/);
+                            if (m2) return parseInt(m2[1], 10);
+                            const m3 = String(s).match(/(\d+)/);
+                            return m3 ? parseInt(m3[1], 10) : 0;
+                        };
+
+                        const sortedKeys = Object.keys(pendingRequestsGrouped).sort((a, b) => {
+                            const numA = extractNum(a);
+                            const numB = extractNum(b);
+                            if (numA > 0 && numB > 0 && numA !== numB) {
+                                return numA - numB; // Ascending numeric order
+                            }
+                            return String(a).localeCompare(String(b), undefined, { numeric: true, sensitivity: 'base' });
+                        });
+
+                        sortedKeys.forEach(key => {
+                            const items = pendingRequestsGrouped[key];
+                            const first = items[0];
+                            const deptName = first.dept_name || first.dept_id || 'Unknown Dept';
+                            const totalReq = items.reduce((sum, i) => sum + (parseInt(i.qty_requested) || 0), 0);
+                            const totalDelivered = items.reduce((sum, i) => sum + (parseInt(i.qty_delivered) || 0), 0);
+                            const totalPending = Math.max(0, totalReq - totalDelivered);
+                            const hasStock = items.some(i => (parseInt(i.available_stock) || 0) > 0);
+
+                            const opt = document.createElement('option');
+                            opt.value = key;
+                            opt.textContent = `${key} - Dept: ${deptName} (Pending: ${totalPending}/${totalReq} units${!hasStock ? ' - Out of Stock' : ''})`;
+                            if (String(key) === String(currentVal)) opt.selected = true;
+                            select.appendChild(opt);
+                        });
+                    }
                 })
                 .catch(err => console.error("Error loading pending requests:", err));
         }
@@ -8504,9 +9405,8 @@
             const fdInput = document.getElementById('outward-final-file');
             const uploadBtn = document.getElementById('outward-upload-btn');
             const hasPdf = Boolean(fdInput && fdInput.files && fdInput.files.length > 0);
-            const hasPhoto = Boolean(outwardCapturedPhotoBlob || outwardCapturedPhotoBase64);
             if (uploadBtn) {
-                if (hasPdf && hasPhoto) {
+                if (hasPdf) {
                     uploadBtn.disabled = false;
                 } else {
                     uploadBtn.disabled = true;
@@ -8534,96 +9434,149 @@
             modal.show();
         }
 
-        // Handle active pending selection to display details
+        // Handle active pending selection to display details and load all models into the right-side table
         function onOutwardRequestSelection() {
-            const id = document.getElementById('outward-request-select').value;
+            const selectedKey = document.getElementById('outward-request-select')?.value;
             const deptDisp = document.getElementById('outward-dept-disp');
-            const printerDisp = document.getElementById('outward-printer-disp');
-            const tonerDisp = document.getElementById('outward-toner-disp');
-            const qtyReqDisp = document.getElementById('outward-qty-req-disp');
-            const availStockDisp = document.getElementById('outward-avail-stock-disp');
-            const qtyDeliveredInput = document.getElementById('outward-qty-delivered');
+            const outwardDateInput = document.getElementById('outward-date');
+            const tbody = document.getElementById('outward-items-tbody');
             const saveBtn = document.getElementById('outward-save-btn');
 
             // Reset
             if (deptDisp) deptDisp.value = '';
-            if (printerDisp) printerDisp.value = '';
-            if (tonerDisp) tonerDisp.value = '';
-            if (qtyReqDisp) qtyReqDisp.value = '';
-            if (availStockDisp) {
-                availStockDisp.value = '';
-                availStockDisp.style.color = '#166534';
-                availStockDisp.style.backgroundColor = '#f0fdf4';
-            }
-            if (qtyDeliveredInput) {
-                qtyDeliveredInput.value = '';
-                qtyDeliveredInput.max = '';
-                qtyDeliveredInput.disabled = false;
+            if (tbody) {
+                tbody.innerHTML = `
+                    <tr>
+                        <td colspan="7" class="text-center text-muted py-4">
+                            Please select an Active Request to view requested toner models.
+                        </td>
+                    </tr>
+                `;
             }
             if (saveBtn) saveBtn.disabled = false;
             lastSavedOutward = null;
             disableUploadArea();
 
-            if (!id) return;
+            if (!selectedKey) return;
+
+            const items = pendingRequestsGrouped[selectedKey] || [];
+            if (items.length === 0) return;
+
+            const first = items[0];
+            if (deptDisp) deptDisp.value = first.dept_name || first.dept_id || '-';
+
+            // Pre-fill today's date if outward date input is empty
+            if (outwardDateInput && !outwardDateInput.value) {
+                const today = new Date().toISOString().split('T')[0];
+                outwardDateInput.value = today;
+            }
 
-            const selected = pendingRequestsCached.find(r => String(r.id) === String(id));
-            if (selected) {
-                const reqQty = parseInt(selected.qty_requested || 0);
-                const delQty = parseInt(selected.qty_delivered || 0);
-                const pendingQty = Math.max(0, reqQty - delQty);
-                const availStock = parseInt(selected.available_stock !== undefined ? selected.available_stock : 0);
+            if (tbody) {
+                tbody.innerHTML = '';
+                let totalIssuable = 0;
 
-                if (deptDisp) deptDisp.value = selected.dept_id || '-';
-                if (printerDisp) printerDisp.value = selected.printer_name || '-';
-                if (tonerDisp) tonerDisp.value = selected.model_name || '-';
-                if (qtyReqDisp) qtyReqDisp.value = `${reqQty} (Already Issued: ${delQty}, Pending Balance: ${pendingQty})`;
+                items.forEach(item => {
+                    const reqQty = parseInt(item.qty_requested || 0);
+                    const delQty = parseInt(item.qty_delivered || 0);
+                    const pendingQty = Math.max(0, reqQty - delQty);
+                    const availStock = parseInt(item.available_stock !== undefined ? item.available_stock : 0);
+                    const maxIssuable = Math.min(pendingQty, Math.max(0, availStock));
 
-                if (availStockDisp) {
-                    availStockDisp.value = `${availStock} units available in inward stock`;
+                    let stockBadge = '';
                     if (availStock <= 0) {
-                        availStockDisp.value = `0 units (OUT OF STOCK - Inward required)`;
-                        availStockDisp.style.color = '#dc2626';
-                        availStockDisp.style.backgroundColor = '#fef2f2';
-                    } else if (availStock <= 5) {
-                        availStockDisp.style.color = '#b45309';
-                        availStockDisp.style.backgroundColor = '#fffbeb';
+                        stockBadge = `<span class="badge bg-danger"><i class="fa-solid fa-circle-xmark me-1"></i>Out of Stock (0)</span>`;
+                    } else if (availStock < pendingQty) {
+                        stockBadge = `<span class="badge bg-warning text-dark fw-bold"><i class="fa-solid fa-triangle-exclamation me-1"></i>${availStock} in stock</span>`;
+                    } else {
+                        stockBadge = `<span class="badge bg-success fw-bold"><i class="fa-solid fa-circle-check me-1"></i>${availStock} in stock</span>`;
                     }
-                }
 
-                if (availStock <= 0) {
-                    if (qtyDeliveredInput) {
-                        qtyDeliveredInput.value = 0;
-                        qtyDeliveredInput.max = 0;
-                        qtyDeliveredInput.disabled = true;
+                    let inputHtml = '';
+                    if (availStock <= 0 || pendingQty <= 0) {
+                        inputHtml = `<input type="number" class="form-control form-control-sm text-center outward-qty-input" 
+                                        data-id="${item.id}" data-max="0" value="0" min="0" max="0" disabled 
+                                        style="background-color: #f1f5f9; border-radius: 8px; font-weight: 600;">`;
+                    } else {
+                        totalIssuable += maxIssuable;
+                        inputHtml = `<input type="number" class="form-control form-control-sm text-center outward-qty-input" 
+                                        data-id="${item.id}" data-max="${maxIssuable}" value="0" min="0" max="${maxIssuable}" 
+                                        placeholder="0"
+                                        style="font-weight: 700; color: #0f5c78; border-radius: 8px; border-color: #0f5c78;"
+                                        oninput="validateOutwardQtyInput(this)">`;
                     }
+
+                    const tr = document.createElement('tr');
+                    tr.innerHTML = ` 
+                        <td class="fw-semibold text-secondary">${escapeHtml(item.printer_name || '-')}</td>
+                        <td>
+                            <span class="badge-toner-model">${escapeHtml(item.model_name || '-')}</span>
+                            ${item.part_code ? `<small class="text-muted d-block font-monospace">${escapeHtml(item.part_code)}</small>` : ''}
+                        </td>
+                        <td class="text-center font-monospace fw-bold text-dark">${reqQty}</td>
+                        <td class="text-center text-success font-monospace fw-bold">${delQty}</td>
+                        <td class="text-center font-monospace fw-bold" style="color: #d97706;">${pendingQty}</td>
+                        <td class="text-center">${stockBadge}</td>
+                        <td class="text-center">${inputHtml}</td>
+                    `;
+                    tbody.appendChild(tr);
+                });
+
+                if (totalIssuable <= 0) {
                     if (saveBtn) saveBtn.disabled = true;
-                    showNotification('warning', 'Out of Stock', `No inward stock available for printer "${selected.printer_name || ''}" model "${selected.model_name || ''}". Please register inward stock before issuing.`);
+                    showNotification('warning', 'Out of Stock', `No inward stock is currently available for the toner models requested under "${selectedKey}". Please register inward stock before issuing.`);
                 } else {
-                    const maxIssuable = Math.min(pendingQty, availStock);
-                    if (qtyDeliveredInput) {
-                        qtyDeliveredInput.value = maxIssuable > 0 ? maxIssuable : 1;
-                        qtyDeliveredInput.max = maxIssuable;
-                        qtyDeliveredInput.disabled = false;
-                    }
                     if (saveBtn) saveBtn.disabled = false;
                 }
             }
         }
 
+        function validateOutwardQtyInput(input) {
+            const max = parseInt(input.getAttribute('data-max') || 0);
+            let val = parseInt(input.value || 0);
+            if (isNaN(val) || val < 0) {
+                input.value = 0;
+            } else if (val > max) {
+                input.value = max;
+                showNotification('warning', 'Exceeds Stock / Balance', `Maximum issuable quantity for this item is ${max}.`);
+            }
+        }
+
         function saveOutwardDelivery(event) {
             if (event) event.preventDefault();
 
-            const id = document.getElementById('outward-request-select').value;
-            const qtyIssued = document.getElementById('outward-qty-delivered').value.trim();
+            const selectedKey = document.getElementById('outward-request-select')?.value;
+            const outwardDateInput = document.getElementById('outward-date');
+            const outwardDate = outwardDateInput ? outwardDateInput.value.trim() : '';
 
-            if (!id || !qtyIssued) {
-                showNotification('warning', 'Missing Fields', 'Please select request and specify quantity issued.');
+            if (!selectedKey) {
+                showNotification('warning', 'Missing Selection', 'Please select an Active Request.');
+                return;
+            }
+
+            if (!outwardDate) {
+                showNotification('warning', 'Missing Date', 'Please select Outward Date.');
+                return;
+            }
+
+            const itemsToIssue = [];
+            const inputs = document.querySelectorAll('#outward-items-tbody .outward-qty-input');
+            inputs.forEach(inp => {
+                const id = inp.getAttribute('data-id');
+                const max = parseInt(inp.getAttribute('data-max') || 0);
+                const qty = parseInt(inp.value) || 0;
+                if (qty > 0 && id) {
+                    itemsToIssue.push({ id: parseInt(id), qtyIssued: Math.min(qty, max) });
+                }
+            });
+
+            if (itemsToIssue.length === 0) {
+                showNotification('warning', 'Invalid Quantity', 'Please specify a quantity greater than 0 for at least one available toner model.');
                 return;
             }
 
             const formData = new FormData();
-            formData.append('id', id);
-            formData.append('qtyIssued', qtyIssued);
+            formData.append('itemsJson', JSON.stringify(itemsToIssue));
+            formData.append('outwardDate', outwardDate);
 
             const xhr = new XMLHttpRequest();
             xhr.open('POST', contextPath + 'gcctonermanagement/api/outward', true);
@@ -8647,15 +9600,29 @@
                     try {
                         const res = JSON.parse(xhr.responseText);
                         if (res.success) {
-                            const selected = pendingRequestsCached.find(r => String(r.id) === String(id));
+                            const groupItems = pendingRequestsGrouped[selectedKey] || [];
+                            const issuedDetails = itemsToIssue.map(iss => {
+                                const found = groupItems.find(i => String(i.id) === String(iss.id)) || {};
+                                return {
+                                    id: iss.id,
+                                    req_no: found.req_no || selectedKey,
+                                    itcell_ref_no: found.itcell_ref_no || selectedKey,
+                                    dept_name: found.dept_name || found.dept_id || '',
+                                    printer_name: found.printer_name || '-',
+                                    model_name: found.model_name || '-',
+                                    part_code: found.part_code || '',
+                                    qty_requested: found.qty_requested || 0,
+                                    qty_delivered: iss.qtyIssued
+                                };
+                            });
+
                             lastSavedOutward = {
-                                id: id,
-                                req_no: selected.req_no,
-                                dept_id: selected.dept_id,
-                                printer_name: selected.printer_name,
-                                model_name: selected.model_name,
-                                qty_requested: selected.qty_requested,
-                                qty_delivered: qtyIssued
+                                itcell_ref_no: selectedKey,
+                                req_no: groupItems[0]?.req_no || selectedKey,
+                                dept_name: groupItems[0]?.dept_name || groupItems[0]?.dept_id || '',
+                                outward_date: outwardDate,
+                                itemIds: itemsToIssue.map(i => i.id),
+                                items: issuedDetails
                             };
 
                             downloadPdfAcknowledgement(lastSavedOutward);
@@ -8667,8 +9634,11 @@
                                 text: 'Delivery details recorded successfully and acknowledgement PDF downloaded. Please upload the signed copy and receiver photo using the upload area below.',
                                 confirmButtonColor: '#0f5c78'
                             }).then(() => {
+                                fetchPendingRequests();
                                 fetchOutwardHistory();
-                                loadReportPage();
+                                if (typeof fetchStockSummary === 'function') fetchStockSummary();
+                                if (typeof loadReportPage === 'function') loadReportPage();
+                                if (typeof updateDashboardData === 'function') updateDashboardData();
                             });
                         } else {
                             showNotification('error', 'Error', res.error || 'Failed to record outward delivery.');
@@ -8691,7 +9661,7 @@
         }
 
         function uploadSignedPdfAndPhoto() {
-            if (!lastSavedOutward) {
+            if (!lastSavedOutward || !lastSavedOutward.itemIds || lastSavedOutward.itemIds.length === 0) {
                 showNotification('warning', 'Save First', 'Please save the delivery record first.');
                 return;
             }
@@ -8702,14 +9672,8 @@
                 return;
             }
 
-            if (!outwardCapturedPhotoBlob && !outwardCapturedPhotoBase64) {
-                showNotification('warning', 'Photo Required', 'Please capture or select the Receiver / User photo.');
-                return;
-            }
-
             const formData = new FormData();
-            formData.append('id', lastSavedOutward.id);
-            formData.append('qtyIssued', lastSavedOutward.qty_delivered);
+            formData.append('ids', JSON.stringify(lastSavedOutward.itemIds));
             formData.append('finalDeliveredFile', fdInput.files[0]);
 
             if (outwardCapturedPhotoBlob) {
@@ -8758,7 +9722,10 @@
                             }).then(() => {
                                 disableUploadArea();
                                 resetForm('outward');
-                                switchView('outward');
+                                fetchPendingRequests();
+                                fetchOutwardHistory();
+                                if (typeof loadReportPage === 'function') loadReportPage();
+                                if (typeof updateDashboardData === 'function') updateDashboardData();
                             });
                         } else {
                             showNotification('error', 'Error', res.error || 'Failed to upload outward proof.');
@@ -8798,15 +9765,18 @@
             const logoImg = new Image();
             logoImg.src = contextPath + 'assets/header-images/gcc1.png';
 
-            logoImg.onload = function () {
+            const renderPdfContent = function () {
                 // Background watermarked logo in the center (transparent effect)
-                doc.saveGraphicsState();
-                doc.setGState(new doc.GState({ opacity: 0.08 }));
-                doc.addImage(logoImg, 'PNG', 55, 100, 100, 100);
-                doc.restoreGraphicsState();
-
-                // Header Logo
-                doc.addImage(logoImg, 'PNG', 12, 12, 22, 22);
+                try {
+                    if (logoImg.complete && logoImg.naturalWidth > 0) {
+                        doc.saveGraphicsState();
+                        doc.setGState(new doc.GState({ opacity: 0.08 }));
+                        doc.addImage(logoImg, 'PNG', 55, 100, 100, 100);
+                        doc.restoreGraphicsState();
+                        // Header Logo
+                        doc.addImage(logoImg, 'PNG', 12, 12, 22, 22);
+                    }
+                } catch (e) { }
 
                 // Header Texts
                 doc.setFont('Helvetica', 'bold');
@@ -8823,73 +9793,110 @@
                 // Draw divider line below header
                 doc.setDrawColor(226, 232, 240);
                 doc.setLineWidth(1);
-                doc.line(10, 38, 200, 38);
+                doc.line(10, 36, 200, 36);
 
                 // Document Title
                 doc.setFont('Helvetica', 'bold');
                 doc.setFontSize(12);
                 doc.setTextColor(15, 92, 120);
-                doc.text("TONER DELIVERY ACKNOWLEDGEMENT", 105, 48, null, null, "center");
+                doc.text("TONER DELIVERY ACKNOWLEDGEMENT", 105, 45, null, null, "center");
 
-                // Content details
-                doc.setFontSize(10);
+                // Header info details (Ref No, Department, Date)
+                doc.setFontSize(9.5);
                 doc.setFont('Helvetica', 'normal');
                 doc.setTextColor(51, 65, 85);
 
-                const currentDateTimeStr = new Date().toLocaleDateString('en-GB') + ' ' + new Date().toLocaleTimeString('en-GB', { hour: '2-digit', minute: '2-digit' });
+                const refNoText = item.itcell_ref_no || item.req_no || '-';
+                const deptText = item.dept_name || item.dept_id || '-';
+                const outwardDateText = item.outward_date || (new Date().toLocaleDateString('en-GB') + ' ' + new Date().toLocaleTimeString('en-GB', { hour: '2-digit', minute: '2-digit' }));
 
-                // Draw Table containing toner delivery details
-                const tableData = [
-                    ["Request Number", item.req_no || '-'],
-                    ["Department / Office", item.dept_id || '-'],
-                    ["Printer Model", item.printer_name || '-'],
-                    ["Toner Model", item.model_name || '-'],
-                    ["Quantity Requested", item.qty_requested || '-'],
-                    ["Quantity Issued", item.qty_delivered || '-'],
-                    ["Delivery Date & Time", currentDateTimeStr]
-                ];
+                doc.setFont('Helvetica', 'bold');
+                doc.text("IT Cell Ref No:", 15, 54);
+                doc.setFont('Helvetica', 'normal');
+                doc.text(refNoText, 45, 54);
+
+                doc.setFont('Helvetica', 'bold');
+                doc.text("Department:", 15, 60);
+                doc.setFont('Helvetica', 'normal');
+                doc.text(deptText, 45, 60);
+
+                doc.setFont('Helvetica', 'bold');
+                doc.text("Delivery Date:", 135, 54);
+                doc.setFont('Helvetica', 'normal');
+                doc.text(outwardDateText, 162, 54);
+
+                let tableColumns = [];
+                let tableRows = [];
+
+                if (item.items && Array.isArray(item.items) && item.items.length > 0) {
+                    tableColumns = ["S.No", "Printer Model", "Toner Model", "Qty Req", "Qty Issued"];
+                    tableRows = item.items.map((it, idx) => [
+                        idx + 1,
+                        it.printer_name || '-',
+                        (it.model_name || '-') + (it.part_code ? ` (${it.part_code})` : ''),
+                        it.qty_requested || '-',
+                        it.qty_delivered || '-'
+                    ]);
+                } else {
+                    tableColumns = ["S.No", "Printer Model", "Toner Model", "Qty Req", "Qty Issued"];
+                    tableRows = [
+                        [
+                            1,
+                            item.printer_name || '-',
+                            (item.model_name || '-') + (item.part_code ? ` (${item.part_code})` : ''),
+                            item.qty_requested || '-',
+                            item.qty_delivered || '-'
+                        ]
+                    ];
+                }
 
                 doc.autoTable({
-                    startY: 55,
+                    startY: 66,
                     margin: { left: 15, right: 15 },
-                    body: tableData,
+                    head: [tableColumns],
+                    body: tableRows,
                     theme: 'striped',
+                    headStyles: {
+                        fillColor: [15, 92, 120],
+                        textColor: [255, 255, 255],
+                        fontStyle: 'bold',
+                        fontSize: 9.5
+                    },
                     styles: {
-                        fontSize: 10,
-                        cellPadding: 4,
+                        fontSize: 9,
+                        cellPadding: 3.5,
                         textColor: [51, 65, 85],
                         lineColor: [226, 232, 240],
                         lineWidth: 0.1
                     },
                     columnStyles: {
-                        0: { fontStyle: 'bold', width: 60, textColor: [15, 92, 120] }
+                        0: { width: 15, halign: 'center' },
+                        3: { width: 25, halign: 'center', fontStyle: 'bold' },
+                        4: { width: 25, halign: 'center', fontStyle: 'bold', textColor: [22, 101, 52] }
                     }
                 });
 
-                //Acknowledgement Declaration - Removed
                 const finalY = doc.lastAutoTable ? doc.lastAutoTable.finalY + 15 : 150;
 
                 // Signatures row
-                const sigY = finalY + 20;
+                const sigY = Math.max(finalY + 20, 230);
                 doc.setDrawColor(203, 213, 225);
                 doc.setLineWidth(0.25);
-                //doc.line(15, sigY, 65, sigY);
-                doc.line(145, sigY, 195, sigY);
+                doc.line(135, sigY, 195, sigY);
 
                 doc.setFont('Helvetica', 'bold');
                 doc.setFontSize(9);
                 doc.setTextColor(71, 85, 105);
-                // doc.text("Receiver's Signature", 40, sigY + 5, null, null, "center");
-                doc.text("Receiver's Signature", 170, sigY + 5, null, null, "center");
+                doc.text("Receiver's Signature", 165, sigY + 5, null, null, "center");
 
                 doc.setFont('Helvetica', 'normal');
                 doc.setFontSize(8);
-                doc.text("Greater Chennai Corporation", 170, sigY + 9, null, null, "center");
+                doc.text("Greater Chennai Corporation", 165, sigY + 9, null, null, "center");
 
                 doc.setFontSize(8);
-                doc.text("Name: ______________________", 145, sigY + 18);
-                doc.text("Mobile Number: _____________", 145, sigY + 25);
-                doc.text("Gender: ____________________", 145, sigY + 32);
+                doc.text("Name: ______________________", 135, sigY + 18);
+                doc.text("Mobile Number: _____________", 135, sigY + 25);
+                doc.text("Designation: ________________", 135, sigY + 32);
 
                 if (signatureDataUrl) {
                     doc.addImage(signatureDataUrl, 'PNG', 20, sigY - 20, 40, 18);
@@ -8898,49 +9905,15 @@
                 callback(doc);
             };
 
-            // Fallback if image fails to load
-            logoImg.onerror = function () {
-                doc.setFontSize(14);
-                doc.text("GREATER CHENNAI CORPORATION", 15, 20);
-                doc.text("TONER DELIVERY ACKNOWLEDGEMENT", 15, 30);
-                doc.setFontSize(10);
-                doc.text(`Request Number: ${item.req_no}`, 15, 45);
-                doc.text(`Department: ${item.dept_id}`, 15, 55);
-                doc.text(`Toner Model: ${item.model_name}`, 15, 65);
-                doc.text(`Qty Issued: ${item.qty_delivered}`, 15, 75);
-
-                const finalY = 120;
-                const sigY = finalY + 20;
-                doc.setDrawColor(203, 213, 225);
-                doc.setLineWidth(0.25);
-                doc.line(15, sigY, 65, sigY);
-                doc.line(145, sigY, 195, sigY);
-
-                doc.setFont('Helvetica', 'bold');
-                doc.setFontSize(9);
-                doc.setTextColor(71, 85, 105);
-                //  doc.text("Receiver's Signature", 40, sigY + 5, null, null, "center");
-                doc.text("Receiver's Signature", 170, sigY + 5, null, null, "center");
-
-                doc.setFont('Helvetica', 'normal');
-                doc.setFontSize(8);
-                doc.text("Greater Chennai Corporation", 170, sigY + 9, null, null, "center");
-
-                doc.setFontSize(8);
-                doc.text("Name: ______________________", 145, sigY + 18);
-                doc.text("Mobile Number: _____________", 145, sigY + 25);
-                doc.text("Gender: ____________________", 145, sigY + 32);
-                if (signatureDataUrl) {
-                    doc.addImage(signatureDataUrl, 'PNG', 20, sigY - 20, 40, 18);
-                }
-
-                callback(doc);
-            };
+            logoImg.onload = renderPdfContent;
+            logoImg.onerror = renderPdfContent;
         }
 
         function downloadPdfAcknowledgement(item, signatureDataUrl) {
             generatePdfAcknowledgementDoc(item, signatureDataUrl, function (doc) {
-                doc.save(`Toner_Ack_${item.req_no || 'Receipt'}.pdf`);
+                const fileRef = item.itcell_ref_no || item.req_no || 'Receipt';
+                const cleanFileRef = fileRef.replace(/[^a-zA-Z0-9_-]/g, '_');
+                doc.save(`Toner_Ack_${cleanFileRef}.pdf`);
             });
         }
 
@@ -9088,39 +10061,270 @@
             renderTablePaginationNav('workorder-pagination-info', 'workorder-pagination-nav', workorderCurrentPage, workorderPageSize, totalPages, filtered.length, (p) => renderWorkorderHistoryTable(tbodyId, data, showDoc, p));
         }
 
-        function showWorkorderHistoryBreakdownModal(refNo) {
-            const filtered = workorderHistoryCached.filter(item => String(item.ref_no) === String(refNo));
-            if (filtered.length === 0) {
-                showNotification('warning', 'No Details', 'No workorder items found for this reference.');
-                return;
+        function showWorkorderHistoryBreakdownModal(refNo, fileNo, groupKey) {
+            const targetRef = decodeURIComponent(refNo || '').trim();
+            const targetFile = decodeURIComponent(fileNo || '').trim();
+            const targetKey = decodeURIComponent(groupKey || '').trim();
+            const cleanRef = targetRef.toLowerCase();
+            const cleanFile = targetFile.toLowerCase();
+            const normRef = cleanRef.replace(/[\s\-_/]/g, '');
+            const normFile = cleanFile.replace(/[\s\-_/]/g, '');
+
+            const proceedWithRender = () => {
+                let filtered = [];
+                const allGroups = Object.assign({}, reportWorkorderGroupsCached || {}, dashboardWorkorderGroupsCached || {});
+
+                // 1. Try resolving from allGroups by key
+                if (targetKey && allGroups[targetKey] && Array.isArray(allGroups[targetKey].items) && allGroups[targetKey].items.length > 0) {
+                    filtered = allGroups[targetKey].items;
+                }
+
+                // 2. Try resolving from allGroups by file_number or ref_no
+                if (filtered.length === 0 && typeof allGroups === 'object' && allGroups !== null) {
+                    for (const k in allGroups) {
+                        const grp = allGroups[k];
+                        if (!grp) continue;
+                        const gFile = (grp.file_number || '').trim().toLowerCase();
+                        const gRef = (grp.ref_no || '').trim().toLowerCase();
+                        if (cleanFile && (gFile === cleanFile || (normFile && gFile.replace(/[\s\-_/]/g, '') === normFile))) {
+                            filtered = grp.items || [];
+                            break;
+                        }
+                        if (cleanRef && (gRef === cleanRef || (normRef && gRef.replace(/[\s\-_/]/g, '') === normRef))) {
+                            filtered = grp.items || [];
+                            break;
+                        }
+                    }
+                }
+
+                // 3. Fallback to searching workorderHistoryCached
+                if (filtered.length === 0 && Array.isArray(workorderHistoryCached) && workorderHistoryCached.length > 0) {
+                    filtered = workorderHistoryCached.filter(item => {
+                        const itemRef = String(item.ref_no || '').trim().toLowerCase();
+                        const itemFile = String(item.file_number || '').trim().toLowerCase();
+                        const normItemRef = itemRef.replace(/[\s\-_/]/g, '');
+                        const normItemFile = itemFile.replace(/[\s\-_/]/g, '');
+
+                        const matchRef = cleanRef && (itemRef === cleanRef || (normRef && normItemRef === normRef));
+                        const matchFile = cleanFile && (itemFile === cleanFile || (normFile && normItemFile === normFile));
+
+                        return matchFile || matchRef;
+                    });
+                }
+
+                if (filtered.length === 0) {
+                    showNotification('warning', 'No Details', 'No workorder items found for this reference.');
+                    return;
+                }
+
+                const first = filtered[0] || {};
+                const filenoEl = document.getElementById('wo-breakdown-fileno');
+                if (filenoEl) filenoEl.textContent = first.file_number || targetFile || '-';
+                const refEl = document.getElementById('wo-breakdown-ref');
+                if (refEl) refEl.textContent = first.ref_no || targetRef || '-';
+                const vendorEl = document.getElementById('wo-breakdown-vendor');
+                if (vendorEl) vendorEl.textContent = first.vendor_name || 'N/A';
+
+                const tbody = document.getElementById('wo-breakdown-table-body');
+                if (tbody) {
+                    tbody.innerHTML = '';
+
+                    filtered.forEach((item, index) => {
+                        const tr = document.createElement('tr');
+
+                        let docFiles = [];
+                        if (Array.isArray(item.dc_uploads)) {
+                            docFiles = item.dc_uploads.filter(Boolean);
+                        } else if (typeof item.dc_uploads === 'string' && item.dc_uploads.trim()) {
+                            docFiles = item.dc_uploads.split(',').map(s => s.trim()).filter(Boolean);
+                        } else if (typeof item.dc_upload === 'string' && item.dc_upload.trim()) {
+                            docFiles = item.dc_upload.split(',').map(s => s.trim()).filter(Boolean);
+                        }
+
+                        let pdfBtn = `<span class="text-muted" style="font-size: 11px;"><i class="fa-solid fa-ban"></i> N/A</span>`;
+                        if (docFiles.length > 0) {
+                            pdfBtn = docFiles.map((file, i) => {
+                                const label = docFiles.length > 1 ? `View ${i + 1}` : `View`;
+                                return `<a href="${resolveUploadUrl(file)}" target="_blank" class="btn btn-outline-danger btn-sm p-1 px-2 m-1" style="border-radius: 6px; font-size: 11px; white-space: nowrap;"><i class="fa-solid fa-file-pdf"></i> ${label}</a>`;
+                            }).join(' ');
+                        }
+
+                        tr.innerHTML = `
+                            <td class="fw-semibold text-secondary">${index + 1}</td>
+                            <td>${escapeHtml(item.printer_name || '-')}</td>
+                            <td><span class="badge-toner-model">${escapeHtml(item.model_name || '-')}</span></td>
+                            <td class="text-center font-monospace fw-bold">${item.total_qty_registered || item.qty_registered || '0'}</td>
+                            <td><small class="text-dark fw-semibold">${item.workorder_start_date || 'N/A'}</small></td>
+                            <td><small class="text-dark fw-semibold">${item.workorder_end_date || 'N/A'}</small></td>
+                            
+                        `;
+                        // <td class="text-center">${pdfBtn}</td>
+                        tbody.appendChild(tr);
+                    });
+                }
+
+                const modalEl = document.getElementById('workorderHistoryBreakdownModal');
+                if (modalEl) {
+                    const myModal = bootstrap.Modal.getOrCreateInstance(modalEl);
+                    myModal.show();
+                }
+            };
+
+            if (!workorderHistoryCached || workorderHistoryCached.length === 0) {
+                fetch(contextPath + 'gcctonermanagement/api/workorder/history')
+                    .then(res => res.json())
+                    .then(data => {
+                        workorderHistoryCached = data || [];
+                        proceedWithRender();
+                    })
+                    .catch(err => {
+                        console.error("Error fetching workorder history for breakdown:", err);
+                        proceedWithRender();
+                    });
+            } else {
+                proceedWithRender();
             }
+        }
 
-            document.getElementById('wo-breakdown-ref').textContent = refNo;
-            document.getElementById('wo-breakdown-vendor').textContent = filtered[0].vendor_name || 'N/A';
+        function showInwardHistoryBreakdownModal(fileNo, refNo, groupKey) {
+            const targetFile = decodeURIComponent(fileNo || '').trim();
+            const targetRef = decodeURIComponent(refNo || '').trim();
+            const targetKey = decodeURIComponent(groupKey || '').trim();
+            const cleanFile = targetFile.toLowerCase();
+            const cleanRef = targetRef.toLowerCase();
+            const normFile = cleanFile.replace(/[\s\-_/]/g, '');
+            const normRef = cleanRef.replace(/[\s\-_/]/g, '');
 
-            const tbody = document.getElementById('wo-breakdown-table-body');
-            tbody.innerHTML = '';
+            const proceedWithRender = () => {
+                let filtered = [];
+                let groupMeta = null;
+                const allInwardGroups = Object.assign({}, inwardTableGroupsCached || {}, reportInwardGroupsCached || {}, dashboardInwardGroupsCached || {});
 
-            filtered.forEach((item, index) => {
-                const tr = document.createElement('tr');
-                const pdfBtn = item.dc_upload
-                    ? `<a href="${resolveUploadUrl(item.dc_upload)}" target="_blank" class="btn btn-outline-danger btn-sm p-1 px-2" style="border-radius: 6px; font-size: 11px; white-space: nowrap;"><i class="fa-solid fa-file-pdf"></i> View</a>`
-                    : `<span class="text-muted" style="font-size: 11px;"><i class="fa-solid fa-ban"></i> N/A</span>`;
+                // 1. Try resolving by key
+                if (targetKey && allInwardGroups[targetKey] && Array.isArray(allInwardGroups[targetKey].items) && allInwardGroups[targetKey].items.length > 0) {
+                    groupMeta = allInwardGroups[targetKey];
+                    filtered = groupMeta.items;
+                }
 
-                tr.innerHTML = `
-                    <td class="fw-semibold text-secondary">${index + 1}</td>
-                    <td>${escapeHtml(item.printer_name || '-')}</td>
-                    <td><span class="badge-toner-model">${escapeHtml(item.model_name || '-')}</span></td>
-                    <td class="text-center font-monospace fw-bold">${item.total_qty_registered || '0'}</td>
-                    <td><small class="text-dark fw-semibold">${item.workorder_start_date || 'N/A'}</small></td>
-                    <td><small class="text-dark fw-semibold">${item.workorder_end_date || 'N/A'}</small></td>
-                    <td class="text-center">${pdfBtn}</td>
-                `;
-                tbody.appendChild(tr);
-            });
+                // 2. Try resolving by file_number or ref_no
+                if (filtered.length === 0 && typeof allInwardGroups === 'object' && allInwardGroups !== null) {
+                    for (const k in allInwardGroups) {
+                        const grp = allInwardGroups[k];
+                        if (!grp) continue;
+                        const gFile = (grp.file_number || '').trim().toLowerCase();
+                        const gRef = (grp.ref_no || '').trim().toLowerCase();
+                        if (cleanFile && (gFile === cleanFile || (normFile && gFile.replace(/[\s\-_/]/g, '') === normFile))) {
+                            groupMeta = grp;
+                            filtered = grp.items || [];
+                            break;
+                        }
+                        if (cleanRef && (gRef === cleanRef || (normRef && gRef.replace(/[\s\-_/]/g, '') === normRef))) {
+                            groupMeta = grp;
+                            filtered = grp.items || [];
+                            break;
+                        }
+                    }
+                }
+
+                // 3. Fallback to searching inwardHistoryCached
+                if (filtered.length === 0 && Array.isArray(inwardHistoryCached) && inwardHistoryCached.length > 0) {
+                    filtered = inwardHistoryCached.filter(item => {
+                        const itemFile = String(item.file_number || '').trim().toLowerCase();
+                        const itemRef = String(item.ref_no || '').trim().toLowerCase();
+                        const normItemFile = itemFile.replace(/[\s\-_/]/g, '');
+                        const normItemRef = itemRef.replace(/[\s\-_/]/g, '');
+
+                        const matchFile = cleanFile && (itemFile === cleanFile || (normFile && normItemFile === normFile));
+                        const matchRef = cleanRef && (itemRef === cleanRef || (normRef && normItemRef === normRef));
+
+                        return matchFile || matchRef;
+                    });
+                }
+
+                if (filtered.length === 0) {
+                    showNotification('warning', 'No Details', 'No inward items found for this reference.');
+                    return;
+                }
+
+                const first = filtered[0] || {};
+                const vendorName = vendorsMap[first.company_name] || (!isNaN(first.company_name) ? 'Unknown Vendor (' + first.company_name + ')' : (first.company_name || '-'));
+
+                const filenoEl = document.getElementById('inward-breakdown-fileno');
+                if (filenoEl) filenoEl.textContent = first.file_number || (groupMeta && groupMeta.file_number) || targetFile || '-';
+                const refEl = document.getElementById('inward-breakdown-ref');
+                if (refEl) refEl.textContent = first.ref_no || (groupMeta && groupMeta.ref_no) || targetRef || '-';
+                const vendorEl = document.getElementById('inward-breakdown-vendor');
+                if (vendorEl) vendorEl.textContent = vendorName;
+
+                const dcNoEl = document.getElementById('inward-breakdown-dcno');
+                if (dcNoEl) dcNoEl.textContent = first.dc_no || (groupMeta && groupMeta.dc_no) || '-';
+                const dcDateEl = document.getElementById('inward-breakdown-dcdate');
+                const rawDcDate = first.dc_date || (groupMeta && groupMeta.dc_date);
+                if (dcDateEl) dcDateEl.textContent = (rawDcDate && String(rawDcDate).trim() !== '' && String(rawDcDate).trim() !== 'null') ? formatDateOnly(rawDcDate) : '-';
+
+                const tbody = document.getElementById('inward-breakdown-table-body');
+                if (tbody) {
+                    tbody.innerHTML = '';
+
+                    filtered.forEach((item, index) => {
+                        const tr = document.createElement('tr');
+                        const createdDate = formatTimestamp(item.cdate);
+                        const dcDateFormatted = (item.dc_date && String(item.dc_date).trim() !== '' && String(item.dc_date).trim() !== 'null') ? formatDateOnly(item.dc_date) : '-';
+
+                        let docFiles = [];
+                        if (Array.isArray(item.dc_uploads)) {
+                            docFiles = item.dc_uploads.filter(Boolean);
+                        } else if (typeof item.dc_uploads === 'string' && item.dc_uploads.trim()) {
+                            docFiles = item.dc_uploads.split(',').map(s => s.trim()).filter(Boolean);
+                        } else if (typeof item.dc_upload === 'string' && item.dc_upload.trim()) {
+                            docFiles = item.dc_upload.split(',').map(s => s.trim()).filter(Boolean);
+                        }
+
+                        let docBtn = '-';
+                        if (docFiles.length > 0) {
+                            docBtn = docFiles.map((file, i) => {
+                                const label = docFiles.length > 1 ? `View DC ${i + 1}` : `View DC`;
+                                return `<a href="${resolveUploadUrl(file)}" target="_blank" class="btn-action btn-view-doc m-1" style="font-size: 10px; padding: 4px 8px; white-space: nowrap;"><i class="fa-solid fa-file-pdf"></i> ${label}</a>`;
+                            }).join(' ');
+                        }
+
+                        tr.innerHTML = `
+                            <td class="fw-semibold text-secondary">${index + 1}</td>
+                            <td class="fw-semibold text-dark font-monospace">${escapeHtml(item.dc_no || '-')}</td>
+                            <td>${escapeHtml(item.printer_name || '-')}</td>
+                            <td><span class="badge-toner-model">${escapeHtml(item.model_name || '-')}</span></td>
+                            <td class="text-center text-primary font-monospace fw-bold">${item.qty_registered || item.inward_qty || '0'}</td>
+                            <td><small class="text-dark fw-semibold">${dcDateFormatted}</small></td>
+                            <td><small class="text-muted fw-semibold">${createdDate}</small></td>
+                            <td><small class="text-muted">${escapeHtml(item.order_by || '-')}</small></td>
+                            
+                        `;
+                        // <td class="text-center">${docBtn}</td>
+                        tbody.appendChild(tr);
+                    });
+                }
+
+                const modalEl = document.getElementById('inwardHistoryBreakdownModal');
+                if (modalEl) {
+                    const myModal = bootstrap.Modal.getOrCreateInstance(modalEl);
+                    myModal.show();
+                }
+            };
 
-            const myModal = new bootstrap.Modal(document.getElementById('workorderHistoryBreakdownModal'));
-            myModal.show();
+            if (!inwardHistoryCached || inwardHistoryCached.length === 0) {
+                fetch(contextPath + 'gcctonermanagement/api/inward/list')
+                    .then(res => res.json())
+                    .then(data => {
+                        inwardHistoryCached = data || [];
+                        proceedWithRender();
+                    })
+                    .catch(err => {
+                        console.error("Error fetching inward items for breakdown:", err);
+                        proceedWithRender();
+                    });
+            } else {
+                proceedWithRender();
+            }
         }
 
         function onWorkorderPageSizeChange(val) {
@@ -9260,116 +10464,252 @@
         }
 
         function showWorkorderRequestsBreakdownModal(refNo, pid, tid) {
-            document.getElementById('breakdown-ref').textContent = refNo;
+            document.getElementById('breakdown-ref').textContent = refNo || '-';
             const tbody = document.getElementById('breakdown-table-body');
             tbody.innerHTML = '<tr><td colspan="5" class="text-center py-4"><i class="fa-solid fa-spinner fa-spin me-2"></i>Loading details...</td></tr>';
 
-            const modal = new bootstrap.Modal(document.getElementById('workorderRequestsBreakdownModal'));
-            modal.show();
+            const modalEl = document.getElementById('workorderRequestsBreakdownModal');
+            if (modalEl) {
+                const modal = bootstrap.Modal.getOrCreateInstance(modalEl);
+                modal.show();
+            }
 
             fetch(contextPath + 'gcctonermanagement/api/workorders/items?refNo=' + encodeURIComponent(refNo))
                 .then(res => res.json())
                 .then(data => {
-                    let filtered = data.filter(item => String(item.pid) === String(pid));
-                    if (tid !== undefined && tid !== null && tid !== '') {
+                    let filtered = data || [];
+                    if (pid !== undefined && pid !== null && String(pid) !== '' && String(pid) !== 'undefined' && String(pid) !== 'null') {
+                        filtered = filtered.filter(item => String(item.pid) === String(pid));
+                    }
+                    if (tid !== undefined && tid !== null && String(tid) !== '' && String(tid) !== 'undefined' && String(tid) !== 'null') {
                         filtered = filtered.filter(item => String(item.tid) === String(tid));
                     }
 
-                    if (filtered.length === 0) {
-                        tbody.innerHTML = '<tr><td colspan="5" class="text-center text-muted py-4">No model details found.</td></tr>';
-                        return;
-                    }
+                    if (filtered.length === 0) {
+                        tbody.innerHTML = '<tr><td colspan="5" class="text-center text-muted py-4">No model details found.</td></tr>';
+                        return;
+                    }
+
+                    const printerName = filtered[0].printer_name || '-';
+                    const modelName = filtered[0].model_name || '-';
+                    if (tid !== undefined && tid !== null && tid !== '') {
+                        document.getElementById('breakdown-model').textContent = `${printerName} - ${modelName}`;
+                    } else {
+                        document.getElementById('breakdown-model').textContent = printerName;
+                    }
+
+                    tbody.innerHTML = '';
+                    filtered.forEach((item, index) => {
+                        const tr = document.createElement('tr');
+                        const regQty = parseInt(item.qty_registered || 0);
+                        const rcvQty = parseInt(item.qty_inward_received || 0);
+                        const remaining = Math.max(0, regQty - rcvQty);
+
+                        tr.innerHTML = `
+                            <td class="fw-semibold text-secondary">${index + 1}</td>
+                            <td><span class="badge-toner-model">${escapeHtml(item.model_name || '-')}</span></td>
+                            <td class="text-center fw-semibold text-dark">${regQty}</td>
+                            <td class="text-center fw-semibold text-success">${rcvQty}</td>
+                            <td class="text-center fw-bold ${remaining > 0 ? 'text-warning' : 'text-danger'}">${remaining}</td>
+                        `;
+                        tbody.appendChild(tr);
+                    });
+                })
+                .catch(err => {
+                    console.error("Error loading breakdown: ", err);
+                    tbody.innerHTML = '<tr><td colspan="5" class="text-center text-danger py-4">Failed to load inward breakdown details.</td></tr>';
+                });
+        }
+
+        function showUserRequestBreakdownModal(rawRef, pid) {
+            const itcellRefNo = decodeURIComponent(rawRef || '').trim();
+            const cleanRef = itcellRefNo.toLowerCase();
+            const normRef = cleanRef.replace(/[\s\-_/]/g, '');
+
+            const proceedWithRender = () => {
+                const filtered = (userRequestsCached || []).filter(item => {
+                    const itemItcell = String(item.itcell_ref_no || '').trim().toLowerCase();
+                    const itemReq = String(item.req_no || '').trim().toLowerCase();
+                    const normItcell = itemItcell.replace(/[\s\-_/]/g, '');
+                    const normReq = itemReq.replace(/[\s\-_/]/g, '');
+                    const matchRef = (
+                        (itemItcell && (itemItcell === cleanRef || (normRef && normItcell === normRef))) ||
+                        (itemReq && (itemReq === cleanRef || (normRef && normReq === normRef))) ||
+                        (cleanRef === '-' && !item.itcell_ref_no) ||
+                        String(item.itcell_ref_no || '').trim() === itcellRefNo ||
+                        String(item.req_no || '').trim() === itcellRefNo
+                    );
+                    const matchPid = (pid === undefined || pid === null || String(pid) === '' || String(pid) === 'undefined' || String(pid) === 'null' || String(item.pid) === String(pid));
+                    return matchRef && matchPid;
+                });
+                if (filtered.length === 0) {
+                    showNotification('warning', 'No Details', 'No request items found for this reference.');
+                    return;
+                }
+
+                document.getElementById('user-breakdown-ref').textContent = itcellRefNo || filtered[0].itcell_ref_no || filtered[0].req_no || '-';
+                document.getElementById('user-breakdown-dept').textContent = filtered[0].dept_name || filtered[0].dept_id || '-';
+                const zoneEl = document.getElementById('user-breakdown-zone');
+                if (zoneEl) {
+                    zoneEl.textContent = filtered[0].zone_name || 'N/A';
+                }
+
+                const tbody = document.getElementById('user-breakdown-table-body');
+                tbody.innerHTML = '';
+
+                filtered.forEach((item, index) => {
+                    const tr = document.createElement('tr');
+                    const reqQty = parseInt(item.qty_requested || 0);
+                    const delQty = parseInt(item.qty_delivered || 0);
+                    const reqDateFormatted = (item.request_date && String(item.request_date).trim() !== '' && String(item.request_date).trim() !== 'null')
+                        ? formatDateOnly(item.request_date)
+                        : (formatDateOnly(item.cdate) || '-');
+
+                    let statusBadge = '<span class="badge bg-warning text-dark"><i class="fa-solid fa-clock me-1"></i>Pending</span>';
+                    if (delQty >= reqQty && reqQty > 0) {
+                        statusBadge = '<span class="badge bg-success"><i class="fa-solid fa-circle-check me-1"></i>Delivered</span>';
+                    } else if (delQty > 0) {
+                        statusBadge = '<span class="badge bg-info text-dark"><i class="fa-solid fa-boxes-packing me-1"></i>Partial</span>';
+                    }
+
+                    const editBtn = `
+                        <button type="button" class="btn btn-sm btn-outline-primary fw-semibold px-2 py-1"
+                                style="border-radius: 6px; font-size: 11px; white-space: nowrap;"
+                                onclick="openEditUserRequestModal(${item.id})"
+                                title="Edit this request item">
+                            <i class="fa-solid fa-pen-to-square me-1"></i> Edit
+                        </button>
+                    `;
+
+                    tr.innerHTML = `
+                        <td class="fw-semibold text-secondary">${index + 1}</td>
+                        <td class="fw-bold text-dark font-monospace">${escapeHtml(item.req_no || '-')}</td>
+                        <td>${escapeHtml(item.printer_name || '-')}</td>
+                        <td><span class="badge-toner-model">${escapeHtml(item.model_name || '-')}</span></td>
+                        <td class="text-center font-monospace fw-bold">${reqQty}</td>
+                        <td class="text-center text-success font-monospace fw-bold">${delQty}</td>
+                        <td class="text-center">${statusBadge}</td>
+                        <td><small class="text-muted fw-semibold">${reqDateFormatted}</small></td>
+                        <td class="text-center">${editBtn}</td>
+                    `;
+                    tbody.appendChild(tr);
+                });
+
+                const modalEl = document.getElementById('userRequestBreakdownModal');
+                if (modalEl) {
+                    const myModal = bootstrap.Modal.getOrCreateInstance(modalEl);
+                    myModal.show();
+                }
+            };
+
+            if (!userRequestsCached || userRequestsCached.length === 0) {
+                fetch(contextPath + 'gcctonermanagement/api/requests/list')
+                    .then(res => res.json())
+                    .then(data => {
+                        userRequestsCached = data || [];
+                        proceedWithRender();
+                    })
+                    .catch(err => {
+                        console.error("Error fetching user requests for breakdown:", err);
+                        proceedWithRender();
+                    });
+            } else {
+                proceedWithRender();
+            }
+        }
+
+        function showPrinterStockBreakdownModal(printerName, groupKey) {
+            const targetPrinter = decodeURIComponent(printerName || '').trim();
+            const targetKey = decodeURIComponent(groupKey || '').trim();
+            const cleanPrinter = targetPrinter.toLowerCase();
+
+            let items = [];
+            let groupMeta = null;
+
+            const allStockGroups = Object.assign({}, reportStockGroupsCached || {}, dashboardStockGroupsCached || {});
 
-                    const printerName = filtered[0].printer_name;
-                    const modelName = filtered[0].model_name;
-                    if (tid !== undefined && tid !== null && tid !== '') {
-                        document.getElementById('breakdown-model').textContent = `${printerName} - ${modelName}`;
-                    } else {
-                        document.getElementById('breakdown-model').textContent = printerName;
+            // 1. Try resolving from allStockGroups
+            if (targetKey && typeof allStockGroups === 'object' && allStockGroups[targetKey] && Array.isArray(allStockGroups[targetKey].items)) {
+                groupMeta = allStockGroups[targetKey];
+                items = groupMeta.items;
+            } else if (cleanPrinter && typeof allStockGroups === 'object' && allStockGroups !== null) {
+                for (const k in allStockGroups) {
+                    const grp = allStockGroups[k];
+                    if (grp && (grp.printer_name || '').trim().toLowerCase() === cleanPrinter) {
+                        groupMeta = grp;
+                        items = grp.items;
+                        break;
                     }
+                }
+            }
 
-                    tbody.innerHTML = '';
-                    filtered.forEach((item, index) => {
-                        const tr = document.createElement('tr');
-                        const regQty = parseInt(item.qty_registered || 0);
-                        const rcvQty = parseInt(item.qty_inward_received || 0);
-                        const remaining = Math.max(0, regQty - rcvQty);
-
-                        tr.innerHTML = `
-                            <td class="fw-semibold text-secondary">${index + 1}</td>
-                            <td><span class="badge-toner-model">${escapeHtml(item.model_name || '-')}</span></td>
-                            <td class="text-center fw-semibold text-dark">${regQty}</td>
-                            <td class="text-center fw-semibold text-success">${rcvQty}</td>
-                            <td class="text-center fw-bold ${remaining > 0 ? 'text-warning' : 'text-danger'}">${remaining}</td>
-                        `;
-                        tbody.appendChild(tr);
-                    });
-                })
-                .catch(err => {
-                    console.error("Error loading breakdown: ", err);
-                    tbody.innerHTML = '<tr><td colspan="5" class="text-center text-danger py-4">Failed to load inward breakdown details.</td></tr>';
+            // 2. Fallback to stockSummaryCached
+            if (items.length === 0 && Array.isArray(stockSummaryCached) && stockSummaryCached.length > 0) {
+                items = stockSummaryCached.filter(item => {
+                    const pName = String(item.printer_name || '').trim().toLowerCase();
+                    return cleanPrinter && pName === cleanPrinter;
                 });
-        }
+            }
 
-        function showUserRequestBreakdownModal(itcellRefNo, pid) {
-            const filtered = userRequestsCached.filter(item =>
-                String(item.itcell_ref_no) === String(itcellRefNo) &&
-                (pid === undefined || pid === null || String(item.pid) === String(pid))
-            );
-            if (filtered.length === 0) {
-                showNotification('warning', 'No Details', 'No request items found for this reference.');
+            if (items.length === 0) {
+                showNotification('warning', 'No Details', 'No toner stock items found for this printer model.');
                 return;
             }
 
-            document.getElementById('user-breakdown-ref').textContent = itcellRefNo;
-            document.getElementById('user-breakdown-dept').textContent = filtered[0].dept_name || filtered[0].dept_id;
-            const zoneEl = document.getElementById('user-breakdown-zone');
-            if (zoneEl) {
-                zoneEl.textContent = filtered[0].zone_name || 'N/A';
-            }
+            const pName = groupMeta ? groupMeta.printer_name : (items[0].printer_name || targetPrinter);
+            const totalInward = groupMeta ? groupMeta.inward_qty : items.reduce((acc, it) => acc + (parseInt(it.inward_qty || 0) || 0), 0);
+            const totalOutward = groupMeta ? groupMeta.outward_qty : items.reduce((acc, it) => acc + (parseInt(it.outward_qty || 0) || 0), 0);
+            const totalAvailable = Math.max(0, totalInward - totalOutward);
 
-            const tbody = document.getElementById('user-breakdown-table-body');
-            tbody.innerHTML = '';
+            const nameEl = document.getElementById('printer-stock-breakdown-name');
+            if (nameEl) nameEl.textContent = pName || 'Unknown Printer';
 
-            filtered.forEach((item, index) => {
-                const tr = document.createElement('tr');
-                const reqQty = parseInt(item.qty_requested || 0);
-                const delQty = parseInt(item.qty_delivered || 0);
-                const reqDate = formatTimestamp(item.cdate);
+            const inEl = document.getElementById('printer-stock-breakdown-inward');
+            if (inEl) inEl.textContent = totalInward;
+            const outEl = document.getElementById('printer-stock-breakdown-outward');
+            if (outEl) outEl.textContent = totalOutward;
+            const availEl = document.getElementById('printer-stock-breakdown-available');
+            if (availEl) availEl.textContent = totalAvailable;
 
-                let statusBadge = '<span class="badge bg-warning text-dark"><i class="fa-solid fa-clock me-1"></i>Pending</span>';
-                if (delQty >= reqQty && reqQty > 0) {
-                    statusBadge = '<span class="badge bg-success"><i class="fa-solid fa-circle-check me-1"></i>Delivered</span>';
-                } else if (delQty > 0) {
-                    statusBadge = '<span class="badge bg-info text-dark"><i class="fa-solid fa-boxes-packing me-1"></i>Partial</span>';
-                }
+            const footIn = document.getElementById('printer-stock-foot-inward');
+            if (footIn) footIn.textContent = totalInward;
+            const footOut = document.getElementById('printer-stock-foot-outward');
+            if (footOut) footOut.textContent = totalOutward;
+            const footAvail = document.getElementById('printer-stock-foot-available');
+            if (footAvail) footAvail.textContent = totalAvailable;
 
-                const editBtn = `
-                    <button type="button" class="btn btn-sm btn-outline-primary fw-semibold px-2 py-1"
-                            style="border-radius: 6px; font-size: 11px; white-space: nowrap;"
-                            onclick="openEditUserRequestModal(${item.id})"
-                            title="Edit this request item">
-                        <i class="fa-solid fa-pen-to-square me-1"></i> Edit
-                    </button>
-                `;
+            const tbody = document.getElementById('printer-stock-breakdown-table-body');
+            if (tbody) {
+                tbody.innerHTML = '';
+                items.forEach((item, index) => {
+                    const tr = document.createElement('tr');
+                    const inQty = parseInt(item.inward_qty || 0) || 0;
+                    const outQty = parseInt(item.outward_qty || 0) || 0;
+                    const avail = Math.max(0, inQty - outQty);
+                    let statusBadge = `<span class="badge bg-success font-monospace fw-bold">In Stock</span>`;
+                    if (avail === 0) {
+                        statusBadge = `<span class="badge bg-danger font-monospace fw-bold">Out of stock</span>`;
+                    } else if (avail <= 5) {
+                        statusBadge = `<span class="badge bg-warning text-dark font-monospace fw-bold">Low Stock</span>`;
+                    }
 
-                tr.innerHTML = `
-                    <td class="fw-semibold text-secondary">${index + 1}</td>
-                    <td class="fw-bold text-dark font-monospace">${escapeHtml(item.req_no || '-')}</td>
-                    <td>${escapeHtml(item.printer_name || '-')}</td>
-                    <td><span class="badge-toner-model">${escapeHtml(item.model_name || '-')}</span></td>
-                    <td class="text-center font-monospace fw-bold">${reqQty}</td>
-                    <td class="text-center text-success font-monospace fw-bold">${delQty}</td>
-                    <td class="text-center">${statusBadge}</td>
-                    <td><small class="text-muted fw-semibold">${reqDate}</small></td>
-                    <td class="text-center">${editBtn}</td>
-                `;
-                tbody.appendChild(tr);
-            });
+                    tr.innerHTML = `
+                        <td class="text-center fw-semibold text-secondary">${index + 1}</td>
+                        <td><span class="badge-toner-model">${escapeHtml(item.model_name || 'N/A')}</span></td>
+                        <td class="text-center text-primary font-monospace fw-bold">${item.inward_qty || 0}</td>
+                        <td class="text-center text-success font-monospace fw-bold">${item.outward_qty || 0}</td>
+                        <td class="text-center font-monospace fw-bold ${avail <= 2 ? 'text-danger' : 'text-dark'}">${avail}</td>
+                        <td class="text-center">${statusBadge}</td>
+                    `;
+                    tbody.appendChild(tr);
+                });
+            }
 
-            // Show Bootstrap Modal
-            const myModal = new bootstrap.Modal(document.getElementById('userRequestBreakdownModal'));
-            myModal.show();
+            const modalEl = document.getElementById('printerStockBreakdownModal');
+            if (modalEl) {
+                const myModal = bootstrap.Modal.getOrCreateInstance(modalEl);
+                myModal.show();
+            }
         }
 
         // ================= MASTER DATA MANAGEMENT LOGIC =================
@@ -9506,8 +10846,11 @@
             document.getElementById('edit-master-printer-id').value = printer.id;
             document.getElementById('edit-master-printer-name').value = printer.printer_name || '';
 
-            const modal = new bootstrap.Modal(document.getElementById('editMasterPrinterModal'));
-            modal.show();
+            const modalEl = document.getElementById('editMasterPrinterModal');
+            if (modalEl) {
+                const modal = bootstrap.Modal.getOrCreateInstance(modalEl);
+                modal.show();
+            }
         }
 
         function submitEditMasterPrinter() {
@@ -9853,8 +11196,11 @@
                 });
             }
 
-            const modal = new bootstrap.Modal(document.getElementById('editMasterTonerModal'));
-            modal.show();
+            const modalEl = document.getElementById('editMasterTonerModal');
+            if (modalEl) {
+                const modal = bootstrap.Modal.getOrCreateInstance(modalEl);
+                modal.show();
+            }
         }
 
         function submitEditMasterToner() {
@@ -10166,8 +11512,11 @@
             document.getElementById('edit-master-dept-id').value = dept.id;
             document.getElementById('edit-master-dept-name').value = dept.dept_name || '';
 
-            const modal = new bootstrap.Modal(document.getElementById('editMasterDeptModal'));
-            modal.show();
+            const modalEl = document.getElementById('editMasterDeptModal');
+            if (modalEl) {
+                const modal = bootstrap.Modal.getOrCreateInstance(modalEl);
+                modal.show();
+            }
         }
 
         function submitEditMasterDepartment() {
@@ -10375,6 +11724,20 @@
                 .replace(/'/g, "&#039;");
         }
 
+        function formatDateOnly(ts) {
+            if (!ts) return '-';
+            try {
+                const date = new Date(ts);
+                if (isNaN(date.getTime())) return ts;
+                const dd = String(date.getDate()).padStart(2, '0');
+                const mm = String(date.getMonth() + 1).padStart(2, '0');
+                const yyyy = date.getFullYear();
+                return `${dd}/${mm}/${yyyy}`;
+            } catch (e) {
+                return ts;
+            }
+        }
+
         function formatTimestamp(ts) {
             if (!ts) return '-';
             try {
@@ -10443,7 +11806,7 @@
     <!-- Workorder Register History Breakdown Modal -->
     <div class="modal fade" id="workorderHistoryBreakdownModal" tabindex="-1"
         aria-labelledby="workorderHistoryBreakdownModalLabel" aria-hidden="true">
-        <div class="modal-dialog modal-lg modal-dialog-centered">
+        <div class="modal-dialog modal-xl modal-dialog-centered">
             <div class="modal-content shadow-lg border-0" style="border-radius: 15px;">
                 <div class="modal-header text-white"
                     style="background: #0f5c78; border-top-left-radius: 15px; border-top-right-radius: 15px;">
@@ -10455,11 +11818,15 @@
                 </div>
                 <div class="modal-body p-4">
                     <div class="row mb-3">
-                        <div class="col-sm-6">
+                        <div class="col-sm-4">
+                            <span class="text-muted d-block">File No:</span>
+                            <strong id="wo-breakdown-fileno" class="text-dark fs-5"></strong>
+                        </div>
+                        <div class="col-sm-4 text-center">
                             <span class="text-muted d-block">Workorder Ref:</span>
                             <strong id="wo-breakdown-ref" class="text-dark fs-5"></strong>
                         </div>
-                        <div class="col-sm-6 text-sm-end">
+                        <div class="col-sm-4 text-sm-end">
                             <span class="text-muted d-block">Vendor:</span>
                             <strong id="wo-breakdown-vendor" class="text-dark fs-6"></strong>
                         </div>
@@ -10474,7 +11841,7 @@
                                     <th class="text-center">Registered Qty</th>
                                     <th>Start Date</th>
                                     <th>End Date</th>
-                                    <th class="text-center">DC Copy</th>
+                                    <!-- <th class="text-center">DC Copy</th> -->
                                 </tr>
                             </thead>
                             <tbody id="wo-breakdown-table-body">
@@ -10491,6 +11858,141 @@
         </div>
     </div>
 
+    <!-- Inward Register History Breakdown Modal -->
+    <div class="modal fade" id="inwardHistoryBreakdownModal" tabindex="-1"
+        aria-labelledby="inwardHistoryBreakdownModalLabel" aria-hidden="true">
+        <div class="modal-dialog modal-xl modal-dialog-centered">
+            <div class="modal-content shadow-lg border-0" style="border-radius: 15px;">
+                <div class="modal-header text-white"
+                    style="background: #0f5c78; border-top-left-radius: 15px; border-top-right-radius: 15px;">
+                    <h5 class="modal-title fw-bold" id="inwardHistoryBreakdownModalLabel">
+                        <i class="fa-solid fa-boxes-packing me-2"></i> Inward Register Stock Breakdown
+                    </h5>
+                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"
+                        aria-label="Close"></button>
+                </div>
+                <div class="modal-body p-4">
+                    <div class="row g-2 mb-3 p-3 bg-light rounded border align-items-center">
+                        <div class="col-sm-3">
+                            <span class="text-muted d-block small">File No:</span>
+                            <strong id="inward-breakdown-fileno" class="text-primary font-monospace fs-6"></strong>
+                        </div>
+                        <div class="col-sm-3">
+                            <span class="text-muted d-block small">Workorder Ref:</span>
+                            <strong id="inward-breakdown-ref" class="text-dark font-monospace fs-6"></strong>
+                        </div>
+                        <div class="col-sm-2">
+                            <span class="text-muted d-block small">DC No:</span>
+                            <strong id="inward-breakdown-dcno" class="text-dark font-monospace fs-6"></strong>
+                        </div>
+                        <div class="col-sm-2">
+                            <span class="text-muted d-block small">DC Date:</span>
+                            <strong id="inward-breakdown-dcdate" class="text-dark fs-6"></strong>
+                        </div>
+                        <div class="col-sm-2 text-sm-end">
+                            <span class="text-muted d-block small">Vendor:</span>
+                            <strong id="inward-breakdown-vendor" class="text-dark fs-6"></strong>
+                        </div>
+                    </div>
+                    <div class="table-responsive">
+                        <table class="table table-hover table-striped align-middle border mb-0">
+                            <thead class="table-light">
+                                <tr>
+                                    <th>Sr. No.</th>
+                                    <th>DC No.</th>
+                                    <th>Printer Model</th>
+                                    <th>Toner Model</th>
+                                    <th class="text-center">Qty Inward</th>
+                                    <th>DC Date</th>
+                                    <th>Created Date</th>
+                                    <th>Entered By</th>
+                                    <!-- <th class="text-center">DC Copy</th> -->
+                                </tr>
+                            </thead>
+                            <tbody id="inward-breakdown-table-body">
+                                <!-- Populated dynamically -->
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+                <div class="modal-footer border-0">
+                    <button type="button" class="btn btn-secondary px-4 fw-bold" data-bs-dismiss="modal"
+                        style="border-radius: 8px;">Close</button>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- Outward Delivery Breakdown Modal -->
+    <div class="modal fade" id="outwardBreakdownModal" tabindex="-1" aria-labelledby="outwardBreakdownModalLabel"
+        aria-hidden="true">
+        <div class="modal-dialog modal-xl modal-dialog-centered">
+            <div class="modal-content shadow-lg border-0" style="border-radius: 15px;">
+                <div class="modal-header text-white"
+                    style="background: #0f5c78; border-top-left-radius: 15px; border-top-right-radius: 15px;">
+                    <h5 class="modal-title fw-bold" id="outwardBreakdownModalLabel">
+                        <i class="fa-solid fa-truck-moving me-2"></i> Outward Delivery Details Breakdown
+                    </h5>
+                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"
+                        aria-label="Close"></button>
+                </div>
+                <div class="modal-body p-4">
+                    <div class="row mb-3 pb-3 border-bottom align-items-center">
+                        <div class="col-sm-4">
+                            <span class="text-muted d-block" style="font-size: 0.85rem;">IT Cell Ref No:</span>
+                            <strong id="outward-breakdown-ref" class="text-dark fs-5 font-monospace"></strong>
+                        </div>
+                        <div class="col-sm-4 text-center">
+                            <span class="text-muted d-block" style="font-size: 0.85rem;">Department:</span>
+                            <strong id="outward-breakdown-dept" class="text-dark fs-5"></strong>
+                        </div>
+                        <div class="col-sm-4 text-sm-end">
+                            <span class="text-muted d-block" style="font-size: 0.85rem;">Outward Date:</span>
+                            <strong id="outward-breakdown-date" class="text-dark fs-5"></strong>
+                        </div>
+                    </div>
+                    <div class="table-responsive">
+                        <table class="table table-hover table-striped align-middle border mb-0">
+                            <thead class="table-light">
+                                <tr>
+                                    <th class="text-center" style="width: 60px;">S.No</th>
+                                    <th>Req. No</th>
+                                    <th>Printer Model</th>
+                                    <th>Toner Model</th>
+                                    <th class="text-center">Qty Req</th>
+                                    <th class="text-center">Qty Issued</th>
+                                    <th>Requested Date</th>
+                                    <th>Outward Date</th>
+                                    <th class="text-center">Document / Photo</th>
+                                    <!-- <th class="text-center">Action</th> -->
+                                </tr>
+                            </thead>
+                            <tbody id="outward-breakdown-table-body">
+                                <!-- Populated dynamically -->
+                            </tbody>
+                            <tfoot class="table-light fw-bold">
+                                <tr>
+                                    <td colspan="4" class="text-end pe-3">Total:</td>
+                                    <td class="text-center font-monospace" id="outward-breakdown-total-req">0</td>
+                                    <td class="text-center text-success font-monospace"
+                                        id="outward-breakdown-total-issued">0</td>
+                                    <td colspan="4"></td>
+                                </tr>
+                            </tfoot>
+                        </table>
+                    </div>
+                </div>
+                <div class="modal-footer border-0 d-flex justify-content-between">
+                    <button type="button" class="btn btn-outline-primary fw-bold" id="outward-breakdown-pdf-btn"
+                        style="border-radius: 8px;">
+                        <i class="fa-solid fa-file-arrow-down me-1"></i> Download PDF Ack (All Items)
+                    </button>
+                    <button type="button" class="btn btn-secondary px-4 fw-bold" data-bs-dismiss="modal"
+                        style="border-radius: 8px;">Close</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
     <!-- User Request Breakdown Modal -->
     <div class="modal fade" id="userRequestBreakdownModal" tabindex="-1"
         aria-labelledby="userRequestBreakdownModalLabel" aria-hidden="true">
@@ -10548,6 +12050,82 @@
         </div>
     </div>
 
+    <!-- Printer Stock & Toner Models Breakdown Modal -->
+    <div class="modal fade" id="printerStockBreakdownModal" tabindex="-1"
+        aria-labelledby="printerStockBreakdownModalLabel" aria-hidden="true">
+        <div class="modal-dialog modal-xl modal-dialog-centered">
+            <div class="modal-content shadow-lg border-0" style="border-radius: 15px;">
+                <div class="modal-header text-white"
+                    style="background: #0f5c78; border-top-left-radius: 15px; border-top-right-radius: 15px;">
+                    <h5 class="modal-title fw-bold" id="printerStockBreakdownModalLabel">
+                        <i class="fa-solid fa-print me-2"></i> Printer Stock & Toner Models Breakdown
+                    </h5>
+                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"
+                        aria-label="Close"></button>
+                </div>
+                <div class="modal-body p-4">
+                    <div class="row mb-3 pb-3 border-bottom align-items-center">
+                        <div class="col-sm-4">
+                            <span class="text-muted d-block" style="font-size: 0.85rem; font-weight: 600;">Printer
+                                Model:</span>
+                            <strong id="printer-stock-breakdown-name" class="text-dark fs-5"></strong>
+                        </div>
+                        <div class="col-sm-8 d-flex justify-content-sm-end gap-3 flex-wrap">
+                            <div class="px-3 py-1 bg-light rounded border text-center">
+                                <small class="text-muted d-block" style="font-size: 0.75rem;">Total Inward</small>
+                                <strong id="printer-stock-breakdown-inward"
+                                    class="text-primary fs-6 font-monospace">0</strong>
+                            </div>
+                            <div class="px-3 py-1 bg-light rounded border text-center">
+                                <small class="text-muted d-block" style="font-size: 0.75rem;">Total Outward</small>
+                                <strong id="printer-stock-breakdown-outward"
+                                    class="text-success fs-6 font-monospace">0</strong>
+                            </div>
+                            <div class="px-3 py-1 bg-light rounded border text-center">
+                                <small class="text-muted d-block" style="font-size: 0.75rem;">In Hand
+                                    (Available)</small>
+                                <strong id="printer-stock-breakdown-available"
+                                    class="text-dark fs-6 font-monospace">0</strong>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="table-responsive">
+                        <table class="table table-hover table-striped align-middle border mb-0">
+                            <thead class="table-light">
+                                <tr>
+                                    <th class="text-center" style="width: 60px;">S.No</th>
+                                    <th>Toner Model</th>
+                                    <th class="text-center">Inward Qty</th>
+                                    <th class="text-center">Outward (Issued) Qty</th>
+                                    <th class="text-center">In Hand / Available</th>
+                                    <th class="text-center">Stock Status</th>
+                                </tr>
+                            </thead>
+                            <tbody id="printer-stock-breakdown-table-body">
+                                <!-- Populated dynamically -->
+                            </tbody>
+                            <tfoot class="table-light fw-bold">
+                                <tr>
+                                    <td colspan="2" class="text-end pe-3">Overall Total:</td>
+                                    <td class="text-center text-primary font-monospace" id="printer-stock-foot-inward">0
+                                    </td>
+                                    <td class="text-center text-success font-monospace" id="printer-stock-foot-outward">
+                                        0</td>
+                                    <td class="text-center font-monospace" id="printer-stock-foot-available">0</td>
+                                    <td></td>
+                                </tr>
+                            </tfoot>
+                        </table>
+                    </div>
+                </div>
+                <div class="modal-footer border-0">
+                    <button type="button" class="btn btn-secondary px-4 fw-bold" data-bs-dismiss="modal"
+                        style="border-radius: 8px;">Close</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
     <!-- Edit User Request Modal -->
     <div class="modal fade" id="editUserRequestModal" tabindex="-1" aria-labelledby="editUserRequestModalLabel"
         aria-hidden="true">
@@ -10584,10 +12162,19 @@
                                     placeholder="e.g. IT/2026/001" maxlength="45">
                             </div>
 
+                            <!-- User Requested Date -->
+                            <div class="col-12 col-md-6">
+                                <label class="form-label fw-semibold text-secondary" for="edit-request-date">
+                                    <i class="fa-solid fa-calendar-days text-primary me-1"></i> User Requested Date
+                                </label>
+                                <input type="date" id="edit-request-date" class="form-control-custom">
+                            </div>
+
                             <!-- Department -->
                             <div class="col-12 col-md-6">
                                 <label class="form-label fw-semibold text-secondary" for="edit-request-dept">
-                                    <i class="fa-solid fa-landmark text-primary me-1"></i> Department / Office Name *
+                                    <i class="fa-solid fa-landmark text-primary me-1"></i> Department / Office Name
+                                    *
                                 </label>
                                 <select id="edit-request-dept" required class="form-control-custom">
                                     <option value="">-- Select Department --</option>
@@ -10704,7 +12291,8 @@
                             <strong id="db-breakdown-ref" class="text-dark fs-5"></strong>
                         </div>
                         <div class="col-sm-4">
-                            <span class="text-muted d-block" style="font-size: 0.85rem; font-weight: 600;">Printer Model
+                            <span class="text-muted d-block" style="font-size: 0.85rem; font-weight: 600;">Printer
+                                Model
                                 (Make):</span>
                             <strong id="db-breakdown-printer" class="text-dark fs-5"></strong>
                         </div>
@@ -10788,97 +12376,99 @@
                 </div>
             </div>
         </div>
-        <!-- Outward Receiver Camera Modal -->
-        <div class="modal fade" id="outwardCameraModal" tabindex="-1" aria-labelledby="outwardCameraModalLabel"
-            aria-hidden="true" data-bs-backdrop="static">
-            <div class="modal-dialog modal-dialog-centered modal-md">
-                <div class="modal-content"
-                    style="border-radius: 16px; border: none; box-shadow: 0 10px 40px rgba(0,0,0,0.2); overflow: hidden;">
-                    <div class="modal-header text-white"
-                        style="background: linear-gradient(135deg, #09303d, #0f5c78); padding: 14px 20px;">
-                        <h5 class="modal-title fs-6 fw-bold" id="outwardCameraModalLabel">
-                            <i class="fa-solid fa-camera me-2"></i> Capture Receiver Photo
-                        </h5>
-                        <button type="button" class="btn-close btn-close-white" onclick="closeOutwardCameraModal()"
-                            aria-label="Close"></button>
-                    </div>
-                    <div class="modal-body p-3 text-center" style="background: #0f172a;">
-                        <div id="outward-camera-container" class="position-relative d-inline-block w-100"
-                            style="max-height: 380px; min-height: 240px; background: #000; border-radius: 12px; overflow: hidden; display: flex; align-items: center; justify-content: center;">
-                            <video id="outward-camera-video" autoplay playsinline muted
-                                style="width: 100%; max-height: 380px; object-fit: contain;"></video>
-                            <canvas id="outward-camera-canvas" class="d-none"></canvas>
-                            <div id="outward-camera-loading"
-                                class="position-absolute text-white d-flex flex-column align-items-center justify-content-center w-100 h-100"
-                                style="background: rgba(0,0,0,0.6);">
-                                <div class="spinner-border text-info mb-2" role="status"></div>
-                                <span class="small">Accessing camera...</span>
-                            </div>
-                        </div>
-                        <div id="outward-camera-error"
-                            class="alert alert-danger mt-3 mb-0 d-none text-start small py-2 px-3">
-                            <i class="fa-solid fa-triangle-exclamation me-1"></i> <span
-                                id="outward-camera-error-msg">Camera access denied or unavailable.</span>
+    </div>
+
+    <!-- Outward Receiver Camera Modal -->
+    <div class="modal fade" id="outwardCameraModal" tabindex="-1" aria-labelledby="outwardCameraModalLabel"
+        aria-hidden="true" data-bs-backdrop="static">
+        <div class="modal-dialog modal-dialog-centered modal-md">
+            <div class="modal-content"
+                style="border-radius: 16px; border: none; box-shadow: 0 10px 40px rgba(0,0,0,0.2); overflow: hidden;">
+                <div class="modal-header text-white"
+                    style="background: linear-gradient(135deg, #09303d, #0f5c78); padding: 14px 20px;">
+                    <h5 class="modal-title fs-6 fw-bold" id="outwardCameraModalLabel">
+                        <i class="fa-solid fa-camera me-2"></i> Capture Receiver Photo
+                    </h5>
+                    <button type="button" class="btn-close btn-close-white" onclick="closeOutwardCameraModal()"
+                        aria-label="Close"></button>
+                </div>
+                <div class="modal-body p-3 text-center" style="background: #0f172a;">
+                    <div id="outward-camera-container" class="position-relative d-inline-block w-100"
+                        style="max-height: 380px; min-height: 240px; background: #000; border-radius: 12px; overflow: hidden; display: flex; align-items: center; justify-content: center;">
+                        <video id="outward-camera-video" autoplay playsinline muted
+                            style="width: 100%; max-height: 380px; object-fit: contain;"></video>
+                        <canvas id="outward-camera-canvas" class="d-none"></canvas>
+                        <div id="outward-camera-loading"
+                            class="position-absolute text-white d-flex flex-column align-items-center justify-content-center w-100 h-100"
+                            style="background: rgba(0,0,0,0.6);">
+                            <div class="spinner-border text-info mb-2" role="status"></div>
+                            <span class="small">Accessing camera...</span>
                         </div>
                     </div>
-                    <div class="modal-footer d-flex justify-content-between py-2 px-3 bg-light">
-                        <button type="button" class="btn btn-outline-secondary btn-sm px-3 fw-semibold"
-                            onclick="closeOutwardCameraModal()" style="border-radius: 8px;">
-                            <i class="fa-solid fa-xmark me-1"></i> Cancel
+                    <div id="outward-camera-error"
+                        class="alert alert-danger mt-3 mb-0 d-none text-start small py-2 px-3">
+                        <i class="fa-solid fa-triangle-exclamation me-1"></i> <span id="outward-camera-error-msg">Camera
+                            access denied or unavailable.</span>
+                    </div>
+                </div>
+                <div class="modal-footer d-flex justify-content-between py-2 px-3 bg-light">
+                    <button type="button" class="btn btn-outline-secondary btn-sm px-3 fw-semibold"
+                        onclick="closeOutwardCameraModal()" style="border-radius: 8px;">
+                        <i class="fa-solid fa-xmark me-1"></i> Cancel
+                    </button>
+                    <div class="d-flex gap-2">
+                        <button type="button" class="btn btn-outline-primary btn-sm px-3 fw-semibold"
+                            id="outward-camera-flip-btn" onclick="switchOutwardCameraFacing()"
+                            style="border-radius: 8px;" title="Switch Camera">
+                            <i class="fa-solid fa-camera-rotate me-1"></i> Flip Camera
+                        </button>
+                        <button type="button" class="btn btn-success btn-sm px-4 fw-bold"
+                            id="outward-camera-capture-btn" onclick="captureOutwardPhoto()"
+                            style="border-radius: 8px; background: #15803d; border-color: #15803d;">
+                            <i class="fa-solid fa-circle-dot me-1"></i> Capture
                         </button>
-                        <div class="d-flex gap-2">
-                            <button type="button" class="btn btn-outline-primary btn-sm px-3 fw-semibold"
-                                id="outward-camera-flip-btn" onclick="switchOutwardCameraFacing()"
-                                style="border-radius: 8px;" title="Switch Camera">
-                                <i class="fa-solid fa-camera-rotate me-1"></i> Flip Camera
-                            </button>
-                            <button type="button" class="btn btn-success btn-sm px-4 fw-bold"
-                                id="outward-camera-capture-btn" onclick="captureOutwardPhoto()"
-                                style="border-radius: 8px; background: #15803d; border-color: #15803d;">
-                                <i class="fa-solid fa-circle-dot me-1"></i> Capture
-                            </button>
-                        </div>
                     </div>
                 </div>
             </div>
         </div>
+    </div>
 
-        <!-- Receiver Photo View Modal -->
-        <div class="modal fade" id="receiverPhotoViewModal" tabindex="-1" aria-labelledby="receiverPhotoViewModalLabel"
-            aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered modal-md">
-                <div class="modal-content"
-                    style="border-radius: 16px; border: none; box-shadow: 0 10px 40px rgba(0,0,0,0.2); overflow: hidden;">
-                    <div class="modal-header text-white"
-                        style="background: linear-gradient(135deg, #09303d, #0f5c78); padding: 14px 20px;">
-                        <h5 class="modal-title fs-6 fw-bold" id="receiverPhotoViewModalLabel">
-                            <i class="fa-solid fa-image me-2"></i> Receiver Photo
-                        </h5>
-                        <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"
-                            aria-label="Close"></button>
-                    </div>
-                    <div class="modal-body p-3 text-center" style="background: #f8fafc;">
-                        <img id="receiver-photo-modal-img" src="" alt="Receiver Photo"
-                            class="img-fluid rounded border shadow-sm"
-                            style="max-height: 480px; object-fit: contain; width: 100%;">
-                    </div>
-                    <div class="modal-footer d-flex justify-content-between py-2 px-3 bg-light">
-                        <span class="small text-muted" id="receiver-photo-modal-subtext"></span>
-                        <div class="d-flex gap-2">
-                            <a id="receiver-photo-modal-download" href="#" target="_blank" download="receiver_photo.jpg"
-                                class="btn btn-primary btn-sm px-3 fw-semibold"
-                                style="border-radius: 8px; background: #0f5c78; border-color: #0f5c78;">
-                                <i class="fa-solid fa-download me-1"></i> Download
-                            </a>
-                            <button type="button" class="btn btn-secondary btn-sm px-3 fw-semibold"
-                                data-bs-dismiss="modal" style="border-radius: 8px;">
-                                Close
-                            </button>
-                        </div>
+    <!-- Receiver Photo View Modal -->
+    <div class="modal fade" id="receiverPhotoViewModal" tabindex="-1" aria-labelledby="receiverPhotoViewModalLabel"
+        aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered modal-md">
+            <div class="modal-content"
+                style="border-radius: 16px; border: none; box-shadow: 0 10px 40px rgba(0,0,0,0.2); overflow: hidden;">
+                <div class="modal-header text-white"
+                    style="background: linear-gradient(135deg, #09303d, #0f5c78); padding: 14px 20px;">
+                    <h5 class="modal-title fs-6 fw-bold" id="receiverPhotoViewModalLabel">
+                        <i class="fa-solid fa-image me-2"></i> Receiver Photo
+                    </h5>
+                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"
+                        aria-label="Close"></button>
+                </div>
+                <div class="modal-body p-3 text-center" style="background: #f8fafc;">
+                    <img id="receiver-photo-modal-img" src="" alt="Receiver Photo"
+                        class="img-fluid rounded border shadow-sm"
+                        style="max-height: 480px; object-fit: contain; width: 100%;">
+                </div>
+                <div class="modal-footer d-flex justify-content-between py-2 px-3 bg-light">
+                    <span class="small text-muted" id="receiver-photo-modal-subtext"></span>
+                    <div class="d-flex gap-2">
+                        <a id="receiver-photo-modal-download" href="#" target="_blank" download="receiver_photo.jpg"
+                            class="btn btn-primary btn-sm px-3 fw-semibold"
+                            style="border-radius: 8px; background: #0f5c78; border-color: #0f5c78;">
+                            <i class="fa-solid fa-download me-1"></i> Download
+                        </a>
+                        <button type="button" class="btn btn-secondary btn-sm px-3 fw-semibold" data-bs-dismiss="modal"
+                            style="border-radius: 8px;">
+                            Close
+                        </button>
                     </div>
                 </div>
             </div>
         </div>
+    </div>
 </body>
 
 </html>
\ No newline at end of file