diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.js b/erpnext/accounts/doctype/gl_entry/gl_entry.js index 491cf4d12b1..4d2a5135187 100644 --- a/erpnext/accounts/doctype/gl_entry/gl_entry.js +++ b/erpnext/accounts/doctype/gl_entry/gl_entry.js @@ -3,6 +3,6 @@ frappe.ui.form.on('GL Entry', { refresh: function(frm) { - + frm.page.btn_secondary.hide() } }); diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py index aee7f0e0f9e..e5fa57df7fd 100644 --- a/erpnext/accounts/doctype/gl_entry/gl_entry.py +++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py @@ -269,6 +269,11 @@ class GLEntry(Document): if not self.fiscal_year: self.fiscal_year = get_fiscal_year(self.posting_date, company=self.company)[0] + def on_cancel(self): + msg = _("Individual GL Entry cannot be cancelled.") + msg += "
" + _("Please cancel related transaction.") + frappe.throw(msg) + def validate_balance_type(account, adv_adj=False): if not adv_adj and account: diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.js b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.js index 42cc7e6cba5..23018aa615b 100644 --- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.js +++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.js @@ -3,6 +3,6 @@ frappe.ui.form.on('Stock Ledger Entry', { refresh: function(frm) { - + frm.page.btn_secondary.hide() } }); diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py index 5c1da420e24..329cd7da09b 100644 --- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py @@ -209,6 +209,11 @@ class StockLedgerEntry(Document): msg += "
" + "
".join(authorized_users) frappe.throw(msg, BackDatedStockTransaction, title=_("Backdated Stock Entry")) + def on_cancel(self): + msg = _("Individual Stock Ledger Entry cannot be cancelled.") + msg += "
" + _("Please cancel related transaction.") + frappe.throw(msg) + def on_doctype_update(): if not frappe.db.has_index("tabStock Ledger Entry", "posting_sort_index"):