nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-22 14:39:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext into unicode

Browse Source 
Conflicts:
	erpnext/setup/doctype/price_list/price_list.py
This commit is contained in:
Anand Doshi
2012-08-31 16:56:44 +05:30
parent b211a41547 41cd5a68f4
commit b4ea4adeec
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/setup/doctype/price_list/price_list.py
View File

@@ -55,6 +55,7 @@ class DocType:
from core.page.data_import_tool.data_import_tool import read_csv_content from core.page.data_import_tool.data_import_tool import read_csv_content
data = read_csv_content(self.get_csv_data()) data = read_csv_content(self.get_csv_data())
webnotes.conn.auto_commit_on_many_writes = 1
updated = 0 updated = 0
@@ -84,6 +85,7 @@ class DocType:
msgprint("[Ignored] Did not find Item '%s'" % line[1]) msgprint("[Ignored] Did not find Item '%s'" % line[1])
msgprint("<b>%s</b> items updated" % updated) msgprint("<b>%s</b> items updated" % updated)
webnotes.conn.auto_commit_on_many_writes = 0
# Update CSV data # Update CSV data
def get_csv_data(self): def get_csv_data(self):