From edfb408464bc0957abfc6633e7b4c4466cece4ae Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Thu, 11 Jul 2024 17:31:20 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/accounts/doctype/sales_invoice/sales_invoice.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index 36f5a792ff1..76b4f595a00 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -431,18 +431,12 @@ 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");