From d4b0373b923a202415878874ae29c30a14d1a53c Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 23 Nov 2012 18:05:08 +0530 Subject: [PATCH 1/4] removed controller --- home/page/latest_updates/latest_updates.js | 4 ++ home/page/latest_updates/latest_updates.txt | 71 +++++++++------------ 2 files changed, 34 insertions(+), 41 deletions(-) diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js index 73f8a372e3..190cdd2008 100644 --- a/home/page/latest_updates/latest_updates.js +++ b/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", diff --git a/home/page/latest_updates/latest_updates.txt b/home/page/latest_updates/latest_updates.txt index 876c086de5..7f44e7f978 100644 --- a/home/page/latest_updates/latest_updates.txt +++ b/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', - u'docstatus': 0, - u'modified': '2012-11-13 12:21:39', - u'modified_by': u'Administrator', - u'owner': u'Administrator' - }, - - # These values are common for all Page - { - u'doctype': u'Page', - 'module': u'Home', - u'name': u'__common__', - 'page_name': u'latest-updates', - 'standard': u'Yes', - 'title': u'Latest Updates' - }, - - # These values are common for all Page Role - { - u'doctype': u'Page Role', - u'name': u'__common__', - 'parent': u'latest-updates', - 'parentfield': u'roles', - 'parenttype': u'Page', - 'role': u'All' - }, - - # Page, latest-updates - { - u'doctype': u'Page', - u'name': u'latest-updates' - }, - - # Page Role - { - u'doctype': u'Page Role' - } + { + "owner": "Administrator", + "docstatus": 0, + "creation": "2012-11-19 12:06:54", + "modified_by": "Administrator", + "modified": "2012-11-23 18:03:48" + }, + { + "name": "__common__", + "title": "Latest Updates", + "doctype": "Page", + "module": "Home", + "standard": "Yes", + "page_name": "latest-updates" + }, + { + "name": "__common__", + "parent": "latest-updates", + "doctype": "Page Role", + "parenttype": "Page", + "role": "All", + "parentfield": "roles" + }, + { + "name": "latest-updates", + "doctype": "Page" + }, + { + "doctype": "Page Role" + } ] \ No newline at end of file From b5dcaecc37a9b8e2cba81fd1147e0238e02a9675 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 23 Nov 2012 18:14:57 +0530 Subject: [PATCH 2/4] fix in remove old unbilled items report --- patches/november_2012/remove_old_unbilled_items_report.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/patches/november_2012/remove_old_unbilled_items_report.py b/patches/november_2012/remove_old_unbilled_items_report.py index 2b3fbef234..36aa7db00b 100644 --- a/patches/november_2012/remove_old_unbilled_items_report.py +++ b/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") \ No newline at end of file From 0245a7b92d490c8ebd74eb62ea6ee5783eec0a95 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 23 Nov 2012 18:35:22 +0530 Subject: [PATCH 3/4] added ifnull in query report --- .../delivered_items_to_be_billed.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt b/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt index 45c9bb4df2..e0fd542a24 100644 --- a/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt +++ b/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", From b784906eb5b46035edcd35e740657f49a18ad56c Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 23 Nov 2012 18:49:22 +0530 Subject: [PATCH 4/4] fixed whitespace issue in support ticket --- support/doctype/support_ticket/support_ticket.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/support/doctype/support_ticket/support_ticket.js b/support/doctype/support_ticket/support_ticket.js index 6ab2c68972..7f3fc1dd66 100644 --- a/support/doctype/support_ticket/support_ticket.js +++ b/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 - .replace(/\n[ ]*\n[\n\t ]*/g, '\n\n') // excess whitespace - .replace(/\n/g, '
') : this.mail) + (this.content_type=='text/plain' + ? this.mail + .replace(/\n[ ]*\n[\n\t ]*/g, '\n') // excess whitespace + .replace(/\n/g, '
') + : this.mail) ); // show only first and last message