Merge branch 'staging' into develop

2026-05-05 06:28:29 +00:00 · 2019-01-23 08:19:00 +00:00
parent c4bda9fac3 f74e28bc64
commit e415cce1a9
35 changed files with 570 additions and 117 deletions
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe, erpnext
 from frappe.utils import cint, flt, cstr
-from frappe import msgprint, _
+from frappe import _
 import frappe.defaults
 from erpnext.accounts.utils import get_fiscal_year
 from erpnext.accounts.general_ledger import make_gl_entries, delete_gl_entries, process_gl_map