nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 18:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

Browse Source 
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
This commit is contained in:
Anand Doshi
2013-12-26 18:30:39 +05:30
parent 2926651e1c 7334bea3c2
commit 8e332ffd16
1813 changed files with 12064 additions and 18858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
patches/1312/__init__.py
View File

17
patches/1312/p01_delete_old_stock_reports.py
View File

@@ -1,17 +0,0 @@
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
def execute():
import webnotes, os, shutil
from webnotes.utils import get_base_path
webnotes.delete_doc('Page', 'stock-ledger')
webnotes.delete_doc('Page', 'stock-ageing')
webnotes.delete_doc('Page', 'stock-level')
webnotes.delete_doc('Page', 'general-ledger')
for d in [["stock", "stock_ledger"], ["stock", "stock_ageing"],
["stock", "stock_level"], ["accounts", "general_ledger"]]:
path = os.path.join(get_base_path(), "app", d[0], "page", d[1])
if os.path.exists(path):
shutil.rmtree(path)

2
patches/1312/p02_update_user_properties.py
View File

@@ -70,7 +70,7 @@ def update_user_match():
webnotes.defaults.add_default(doctype, name, profile, "Restriction")
def add_employee_restrictions_to_leave_approver():
from core.page.user_properties import user_properties
from webnotes.core.page.user_properties import user_properties
# add restrict rights to HR User and HR Manager
webnotes.conn.sql("""update `tabDocPerm` set `restrict`=1 where parent in ('Employee', 'Leave Application')

2
patches/1312/p03_move_warehouse_user_to_restrictions.py
View File

@@ -5,7 +5,7 @@ from __future__ import unicode_literals
import webnotes
def execute():
from core.page.user_properties import user_properties
from webnotes.core.page.user_properties import user_properties
for warehouse, profile in webnotes.conn.sql("""select parent, user from `tabWarehouse User`"""):
user_properties.add(profile, "Warehouse", warehouse)

2
patches/1312/p04_new_permissions.py
View File

@@ -6,7 +6,7 @@ import webnotes
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")