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
diff --git a/patches/october_2013/p07_rename_for_territory.py b/patches/october_2013/p07_rename_for_territory.py
index 520f3bc..96c72f3 100644
--- a/patches/october_2013/p07_rename_for_territory.py
+++ b/patches/october_2013/p07_rename_for_territory.py
@@ -6,6 +6,7 @@
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 @@
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")
diff --git a/patches/october_2013/p08_cleanup_after_item_price_module_change.py b/patches/october_2013/p08_cleanup_after_item_price_module_change.py
index 4169d96..ba0ab8d 100644
--- a/patches/october_2013/p08_cleanup_after_item_price_module_change.py
+++ b/patches/october_2013/p08_cleanup_after_item_price_module_change.py
@@ -5,9 +5,10 @@
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))
\ No newline at end of file
+ shutil.rmtree(path)