Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nabin Hait 2012-12-14 13:21:52 +05:30
commit fce76cd5b2
5 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
accounts/report/ordered_items_to_be_billed/__init__.py Normal file
View File

20
accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt Normal file
View File

@ -0,0 +1,20 @@
[
{
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-12-14 10:22:40",
"modified_by": "Administrator",
"modified": "2012-12-14 10:24:16"
},
{
"name": "__common__",
"ref_doctype": "Sales Invoice",
"doctype": "Report",
"is_standard": "Yes",
"query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`status` as \"Status\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.description as \"Description\",\n `tabSales Order Item`.qty as \"Qty:Float\",\n `tabSales Order Item`.billed_qty as \"Billed Qty:Float\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and ifnull(`tabSales Order Item`.billed_qty,0) < ifnull(`tabSales Order Item`.qty,0)\norder by `tabSales Order`.transaction_date asc"
},
{
"name": "Ordered Items To Be Billed",
"doctype": "Report"
}
]

2
public/js/startup.js
View File

@ -168,7 +168,7 @@ erpnext.setup_mousetrap = function() {
}); });
Mousetrap.bind(["command+s", "ctrl+s"], function() { Mousetrap.bind(["command+s", "ctrl+s"], function() {
if(cur_frm) if(cur_frm && !cur_frm.save_disabled)
cur_frm.save(); cur_frm.save();
else if(wn.container.page.save_action) else if(wn.container.page.save_action)
wn.container.page.save_action(); wn.container.page.save_action();

0
stock/report/ordered_items_to_be_delivered/__init__.py Normal file
View File

20
stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.txt Normal file
View File

@ -0,0 +1,20 @@
[
{
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-12-14 10:18:14",
"modified_by": "Administrator",
"modified": "2012-12-14 10:19:13"
},
{
"name": "__common__",
"ref_doctype": "Delivery Note",
"doctype": "Report",
"is_standard": "Yes",
"query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`status` as \"Status\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.description as \"Description\",\n `tabSales Order Item`.qty as \"Qty:Float\",\n `tabSales Order Item`.delivered_qty as \"Delivered Qty:Float\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and ifnull(`tabSales Order Item`.delivered_qty,0) < ifnull(`tabSales Order Item`.qty,0)\norder by `tabSales Order`.transaction_date asc"
},
{
"name": "Ordered Items To Be Delivered",
"doctype": "Report"
}
]