mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-15 20:30:33 +00:00
fix: discount transactions GL entries
This commit is contained in:
@@ -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);
|
||||
};
|
||||
|
||||
|
||||
@@ -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);
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
@@ -263,7 +263,10 @@ export const useCreditNoteTotal = () => {
|
||||
const discountAmount = useCreditNoteDiscountAmount();
|
||||
const adjustmentAmount = useCreditNoteAdjustmentAmount();
|
||||
|
||||
return subtotal - discountAmount - adjustmentAmount;
|
||||
return R.compose(
|
||||
R.subtract(R.__, discountAmount),
|
||||
R.add(R.__, adjustmentAmount),
|
||||
)(subtotal);
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
@@ -299,7 +299,10 @@ export const useEstimateTotal = () => {
|
||||
const discount = useEstimateDiscount();
|
||||
const adjustment = useEstimateAdjustment();
|
||||
|
||||
return subtotal - discount - adjustment;
|
||||
return R.compose(
|
||||
R.subtract(R.__, discount),
|
||||
R.add(R.__, adjustment),
|
||||
)(subtotal);
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
@@ -455,7 +455,7 @@ export const useInvoiceTotal = () => {
|
||||
return R.compose(
|
||||
R.when(R.always(isExclusiveTax), R.add(totalTaxAmount)),
|
||||
R.subtract(R.__, discountAmount),
|
||||
R.subtract(R.__, adjustmentAmount),
|
||||
R.add(R.__, adjustmentAmount),
|
||||
)(subtotal);
|
||||
};
|
||||
|
||||
|
||||
@@ -284,7 +284,10 @@ export const useReceiptTotal = () => {
|
||||
const adjustmentAmount = useReceiptAdjustmentAmount();
|
||||
const discountAmount = useReceiptDiscountAmount();
|
||||
|
||||
return subtotal - discountAmount - adjustmentAmount;
|
||||
return R.compose(
|
||||
R.add(R.__, adjustmentAmount),
|
||||
R.subtract(R.__, discountAmount),
|
||||
)(subtotal);
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user