nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 18:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47041 from Sanket322/pos_payment

Browse Source 
fix: Check `return_against` and Await API Call
This commit is contained in:
ruthra kumar
2025-05-12 14:10:04 +05:30
committed by GitHub
parent 57f3489dfa c48db0b7c0
commit 4db3c7fc81
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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_pos
&& this.frm.doc.is_return && this.frm.doc.is_return
) { ) {
this.set_total_amount_to_default_mop(); await this.set_total_amount_to_default_mop();
this.calculate_paid_amount(); this.calculate_paid_amount();
} }
@@ -911,16 +911,17 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
it should set the return to that mode of payment only. it should set the return to that mode of payment only.
*/ */
let return_against_mop = await frappe.call({ if(this.frm.doc.return_against){
let {message : return_against_mop } = await frappe.call({
method: 'erpnext.controllers.sales_and_purchase_return.get_payment_data', method: 'erpnext.controllers.sales_and_purchase_return.get_payment_data',
args: { args: {
invoice: this.frm.doc.return_against invoice: this.frm.doc.return_against
} }
}); });
if (return_against_mop.message.length === 1) { if (return_against_mop.length === 1) {
this.frm.doc.payments.forEach(payment => { this.frm.doc.payments.forEach(payment => {
if (payment.mode_of_payment == return_against_mop.message[0].mode_of_payment) { if (payment.mode_of_payment == return_against_mop[0].mode_of_payment) {
payment.amount = total_amount_to_pay; payment.amount = total_amount_to_pay;
} else { } else {
payment.amount = 0; payment.amount = 0;
@@ -929,6 +930,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
this.frm.refresh_fields(); this.frm.refresh_fields();
return; return;
} }
}
this.frm.doc.payments.find(payment => { this.frm.doc.payments.find(payment => {
if (payment.default) { if (payment.default) {

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

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