QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-17 05:10:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: discount transactions GL entries

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2024-12-08 14:20:11 +02:00
parent 14ae978bde
commit 46719ef361
17 changed files with 375 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/webapp/src/containers/Purchases/Bills/BillForm/utils.tsx
View File

@@ -415,7 +415,7 @@ export const useBillTotal = () => {
return R.compose(
R.when(R.always(isExclusiveTax), R.add(totalTaxAmount)),
R.subtract(R.__, discountAmount),
R.subtract(R.__, adjustmentAmount),
R.add(R.__, adjustmentAmount),
)(subtotal);
};

5
packages/webapp/src/containers/Purchases/CreditNotes/CreditNoteForm/utils.tsx
View File

@@ -259,7 +259,10 @@ export const useVendorCreditTotal = () => {
const discountAmount = useVendorCreditDiscountAmount();
const adjustment = useVendorCreditAdjustment();
return subtotal - discountAmount - adjustment;
return R.compose(
R.subtract(R.__, discountAmount),
R.add(R.__, adjustment),
)(subtotal);
};
/**