Skip to content

fix : set outstanding to zero for return payments #1361

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

Merged
ableksaju merged 3 commits into from
Oct 13, 2025
Merged

fix : set outstanding to zero for return payments #1361

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60e2345
fix : set outstanding to zero for return payments when invoice is ful…
Gadha2311 Oct 4, 2025
770912e
fix : simplify return logic
Gadha2311 Oct 10, 2025
5549a25
fix:rename returnAmount
Gadha2311 Oct 10, 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
26 changes: 12 additions & 14 deletions models/baseModels/Invoice/Invoice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1047,19 +1047,15 @@ export abstract class Invoice extends Transactional {
if (sinvreturnedDoc.outstandingAmount?.isZero()) {
return this.grandTotal?.abs();
} else {
const totalPaid = sinvreturnedDoc.grandTotal
?.abs()
.sub(sinvreturnedDoc.outstandingAmount as Money);
const totalPaid = sinvreturnedDoc
.grandTotal!.abs()
.sub(sinvreturnedDoc.outstandingAmount!);

if (!sinvreturnedDoc.isReturn) {
return totalPaid?.abs();
}

if (!this.grandTotal?.isNegative()) {
this.grandTotal = this.grandTotal?.neg();
}
const outstandingAmount = this.grandTotal!.abs();

return this.grandTotal?.add(totalPaid as Money).abs();
return outstandingAmount.lte(totalPaid)
? outstandingAmount
: totalPaid;
}
}

Expand Down Expand Up @@ -1290,18 +1286,21 @@ export abstract class Invoice extends Transactional {
paymentType = PaymentTypeEnum.Receive;
}
}
const paymentAmount = this.isReturn
? outstandingAmount
: outstandingAmount?.abs();

const data = {
party: this.party,
date: new Date().toISOString(),
paymentType,
amount: this.outstandingAmount?.abs(),
amount: paymentAmount,
[accountField]: this.account,
for: [
{
referenceType: this.schemaName,
referenceName: this.name,
amount: this.outstandingAmount,
amount: this.isReturn ? this.grandTotal : outstandingAmount,
},
],
};
Expand All @@ -1313,7 +1312,6 @@ export abstract class Invoice extends Transactional {

return this.fyo.doc.getNewDoc(ModelNameEnum.Payment, data) as Payment;
}

async getStockTransfer(isAuto = false): Promise<StockTransfer | null> {
if (!this.isSubmitted) {
return null;
Expand Down