From 2b6e8c035dd5dbe203864706667fdeef093f65bd Mon Sep 17 00:00:00 2001
From: suhailanzar <suhailanzar00@gmail.com>
Date: Thu, 19 Jun 2025 17:02:10 +0530
Subject: [PATCH 1/3] fix: updated partial return items

---
 models/baseModels/Invoice/Invoice.ts         | 63 +++++++++++++++++---
 models/baseModels/InvoiceItem/InvoiceItem.ts | 19 ++----
 models/helpers.ts                            | 42 ++++++++++++-
 schemas/app/Invoice.json                     |  6 ++
 src/pages/POS/LoyaltyProgramModal.vue        |  4 +-
 src/pages/POS/POS.vue                        |  2 +-
 6 files changed, 110 insertions(+), 26 deletions(-)

diff --git a/models/baseModels/Invoice/Invoice.ts b/models/baseModels/Invoice/Invoice.ts
index 954a2a2b..6c32d25d 100644
--- a/models/baseModels/Invoice/Invoice.ts
+++ b/models/baseModels/Invoice/Invoice.ts
@@ -24,6 +24,7 @@ import {
   getPricingRulesConflicts,
   removeLoyaltyPoint,
   roundFreeItemQty,
+  getReturnQtyTotal,
 } from 'models/helpers';
 import { StockTransfer } from 'models/inventory/StockTransfer';
 import { validateBatch } from 'models/inventory/helpers';
@@ -94,6 +95,7 @@ export abstract class Invoice extends Transactional {
 
   isReturned?: boolean;
   returnAgainst?: string;
+  isFullyReturned?: boolean;
 
   pricingRuleDetail?: PricingRuleDetail[];
 
@@ -203,7 +205,7 @@ export abstract class Invoice extends Transactional {
       await this._removeLoyaltyPointEntry();
       await this._updateIsItemsReturned();
       this.reduceUsedCountOfCoupons();
-
+      await this.updateIsItemsFullyReturned();
       return;
     }
 
@@ -463,6 +465,9 @@ export abstract class Invoice extends Transactional {
       }, (this.netTotal as Money).abs())
       .sub(totalDiscount);
 
+    if (this.redeemLoyaltyPoints) {
+      return this.getLPAddedBaseGrandTotal();
+    }
     return grandTotal;
   }
 
@@ -655,6 +660,8 @@ export abstract class Invoice extends Transactional {
 
     let returnDocItems: DocValueMap[] = [];
 
+    const sumOfReturnDocs = await getReturnQtyTotal(this);
+
     const returnBalanceItemsQty = await this.fyo.db.getReturnBalanceItemsQty(
       this.schemaName,
       this.name
@@ -662,13 +669,16 @@ export abstract class Invoice extends Transactional {
 
     for (const item of docItems) {
       if (!returnBalanceItemsQty) {
-        returnDocItems = docItems;
+        returnDocItems = docItems.map((docItem) => ({
+          ...docItem,
+          name: undefined,
+          quantity: -(sumOfReturnDocs[docItem.item as string] || 0),
+        }));
+
         for (const row of returnDocItems) {
-          row.name = undefined;
           row.itemDiscountedTotal = await this.getItemsDiscountedTotal(
             row as InvoiceItem
           );
-          (row.quantity as number) *= -1;
         }
         break;
       }
@@ -684,6 +694,10 @@ export abstract class Invoice extends Transactional {
       const returnedItem: ReturnDocItem | undefined =
         returnBalanceItemsQty[item.item as string];
 
+      if (!returnedItem) {
+        continue;
+      }
+
       let quantity = returnedItem.quantity;
       let serialNumber: string | undefined =
         returnedItem.serialNumbers?.join('\n');
@@ -710,6 +724,24 @@ export abstract class Invoice extends Transactional {
         quantity: quantity,
       });
     }
+
+    returnDocItems.forEach((docItems) => {
+      const itemName = docItems.item;
+      if (typeof itemName === 'string' || typeof itemName === 'number') {
+        if (itemName in sumOfReturnDocs) {
+          docItems.quantity = sumOfReturnDocs[itemName];
+        }
+      }
+    });
+
+    returnDocItems = returnDocItems.filter(
+      (docItems) => (docItems.quantity as number) > 0
+    );
+
+    returnDocItems.forEach((docItems) => {
+      docItems.quantity = -(docItems.quantity as number);
+    });
+
     const returnDocData = {
       ...docData,
       name: undefined,
@@ -752,6 +784,25 @@ export abstract class Invoice extends Transactional {
     });
   }
 
+  async updateIsItemsFullyReturned() {
+    if (!this.returnAgainst) {
+      return;
+    }
+    const sumOfReturnDocs = await getReturnQtyTotal(this);
+    const isFullyReturned = Object.values(sumOfReturnDocs).every(
+      (quantity) => quantity === 0
+    );
+    if (!isFullyReturned) {
+      return;
+    }
+    const invoiceDoc = await this.fyo.doc.getDoc(
+      this.schemaName,
+      this.returnAgainst
+    );
+    await invoiceDoc.setAndSync({ isFullyReturned });
+    await invoiceDoc.submit();
+  }
+
   async _updateIsItemsReturned() {
     if (!this.isReturn || !this.returnAgainst || this.isQuote) {
       return;
@@ -917,10 +968,6 @@ export abstract class Invoice extends Transactional {
           }
         }
 
-        if (this.redeemLoyaltyPoints) {
-          return await this.getLPAddedBaseGrandTotal();
-        }
-
         return this.baseGrandTotal;
       },
       dependsOn: ['discountAmount', 'discountPercent'],
diff --git a/models/baseModels/InvoiceItem/InvoiceItem.ts b/models/baseModels/InvoiceItem/InvoiceItem.ts
index 9eea9d76..bbf71787 100644
--- a/models/baseModels/InvoiceItem/InvoiceItem.ts
+++ b/models/baseModels/InvoiceItem/InvoiceItem.ts
@@ -401,16 +401,7 @@ export abstract class InvoiceItem extends Doc {
 
         return getTaxedTotalBeforeDiscounting(totalTaxRate, rate, quantity);
       },
-      dependsOn: [
-        'itemDiscountAmount',
-        'itemDiscountPercent',
-        'itemDiscountedTotal',
-        'setItemDiscountAmount',
-        'tax',
-        'rate',
-        'quantity',
-        'item',
-      ],
+      dependsOn: ['rate', 'quantity', 'item'],
     },
     stockNotTransferred: {
       formula: async () => {
@@ -735,12 +726,12 @@ function getDiscountedTotalBeforeTaxation(
    * - if percent: Quantity * Rate (1 - DiscountPercent / 100)
    */
 
-  const amount = rate.mul(quantity);
   if (setDiscountAmount) {
-    return amount.sub(itemDiscountAmount);
+    return rate.sub(itemDiscountAmount).mul(quantity);
+  } else if (itemDiscountPercent > 0) {
+    return rate.mul(quantity).percent(itemDiscountPercent);
   }
-
-  return amount.mul(1 - itemDiscountPercent / 100);
+  return rate.mul(quantity);
 }
 
 function getTaxedTotalAfterDiscounting(
diff --git a/models/helpers.ts b/models/helpers.ts
index c05abda4..6a6b9385 100644
--- a/models/helpers.ts
+++ b/models/helpers.ts
@@ -286,7 +286,6 @@ export function getMakeReturnDocAction(fyo: Fyo): Action {
     label: fyo.t`Return`,
     group: fyo.t`Create`,
     condition: (doc: Doc) =>
-      !doc.isReturn &&
       (!!fyo.singles.AccountingSettings?.enableInvoiceReturns ||
         !!fyo.singles.InventorySettings?.enableStockReturns) &&
       doc.isSubmitted &&
@@ -712,6 +711,47 @@ export async function addItem<M extends ModelsWithItems>(name: string, doc: M) {
   await item.set('item', name);
 }
 
+export async function getReturnQtyTotal(
+  doc: Invoice
+): Promise<Record<string, number>> {
+  const returnDocs = await doc.fyo.db.getAll(doc.schemaName, {
+    fields: ['*'],
+    filters: {
+      returnAgainst: doc.name as string,
+    },
+  });
+
+  const returnDocNames = await Promise.all(
+    returnDocs.map((docss) =>
+      doc.fyo.doc.getDoc(doc.schemaName, docss.name as string)
+    )
+  );
+
+  const quantitySum: { [key: string]: number } = {};
+
+  if ('items' in doc && Array.isArray(doc.items)) {
+    doc.items.forEach((docItem) => {
+      const itemName = docItem.item as string;
+      if (itemName) {
+        quantitySum[itemName] = (docItem.quantity as number) || 0;
+      }
+    });
+  }
+
+  returnDocNames.forEach((documents) => {
+    if ('items' in documents && Array.isArray(documents.items)) {
+      documents.items.forEach((item: InvoiceItem) => {
+        const itemName = item.item;
+        if (itemName && quantitySum.hasOwnProperty(itemName)) {
+          quantitySum[itemName] =
+            quantitySum[itemName] - Math.abs(item.quantity as number);
+        }
+      });
+    }
+  });
+  return quantitySum;
+}
+
 export async function createLoyaltyPointEntry(doc: Invoice) {
   const loyaltyProgramDoc = (await doc.fyo.doc.getDoc(
     ModelNameEnum.LoyaltyProgram,
diff --git a/schemas/app/Invoice.json b/schemas/app/Invoice.json
index 74191775..4bff7f5a 100644
--- a/schemas/app/Invoice.json
+++ b/schemas/app/Invoice.json
@@ -187,6 +187,12 @@
       "hidden": true,
       "default": false
     },
+    {
+      "fieldname": "isFullyReturned",
+      "fieldtype": "Check",
+      "hidden": true,
+      "default": false
+    },
     {
       "fieldname": "isSyncedWithErp",
       "fieldtype": "Check",
diff --git a/src/pages/POS/LoyaltyProgramModal.vue b/src/pages/POS/LoyaltyProgramModal.vue
index a2934fe1..afcb3568 100644
--- a/src/pages/POS/LoyaltyProgramModal.vue
+++ b/src/pages/POS/LoyaltyProgramModal.vue
@@ -1,6 +1,6 @@
 <template>
   <Modal class="h-96 w-96" :set-close-listener="false">
-    <p class="text-center py-4">Redeem Loyalty Points</p>
+    <p class="text-center py-4 dark:text-gray-100">Redeem Loyalty Points</p>
 
     <hr class="dark:border-gray-800" />
 
@@ -17,7 +17,7 @@
         />
       </svg>
 
-      <p>{{ loyaltyPoints }}</p>
+      <p class="dark:text-gray-100">{{ loyaltyPoints }}</p>
     </div>
 
     <Int
diff --git a/src/pages/POS/POS.vue b/src/pages/POS/POS.vue
index 345295cf..f6daddc2 100644
--- a/src/pages/POS/POS.vue
+++ b/src/pages/POS/POS.vue
@@ -578,7 +578,7 @@ export default defineComponent({
     },
     async setLoyaltyPoints(value: number) {
       this.appliedLoyaltyPoints = value;
-      this.sinvDoc.redeemLoyaltyPoints = true;
+      await this.sinvDoc.set('redeemLoyaltyPoints', true);
 
       const totalLotaltyAmount = await getAddedLPWithGrandTotal(
         this.fyo,

From e96b3126c166c6e65d0947f55d7d67fcefa6f1b8 Mon Sep 17 00:00:00 2001
From: suhailanzar <suhailanzar00@gmail.com>
Date: Fri, 20 Jun 2025 12:22:36 +0530
Subject: [PATCH 2/3] fix: updated return doc filter in pos

---
 models/baseModels/Invoice/Invoice.ts      | 23 ++++++++++++++++++-----
 src/pages/POS/ReturnSalesInvoiceModal.vue |  4 ++--
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/models/baseModels/Invoice/Invoice.ts b/models/baseModels/Invoice/Invoice.ts
index 6c32d25d..fa1d21b5 100644
--- a/models/baseModels/Invoice/Invoice.ts
+++ b/models/baseModels/Invoice/Invoice.ts
@@ -205,7 +205,8 @@ export abstract class Invoice extends Transactional {
       await this._removeLoyaltyPointEntry();
       await this._updateIsItemsReturned();
       this.reduceUsedCountOfCoupons();
-      await this.updateIsItemsFullyReturned();
+      if (this.schemaName === ModelNameEnum.SalesInvoice)
+        [await this.updateIsItemsFullyReturned(this)];
       return;
     }
 
@@ -784,11 +785,23 @@ export abstract class Invoice extends Transactional {
     });
   }
 
-  async updateIsItemsFullyReturned() {
-    if (!this.returnAgainst) {
-      return;
+  async updateIsItemsFullyReturned(doc?: Invoice) {
+    let mainDoc;
+    if (doc?.returnAgainst) {
+      mainDoc = await this.fyo.doc.getDoc(
+        ModelNameEnum.SalesInvoice,
+        doc.returnAgainst
+      );
     }
-    const sumOfReturnDocs = await getReturnQtyTotal(this);
+
+    let invoiceDocs: Invoice;
+    if (doc) {
+      invoiceDocs = mainDoc as Invoice;
+    } else {
+      invoiceDocs = this as Invoice;
+    }
+
+    const sumOfReturnDocs = await getReturnQtyTotal(invoiceDocs);
     const isFullyReturned = Object.values(sumOfReturnDocs).every(
       (quantity) => quantity === 0
     );
diff --git a/src/pages/POS/ReturnSalesInvoiceModal.vue b/src/pages/POS/ReturnSalesInvoiceModal.vue
index 405b5dc1..dd796093 100644
--- a/src/pages/POS/ReturnSalesInvoiceModal.vue
+++ b/src/pages/POS/ReturnSalesInvoiceModal.vue
@@ -212,11 +212,11 @@ export default defineComponent({
 
       const returnedInvoiceNames = allInvoices
         .filter((inv) => {
-          if (inv.isReturned) {
+          if (inv.isFullyReturned || inv.returnAgainst) {
             return false;
           }
 
-          if (inv.isReturned && !(inv.outstandingAmount as Money).isZero()) {
+          if (inv.isReturned && !inv.isFullyReturned) {
             return true;
           }
 

From fc81d4aa00702bb8f1074d23557e95f2f1a3f8ec Mon Sep 17 00:00:00 2001
From: suhailanzar <suhailanzar00@gmail.com>
Date: Mon, 23 Jun 2025 14:23:23 +0530
Subject: [PATCH 3/3] fix: payment calculations  in pos and code optimization

---
 models/baseModels/Invoice/Invoice.ts | 33 +++++++++++++---------------
 models/baseModels/Payment/Payment.ts | 27 ++++++++++++++---------
 models/helpers.ts                    | 11 ++++++----
 src/pages/POS/POS.vue                |  1 +
 4 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/models/baseModels/Invoice/Invoice.ts b/models/baseModels/Invoice/Invoice.ts
index fa1d21b5..7505e521 100644
--- a/models/baseModels/Invoice/Invoice.ts
+++ b/models/baseModels/Invoice/Invoice.ts
@@ -661,7 +661,7 @@ export abstract class Invoice extends Transactional {
 
     let returnDocItems: DocValueMap[] = [];
 
-    const sumOfReturnDocs = await getReturnQtyTotal(this);
+    const totalQtyOfReturnedItems = await getReturnQtyTotal(this);
 
     const returnBalanceItemsQty = await this.fyo.db.getReturnBalanceItemsQty(
       this.schemaName,
@@ -673,7 +673,7 @@ export abstract class Invoice extends Transactional {
         returnDocItems = docItems.map((docItem) => ({
           ...docItem,
           name: undefined,
-          quantity: -(sumOfReturnDocs[docItem.item as string] || 0),
+          quantity: -(totalQtyOfReturnedItems[docItem.item as string] || 0),
         }));
 
         for (const row of returnDocItems) {
@@ -727,11 +727,9 @@ export abstract class Invoice extends Transactional {
     }
 
     returnDocItems.forEach((docItems) => {
-      const itemName = docItems.item;
-      if (typeof itemName === 'string' || typeof itemName === 'number') {
-        if (itemName in sumOfReturnDocs) {
-          docItems.quantity = sumOfReturnDocs[itemName];
-        }
+      const itemName = docItems.item as string;
+      if (itemName in totalQtyOfReturnedItems) {
+        docItems.quantity = totalQtyOfReturnedItems[itemName];
       }
     });
 
@@ -786,23 +784,18 @@ export abstract class Invoice extends Transactional {
   }
 
   async updateIsItemsFullyReturned(doc?: Invoice) {
-    let mainDoc;
+    let sinvDoc;
     if (doc?.returnAgainst) {
-      mainDoc = await this.fyo.doc.getDoc(
+      sinvDoc = await this.fyo.doc.getDoc(
         ModelNameEnum.SalesInvoice,
         doc.returnAgainst
       );
     }
 
-    let invoiceDocs: Invoice;
-    if (doc) {
-      invoiceDocs = mainDoc as Invoice;
-    } else {
-      invoiceDocs = this as Invoice;
-    }
-
-    const sumOfReturnDocs = await getReturnQtyTotal(invoiceDocs);
-    const isFullyReturned = Object.values(sumOfReturnDocs).every(
+    const totalQtyOfReturnedItems = await getReturnQtyTotal(
+      (sinvDoc as Invoice) ?? this
+    );
+    const isFullyReturned = Object.values(totalQtyOfReturnedItems).every(
       (quantity) => quantity === 0
     );
     if (!isFullyReturned) {
@@ -889,6 +882,10 @@ export abstract class Invoice extends Transactional {
       this.loyaltyPoints as number
     );
 
+    if (this.redeemLoyaltyPoints && (this.loyaltyPoints as number) > 0) {
+      this.grandTotal?.add(totalLotaltyAmount);
+    }
+
     return this.grandTotal?.sub(totalLotaltyAmount);
   }
 
diff --git a/models/baseModels/Payment/Payment.ts b/models/baseModels/Payment/Payment.ts
index 6993d865..43fcf92b 100644
--- a/models/baseModels/Payment/Payment.ts
+++ b/models/baseModels/Payment/Payment.ts
@@ -470,11 +470,9 @@ export class Payment extends Transactional {
 
     for (const row of this.for ?? []) {
       if (!this.fyo.singles.AccountingSettings?.enablePartialPayment) {
-        const amount = !(this.amountPaid as Money).isZero()
-          ? (this.amountPaid as Money)
-          : (this.amount as Money);
-        const initialAmount = this.initialAmount as Money;
-        if (amount.lt(initialAmount) && !amount.eq(initialAmount)) {
+        const amount = this.amount as Money;
+        const totalAmount = this.totalAmount as Money;
+        if (amount.lt(totalAmount)) {
           if (this.writeoff?.isZero()) {
             this.amount = this.initialAmount;
             row.amountPaid = this.fyo.pesa(0);
@@ -705,7 +703,7 @@ export class Payment extends Transactional {
   };
 
   validations: ValidationMap = {
-    amount: (value: DocValue) => {
+    amount: async (value: DocValue) => {
       if ((value as Money).isNegative()) {
         throw new ValidationError(
           this.fyo.t`Payment amount cannot be less than zero.`
@@ -716,13 +714,22 @@ export class Payment extends Transactional {
         return;
       }
 
-      if (!this.initialAmount) {
-        this.initialAmount = this.amount as Money;
+      if (!this.totalAmount) {
+        for (const row of this.for ?? []) {
+          const referenceDoc = (await this.fyo.doc.getDoc(
+            row.referenceType as string,
+            row.referenceName as string
+          )) as Invoice;
+
+          this.totalAmount = referenceDoc.outstandingAmount?.abs();
+        }
       }
-      if ((value as Money).gt(this.initialAmount)) {
+
+      if ((value as Money).gt(this.totalAmount as Money)) {
+        this.amount = this.initialAmount;
         throw new ValidationError(
           this.fyo.t`Payment amount cannot exceed ${this.fyo.format(
-            this.initialAmount,
+            this.totalAmount,
             'Currency'
           )}.`
         );
diff --git a/models/helpers.ts b/models/helpers.ts
index 6a6b9385..230b6743 100644
--- a/models/helpers.ts
+++ b/models/helpers.ts
@@ -721,7 +721,7 @@ export async function getReturnQtyTotal(
     },
   });
 
-  const returnDocNames = await Promise.all(
+  const returnedDocs = await Promise.all(
     returnDocs.map((docss) =>
       doc.fyo.doc.getDoc(doc.schemaName, docss.name as string)
     )
@@ -738,9 +738,12 @@ export async function getReturnQtyTotal(
     });
   }
 
-  returnDocNames.forEach((documents) => {
-    if ('items' in documents && Array.isArray(documents.items)) {
-      documents.items.forEach((item: InvoiceItem) => {
+  if (!returnedDocs) {
+    return quantitySum;
+  }
+  returnedDocs.forEach((returnedDoc) => {
+    if (returnedDoc && returnedDoc.items) {
+      (returnedDoc.items as InvoiceItem[]).forEach((item) => {
         const itemName = item.item;
         if (itemName && quantitySum.hasOwnProperty(itemName)) {
           quantitySum[itemName] =
diff --git a/src/pages/POS/POS.vue b/src/pages/POS/POS.vue
index f6daddc2..a6de3554 100644
--- a/src/pages/POS/POS.vue
+++ b/src/pages/POS/POS.vue
@@ -591,6 +591,7 @@ export default defineComponent({
         .abs();
 
       this.sinvDoc.grandTotal = total;
+      this.sinvDoc.outstandingAmount = total;
     },
     async selectedInvoiceName(doc: SalesInvoice) {
       const salesInvoiceDoc = (await this.fyo.doc.getDoc(