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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-07-11 17:31:20 +05:30
parent ac48c3d4e7
commit edfb408464
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/sales_invoice/sales_invoice.js
View File

@@ -431,18 +431,12 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
return this.frm.call({ return this.frm.call({
doc: me.frm.doc, doc: me.frm.doc,
method: "set_missing_values", method: "set_missing_values",
<<<<<<< HEAD
callback: function(r) {
if(!r.exc) {
if(r.message && r.message.print_format) {
=======
args: { args: {
for_validate: true, for_validate: true,
}, },
callback: function (r) { callback: function (r) {
if (!r.exc) { if (!r.exc) {
if (r.message && r.message.print_format) { 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.pos_print_format = r.message.print_format;
} }
me.frm.trigger("update_stock"); me.frm.trigger("update_stock");