mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-07 23:31:20 +00:00
fix: missing discount on POS Credit Notes
(cherry picked from commit 1049550951)
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/sales_invoice.js
This commit is contained in:
@@ -431,9 +431,18 @@ 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) {
|
callback: function(r) {
|
||||||
if(!r.exc) {
|
if(!r.exc) {
|
||||||
if(r.message && r.message.print_format) {
|
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.pos_print_format = r.message.print_format;
|
||||||
}
|
}
|
||||||
me.frm.trigger("update_stock");
|
me.frm.trigger("update_stock");
|
||||||
|
|||||||
Reference in New Issue
Block a user