Merge branch '1310' of github.com:webnotes/erpnext
Conflicts: patches/october_2013/p07_rename_for_territory.py patches/october_2013/p08_cleanup_after_item_price_module_change.py setup/doctype/setup_control/setup_control.py utilities/demo/demo_docs/Lead.csv
This commit is contained in:
commit
d47db9bccf
@ -6,6 +6,7 @@ import webnotes, os
|
||||
|
||||
def execute():
|
||||
from webnotes.utils import get_base_path
|
||||
import shutil
|
||||
webnotes.reload_doc("core", "doctype", "doctype")
|
||||
|
||||
tables = webnotes.conn.sql_list("show tables")
|
||||
@ -17,7 +18,7 @@ def execute():
|
||||
|
||||
path = os.path.join(get_base_path(), "app", "setup", "doctype", "for_territory")
|
||||
if os.path.exists(path):
|
||||
os.system("rm -rf {path}".format(path=path))
|
||||
shutil.rmtree(path)
|
||||
|
||||
if webnotes.conn.exists("DocType", "For Territory"):
|
||||
webnotes.delete_doc("DocType", "For Territory")
|
||||
|
@ -5,9 +5,10 @@ from __future__ import unicode_literals
|
||||
import webnotes, os
|
||||
|
||||
def execute():
|
||||
import shutil
|
||||
from webnotes.utils import get_base_path
|
||||
|
||||
for dt in ("item_price", "price_list"):
|
||||
path = os.path.join(get_base_path(), "app", "setup", "doctype", dt)
|
||||
if os.path.exists(path):
|
||||
os.system("rm -rf {path}".format(path=path))
|
||||
shutil.rmtree(path)
|
||||
|
Loading…
x
Reference in New Issue
Block a user