Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/setup/doctype/price_list/price_list.py
diff --git a/erpnext/setup/doctype/price_list/price_list.py b/erpnext/setup/doctype/price_list/price_list.py
index 02f6b89..fed2768 100644
--- a/erpnext/setup/doctype/price_list/price_list.py
+++ b/erpnext/setup/doctype/price_list/price_list.py
@@ -55,6 +55,7 @@
from core.page.data_import_tool.data_import_tool import read_csv_content
data = read_csv_content(self.get_csv_data())
+ webnotes.conn.auto_commit_on_many_writes = 1
updated = 0
@@ -84,6 +85,7 @@
msgprint("[Ignored] Did not find Item '%s'" % line[1])
msgprint("<b>%s</b> items updated" % updated)
+ webnotes.conn.auto_commit_on_many_writes = 0
# Update CSV data
def get_csv_data(self):