diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py index 5ec120c70bb587744bbd66963c5b8ed1a6c696ab..588d30a0498135c519909b1648c5a03f7e47cc1e 100644 --- a/erpnext/controllers/stock_controller.py +++ b/erpnext/controllers/stock_controller.py @@ -1581,7 +1581,7 @@ def get_accounting_ledger_preview(doc, filters): doc.docstatus = 1 - if doc.get("update_stock") or doc.doctype in ("Purchase Receipt", "Delivery Note"): + if doc.get("update_stock") or doc.doctype in ("Purchase Receipt", "Delivery Note", "Stock Entry"): doc.update_stock_ledger() doc.make_gl_entries() @@ -1622,7 +1622,7 @@ def get_stock_ledger_preview(doc, filters): "stock_value_difference", ] - if doc.get("update_stock") or doc.doctype in ("Purchase Receipt", "Delivery Note"): + if doc.get("update_stock") or doc.doctype in ("Purchase Receipt", "Delivery Note", "Stock Entry"): doc.docstatus = 1 doc.update_stock_ledger() columns = get_sl_columns(filters) diff --git a/erpnext/public/js/utils/ledger_preview.js b/erpnext/public/js/utils/ledger_preview.js index 9e17ac0c5af36691bf6ad7b2d9fa0d3cff0b163d..bba2803abd54703f35bd9b7b6209779461bed46d 100644 --- a/erpnext/public/js/utils/ledger_preview.js +++ b/erpnext/public/js/utils/ledger_preview.js @@ -60,23 +60,27 @@ erpnext.accounts.ledger_preview = { }, make_dialog(label, fieldname, columns, data) { - let me = this; - let dialog = new frappe.ui.Dialog({ - size: "extra-large", - title: __(label), - fields: [ - { - fieldtype: "HTML", - fieldname: fieldname, - }, - ], - }); + if (data.length === 0 && fieldname === "accounting_ledger_preview_html") { + frappe.msgprint("" + __("No Impact on Accounting Ledger") + ""); + } else { + let me = this; + let dialog = new frappe.ui.Dialog({ + size: "extra-large", + title: __(label), + fields: [ + { + fieldtype: "HTML", + fieldname: fieldname, + }, + ], + }); - setTimeout(function () { - me.get_datatable(columns, data, dialog.get_field(fieldname).wrapper); - }, 200); + setTimeout(function () { + me.get_datatable(columns, data, dialog.get_field(fieldname).wrapper); + }, 200); - dialog.show(); + dialog.show(); + } }, get_datatable(columns, data, wrapper) { diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index fcbab1793f2ab3aaf5ed51556b98b6c3b70d0103..223a4132ae16e79f852086a373b835e04b6bcd47 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -1160,6 +1160,8 @@ erpnext.stock.StockEntry = class StockEntry extends erpnext.stock.StockControlle } erpnext.hide_company(this.frm); erpnext.utils.add_item(this.frm); + erpnext.accounts.ledger_preview.show_accounting_ledger_preview(this.frm); + erpnext.accounts.ledger_preview.show_stock_ledger_preview(this.frm); } serial_no(doc, cdt, cdn) {