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

accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt

@@ -2,16 +2,16 @@
  {
   "owner": "Administrator", 
   "docstatus": 0, 
-  "creation": "2012-11-23 16:46:22", 
+  "creation": "2012-11-23 18:26:54", 
   "modified_by": "Administrator", 
-  "modified": "2012-11-23 17:55:12"
+  "modified": "2012-11-23 18:27:38"
  }, 
  {
   "name": "__common__", 
   "ref_doctype": "Sales Invoice", 
   "doctype": "Report", 
   "is_standard": "Yes", 
-  "query": "select \n `tabDelivery Note`.`name` as \"Delivery Note:Link/Delivery Note:120\",\n `tabDelivery Note`.`status` as \"Status\",\n `tabDelivery Note`.`posting_date` as \"Date:Date\",\n `tabDelivery Note Item`.item_code as \"Item:Link/Item:120\",\n `tabDelivery Note Item`.description as \"Description\",\n `tabDelivery Note Item`.qty as \"Qty:Float\",\n `tabDelivery Note Item`.billed_qty as \"Billed Qty:Float\"\nfrom\n `tabDelivery Note`, `tabDelivery Note Item`\nwhere\n `tabDelivery Note Item`.`parent` = `tabDelivery Note`.`name`\n and `tabDelivery Note`.docstatus = 1\n and `tabDelivery Note Item`.billed_qty < `tabDelivery Note Item`.qty\norder by `tabDelivery Note`.posting_date asc"
+  "query": "select \n `tabDelivery Note`.`name` as \"Delivery Note:Link/Delivery Note:120\",\n `tabDelivery Note`.`status` as \"Status\",\n `tabDelivery Note`.`posting_date` as \"Date:Date\",\n `tabDelivery Note Item`.item_code as \"Item:Link/Item:120\",\n `tabDelivery Note Item`.description as \"Description\",\n `tabDelivery Note Item`.qty as \"Qty:Float\",\n `tabDelivery Note Item`.billed_qty as \"Billed Qty:Float\"\nfrom\n `tabDelivery Note`, `tabDelivery Note Item`\nwhere\n `tabDelivery Note Item`.`parent` = `tabDelivery Note`.`name`\n and `tabDelivery Note`.docstatus = 1\n and ifnull(`tabDelivery Note Item`.billed_qty, 0) < ifnull(`tabDelivery Note Item`.qty, 0)\norder by `tabDelivery Note`.posting_date asc"
  }, 
  {
   "name": "Delivered Items To Be Billed", 

home/page/latest_updates/latest_updates.js

@@ -1,6 +1,10 @@
 erpnext.updates = [
 	["23rd November 2012", [
 		"General Ledger: Auto-suggest Accounts for filtering",
+		"Calendar: User Interface Fixes, small text for events",
+		"Email Settings: Setup outgoing email without a login id \
+			(applicable for a local email server)",
+		"Delivered Items To Be Billed: New report in 'Accounts'",
 	]],
 	["22nd November 2012", [
 		"Support Ticket: Compose a reply using Markdown",

home/page/latest_updates/latest_updates.txt

@@ -1,43 +1,32 @@
-# Page, latest-updates
 [
-
-	# These values are common in all dictionaries
  {
-		u'creation': '2012-11-13 11:55:09',
+  "owner": "Administrator", 
-		u'docstatus': 0,
+  "docstatus": 0, 
-		u'modified': '2012-11-13 12:21:39',
+  "creation": "2012-11-19 12:06:54", 
-		u'modified_by': u'Administrator',
+  "modified_by": "Administrator", 
-		u'owner': u'Administrator'
+  "modified": "2012-11-23 18:03:48"
  }, 
-
-	# These values are common for all Page
  {
-		u'doctype': u'Page',
+  "name": "__common__", 
-		'module': u'Home',
+  "title": "Latest Updates", 
-		u'name': u'__common__',
+  "doctype": "Page", 
-		'page_name': u'latest-updates',
+  "module": "Home", 
-		'standard': u'Yes',
+  "standard": "Yes", 
-		'title': u'Latest Updates'
+  "page_name": "latest-updates"
  }, 
-
-	# These values are common for all Page Role
  {
-		u'doctype': u'Page Role',
+  "name": "__common__", 
-		u'name': u'__common__',
+  "parent": "latest-updates", 
-		'parent': u'latest-updates',
+  "doctype": "Page Role", 
-		'parentfield': u'roles',
+  "parenttype": "Page", 
-		'parenttype': u'Page',
+  "role": "All", 
-		'role': u'All'
+  "parentfield": "roles"
  }, 
-
-	# Page, latest-updates
  {
-		u'doctype': u'Page',
+  "name": "latest-updates", 
-		u'name': u'latest-updates'
+  "doctype": "Page"
  }, 
-
-	# Page Role
  {
-		u'doctype': u'Page Role'
+  "doctype": "Page Role"
  }
 ]

patches/november_2012/remove_old_unbilled_items_report.py

@@ -1,6 +1,7 @@
 import webnotes
 
 def execute():
-	webnotes.conn.sql("""delete from `tabSearch Criteria` where name='Delivery Note Itemwise Pending To Bill'""")
+	webnotes.delete_doc("Search Criteria", "delivery_note_itemwise_pending_to_bill")
+
 	from webnotes.modules import reload_doc
 	reload_doc("accounts", "report", "delivered_items_to_be_billed")

support/doctype/support_ticket/support_ticket.js

@@ -175,9 +175,11 @@ EmailMessage = function(parent, args, list, idx) {
 				wordWrap: 'break-word', textWrap: 'normal', overflowX: 'auto'}, 
 			
 			// newlines for text email
-			(this.content_type=='text/plain' ? this.mail
+			(this.content_type=='text/plain'
-				.replace(/\n[ ]*\n[\n\t ]*/g, '\n\n') // excess whitespace
+				? this.mail
-				.replace(/\n/g, '<br>') : this.mail)
+					.replace(/\n[ ]*\n[\n\t ]*/g, '\n') // excess whitespace
+					.replace(/\n/g, '<br>')
+				: this.mail)
 		);
 		
 		// show only first and last message