nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-16 16:15:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47777 from frappe/mergify/bp/version-15-hotfix/pr-47041

Browse Source 
fix: Check `return_against` and Await API Call (backport #47041)
This commit is contained in:
ruthra kumar
2025-05-28 10:57:56 +05:30
committed by GitHub
parent 73bc57f53e 5a23d7cdca
commit 893a86e173
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
erpnext/public/js/controllers/taxes_and_totals.js
View File

@@ -64,7 +64,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
&& this.frm.doc.is_pos
&& this.frm.doc.is_return
) {
this.set_total_amount_to_default_mop();
await this.set_total_amount_to_default_mop();
this.calculate_paid_amount();
}
@@ -896,23 +896,25 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
it should set the return to that mode of payment only.
*/
let return_against_mop = await frappe.call({
method: 'erpnext.controllers.sales_and_purchase_return.get_payment_data',
args: {
invoice: this.frm.doc.return_against
}
});
if (return_against_mop.message.length === 1) {
this.frm.doc.payments.forEach(payment => {
if (payment.mode_of_payment == return_against_mop.message[0].mode_of_payment) {
payment.amount = total_amount_to_pay;
} else {
payment.amount = 0;
if(this.frm.doc.return_against){
let {message : return_against_mop } = await frappe.call({
method: 'erpnext.controllers.sales_and_purchase_return.get_payment_data',
args: {
invoice: this.frm.doc.return_against
}
});
this.frm.refresh_fields();
return;
if (return_against_mop.length === 1) {
this.frm.doc.payments.forEach(payment => {
if (payment.mode_of_payment == return_against_mop[0].mode_of_payment) {
payment.amount = total_amount_to_pay;
} else {
payment.amount = 0;
}
});
this.frm.refresh_fields();
return;
}
}
this.frm.doc.payments.find(payment => {

4
erpnext/public/js/controllers/transaction.js
View File

@@ -870,8 +870,8 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
frappe.model.set_value(item.doctype, item.name, "stock_qty", valid_serial_nos.length);
}
validate() {
this.calculate_taxes_and_totals(false);
async validate() {
await this.calculate_taxes_and_totals(false);
}
update_stock() {