Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: calculation of tax amount #1085

Merged
merged 3 commits into from
Jan 13, 2025
Merged

fix: calculation of tax amount #1085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d4d917
fix: calculate tax amount after applying discount
AbleKSaju Jan 9, 2025
55e6b53
fix: update total tax amount when adding items in POS
AbleKSaju Jan 10, 2025
12a2e3d
fix: resolved spelling issues
AbleKSaju Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions models/baseModels/InvoiceItem/InvoiceItem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ export abstract class InvoiceItem extends Doc {
'party',
'exchangeRate',
'item',
'quantity',
'itemTaxedTotal',
'itemDiscountedTotal',
'setItemDiscountAmount',
Expand Down
7 changes: 4 additions & 3 deletions src/pages/POS/KeyboardModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
9 changes: 6 additions & 3 deletions src/pages/POS/POS.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down