Merge branch 'master' of github.com:webnotes/erpnext
This commit is contained in:
commit
36774bdcbb
@ -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",
|
||||
|
@ -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",
|
||||
|
@ -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"
|
||||
}
|
||||
]
|
@ -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")
|
@ -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, '<br>') : this.mail)
|
||||
(this.content_type=='text/plain'
|
||||
? this.mail
|
||||
.replace(/\n[ ]*\n[\n\t ]*/g, '\n') // excess whitespace
|
||||
.replace(/\n/g, '<br>')
|
||||
: this.mail)
|
||||
);
|
||||
|
||||
// show only first and last message
|
||||
|
Loading…
x
Reference in New Issue
Block a user