nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 10:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1310' of github.com:webnotes/erpnext

Browse Source 
Conflicts:
	setup/doctype/setup_control/setup_control.py
	stock/doctype/stock_entry/stock_entry.py
	utilities/demo/demo_docs/Price_List.csv
This commit is contained in:
Anand Doshi
2013-11-04 13:14:39 +05:30
parent cb72e01e9d 06757a19ef
commit daaa14c079
37 changed files with 84 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
selling/doctype/shopping_cart_settings/shopping_cart_settings.py
View File

@@ -72,7 +72,7 @@ class DocType(DocListController):
# make a map of territory: [list of names]
# if list against each territory has more than one element, raise exception
territory_name = webnotes.conn.sql("""select `territory`, `parent`
from `tabFor Territory`
from `tabApplicable Territory`
where `parenttype`=%s and `parent` in (%s)""" %
("%s", ", ".join(["%s"]*len(names))), tuple([parenttype] + names))