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

Conflicts:
	patches/patch_list.py
This commit is contained in:
Anand Doshi
2013-07-08 11:53:35 +05:30
6 changed files with 9 additions and 30 deletions

View File

@@ -161,8 +161,8 @@ wn.module_page["Selling"] = [
route: "query-report/Customer Addresses And Contacts"
},
{
"label":wn._("Sales Orders Pending to be Delivered"),
route: "query-report/Sales Orders Pending To Be Delivered"
"label":wn._("Ordered Items To Be Delivered"),
route: "query-report/Ordered Items To Be Delivered",
},
{
"label":wn._("Sales Person-wise Transaction Summary"),

View File

@@ -1,22 +0,0 @@
[
{
"creation": "2013-02-21 14:26:46",
"docstatus": 0,
"modified": "2013-02-22 15:53:24",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"doctype": "Report",
"is_standard": "Yes",
"name": "__common__",
"query": "select \n `tabSales Order`.`name` as \"S.O. No.:Link/Sales Order:120\",\n `tabSales Order`.`transaction_date` as \"S.O. Date:Date\",\n `tabSales Order`.`delivery_date` as \"Expected Delivery Date:Date\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order Item`.item_code as \"Item Code: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\",\n `tabSales Order`.`po_no` as \"P.O. No.\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and `tabSales Order`.status != \"Stopped\"\n and ifnull(`tabSales Order Item`.delivered_qty,0) < ifnull(`tabSales Order Item`.qty,0)\norder by `tabSales Order`.transaction_date asc",
"ref_doctype": "Sales Order",
"report_name": "Sales Orders Pending To Be Delivered",
"report_type": "Query Report"
},
{
"doctype": "Report",
"name": "Sales Orders Pending To Be Delivered"
}
]