Merge pull request #1085 from AbleKSaju/fix-discount-amount

fix: calculation of tax amount
frappe · Jan 13, 2025 · 8a7559b · 8a7559b
2 parents 0a72f24 + 12a2e3d
commit 8a7559b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/models/baseModels/InvoiceItem/InvoiceItem.ts b/models/baseModels/InvoiceItem/InvoiceItem.ts
@@ -173,6 +173,7 @@ export abstract class InvoiceItem extends Doc {
         'party',
         'exchangeRate',
         'item',
+        'quantity',
         'itemTaxedTotal',
         'itemDiscountedTotal',
         'setItemDiscountAmount',

diff --git a/src/pages/POS/KeyboardModal.vue b/src/pages/POS/KeyboardModal.vue
@@ -433,9 +433,10 @@ export default defineComponent({
               );
             }
 
-            this.selectedItemRow.setItemDiscountAmount = true;
-            this.selectedItemRow.itemDiscountAmount = this.fyo.pesa(
-              Number(this.selectedValue)
+            await this.selectedItemRow.set('setItemDiscountAmount', true);
+            await this.selectedItemRow.set(
+              'itemDiscountAmount',
+              this.fyo.pesa(Number(this.selectedValue))
             );
           }
         } else {

diff --git a/src/pages/POS/POS.vue b/src/pages/POS/POS.vue
@@ -541,9 +541,12 @@ export default defineComponent({
             existingItems[0].rate = item.rate as Money;
           }
 
-          existingItems[0].quantity = quantity
-            ? (existingItems[0].quantity as number) + quantity
-            : (existingItems[0].quantity as number) + 1;
+          await existingItems[0].set(
+            'quantity',
+            quantity
+              ? (existingItems[0].quantity as number) + quantity
+              : (existingItems[0].quantity as number) + 1
+          );
 
           await this.applyPricingRule();
           await this.sinvDoc.runFormulas();