[cleanup] UI Fixes, minor

selling/doctype/lead/lead.js

@@ -23,8 +23,7 @@ erpnext.LeadController = wn.ui.form.Controller.extend({
 		}
 
 		if(in_list(user_roles,'System Manager')) {
-			cur_frm.footer.help_area.innerHTML = '<hr>\
-				<p><a href="#Form/Sales Email Settings">'+wn._('Sales Email Settings')+'</a><br>\
+			cur_frm.footer.help_area.innerHTML = '<p><a href="#Form/Sales Email Settings">'+wn._('Sales Email Settings')+'</a><br>\
 				<span class="help">'+wn._('Automatically extract Leads from a mail box e.g.')+' "sales@example.com"</span></p>';
 		}
 	},

selling/doctype/lead/lead.txt

@@ -2,7 +2,7 @@
  {
   "creation": "2013-04-10 11:45:37", 
   "docstatus": 0, 
-  "modified": "2013-11-02 16:58:44", 
+  "modified": "2013-11-06 11:27:57", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -256,14 +256,6 @@
   "fieldname": "column_break2", 
   "fieldtype": "Column Break"
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "remark", 
-  "fieldtype": "Small Text", 
-  "label": "Remark", 
-  "oldfieldname": "remark", 
-  "oldfieldtype": "Text"
- }, 
  {
   "doctype": "DocField", 
   "fieldname": "phone", 

selling/doctype/shopping_cart_settings/shopping_cart_settings.py

@@ -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))