diff --git a/accounts/report/ordered_items_to_be_billed/__init__.py b/accounts/report/ordered_items_to_be_billed/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt b/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt new file mode 100644 index 0000000000..bf410933f3 --- /dev/null +++ b/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt @@ -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" + } +] \ No newline at end of file diff --git a/public/js/startup.js b/public/js/startup.js index c90aedd0d3..a5ed4c4416 100644 --- a/public/js/startup.js +++ b/public/js/startup.js @@ -168,7 +168,7 @@ erpnext.setup_mousetrap = function() { }); Mousetrap.bind(["command+s", "ctrl+s"], function() { - if(cur_frm) + if(cur_frm && !cur_frm.save_disabled) cur_frm.save(); else if(wn.container.page.save_action) wn.container.page.save_action(); diff --git a/stock/report/ordered_items_to_be_delivered/__init__.py b/stock/report/ordered_items_to_be_delivered/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.txt b/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.txt new file mode 100644 index 0000000000..840124a1d7 --- /dev/null +++ b/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.txt @@ -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" + } +] \ No newline at end of file