Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions
Conflicts:
erpnext/accounts/page/accounts_browser/accounts_browser.css
erpnext/controllers/buying_controller.py
erpnext/manufacturing/doctype/production_order/production_order.py
erpnext/patches/patch_list.py
erpnext/selling/doctype/customer/customer.txt
erpnext/selling/doctype/sales_order/sales_order.py
erpnext/selling/doctype/sales_order/test_sales_order.py
erpnext/setup/doctype/features_setup/features_setup.txt
erpnext/stock/doctype/stock_entry/test_stock_entry.py
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
startup/query_handlers.py
diff --git a/patches/1312/p04_new_permissions.py b/patches/1312/p04_new_permissions.py
index e6042f4..9dffdd4 100644
--- a/patches/1312/p04_new_permissions.py
+++ b/patches/1312/p04_new_permissions.py
@@ -6,7 +6,7 @@
def execute():
# reset Page perms
- from core.page.permission_manager.permission_manager import reset
+ from webnotes.core.page.permission_manager.permission_manager import reset
reset("Page")
reset("Report")