From 6e8ad1c41279d5fa548a451d0a9cd6b6c907f68c Mon Sep 17 00:00:00 2001
From: Tom Butcher <thomasbutcher15@gmail.com>
Date: Sun, 30 Aug 2026 14:58:47 +0100
Subject: [PATCH] Refactor Invoice, PurchaseOrder, and SalesOrder Models to
 Remove Partially Paid/Shipped/Delivered Metrics

- Removed partially paid, partially shipped, and partially delivered metrics from Invoice, PurchaseOrder, and SalesOrder models to streamline data representation.
- Updated shipped and received metrics to include sums of their respective partially metrics, enhancing overall clarity in order tracking.
---
 src/database/models/Invoice.js       | 15 ---------------
 src/database/models/PurchaseOrder.js | 14 ++------------
 src/database/models/SalesOrder.js    | 14 ++------------
 3 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/src/database/models/Invoice.js b/src/database/models/Invoice.js
index a6ac4abd..c0953bc4 100644
--- a/src/database/models/Invoice.js
+++ b/src/database/models/Invoice.js
@@ -722,12 +722,6 @@ export const Invoice = {
         'acknowledged.acknowledgedGrandTotalAmount.sum'
       ]
     },
-    {
-      name: 'partiallyPaid.partiallyPaidCount.count',
-      label: 'Partially Paid',
-      type: 'number',
-      color: 'processing'
-    },
     {
       name: 'overdue.overdueCount.count',
       label: 'Overdue',
@@ -742,15 +736,6 @@ export const Invoice = {
       roundNumber: 2,
       color: 'error'
     },
-    {
-      name: 'partiallyPaid.partiallyPaidGrandTotalAmount.sum',
-      label: 'Partially Paid Amount',
-      type: 'number',
-      prefix: '£',
-      roundNumber: 2,
-      color: 'processing',
-      cardWidth: 200
-    },
     {
       name: 'paid.paidCount.count',
       label: 'Paid',
diff --git a/src/database/models/PurchaseOrder.js b/src/database/models/PurchaseOrder.js
index 887c1e58..95927c12 100644
--- a/src/database/models/PurchaseOrder.js
+++ b/src/database/models/PurchaseOrder.js
@@ -414,28 +414,18 @@ export const PurchaseOrder = {
       type: 'number',
       color: 'purple'
     },
-    {
-      name: 'partiallyShipped.count',
-      label: 'Partially Shipped',
-      type: 'number',
-      color: 'processing'
-    },
     {
       name: 'shipped.count',
       label: 'Shipped',
       type: 'number',
+      sum: ['partiallyShipped.count', 'shipped.count'],
       color: 'processing'
     },
-    {
-      name: 'partiallyReceived.count',
-      label: 'Partially Received',
-      type: 'number',
-      color: 'success'
-    },
     {
       name: 'received.count',
       label: 'Received',
       type: 'number',
+      sum: ['partiallyReceived.count', 'received.count'],
       color: 'success'
     },
     {
diff --git a/src/database/models/SalesOrder.js b/src/database/models/SalesOrder.js
index e3c6fe50..69e2279c 100644
--- a/src/database/models/SalesOrder.js
+++ b/src/database/models/SalesOrder.js
@@ -413,28 +413,18 @@ export const SalesOrder = {
       type: 'number',
       color: 'purple'
     },
-    {
-      name: 'partiallyShipped.count',
-      label: 'Partially Shipped',
-      type: 'number',
-      color: 'processing'
-    },
     {
       name: 'shipped.count',
       label: 'Shipped',
       type: 'number',
+      sum: ['partiallyShipped.count', 'shipped.count'],
       color: 'processing'
     },
-    {
-      name: 'partiallyDelivered.count',
-      label: 'Partially Delivered',
-      type: 'number',
-      color: 'success'
-    },
     {
       name: 'delivered.count',
       label: 'Delivered',
       type: 'number',
+      sum: ['partiallyDelivered.count', 'delivered.count'],
       color: 'success'
     },
     {