From ac48c3d4e7903dab168563ee60ff2d83d3549255 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Thu, 11 Jul 2024 17:21:41 +0530 Subject: [PATCH] fix: missing discount on POS Credit Notes (cherry picked from commit 1049550951011c09fd705c4b01b925e02b6a84ee) # Conflicts: # erpnext/accounts/doctype/sales_invoice/sales_invoice.js --- erpnext/accounts/doctype/sales_invoice/sales_invoice.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index ad857840147..36f5a792ff1 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -431,9 +431,18 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e return this.frm.call({ doc: me.frm.doc, method: "set_missing_values", +<<<<<<< HEAD callback: function(r) { if(!r.exc) { if(r.message && r.message.print_format) { +======= + args: { + for_validate: true, + }, + callback: function (r) { + if (!r.exc) { + if (r.message && r.message.print_format) { +>>>>>>> 1049550951 (fix: missing discount on POS Credit Notes) me.frm.pos_print_format = r.message.print_format; } me.frm.trigger("update_stock");