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

fix: multiple minor issues in delayed order report (#18134)

Browse Source
This commit is contained in:
rohitwaghchaure 2019-07-03 11:43:38 +05:30 committed by Nabin Hait
parent 1a6bfe986e
commit f078031c60
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/stock/report/delayed_item_report/delayed_item_report.js
View File

@ -55,7 +55,7 @@ frappe.query_reports["Delayed Item Report"] = {
label: __("Based On"), label: __("Based On"),
fieldtype: "Select", fieldtype: "Select",
options: ["Delivery Note", "Sales Invoice"], options: ["Delivery Note", "Sales Invoice"],
default: "Delivery Note", default: "Sales Invoice",
reqd: 1 reqd: 1
}, },
] ]

15
erpnext/stock/report/delayed_item_report/delayed_item_report.py
View File

@ -46,7 +46,8 @@ class DelayedItemReport(object):
self.transactions = frappe.db.sql(""" SELECT `tab{child_doc}`.item_code, `tab{child_doc}`.item_name, self.transactions = frappe.db.sql(""" SELECT `tab{child_doc}`.item_code, `tab{child_doc}`.item_name,
`tab{child_doc}`.item_group, `tab{child_doc}`.qty, `tab{child_doc}`.rate, `tab{child_doc}`.amount, `tab{child_doc}`.item_group, `tab{child_doc}`.qty, `tab{child_doc}`.rate, `tab{child_doc}`.amount,
`tab{child_doc}`.so_detail, `tab{child_doc}`.{so_field} as sales_order, `tab{child_doc}`.so_detail, `tab{child_doc}`.{so_field} as sales_order,
`tab{doctype}`.customer, `tab{doctype}`.posting_date, `tab{doctype}`.name, `tab{doctype}`.grand_total `tab{doctype}`.shipping_address_name, `tab{doctype}`.po_no, `tab{doctype}`.customer,
`tab{doctype}`.posting_date, `tab{doctype}`.name, `tab{doctype}`.grand_total
FROM `tab{child_doc}`, `tab{doctype}` FROM `tab{child_doc}`, `tab{doctype}`
WHERE WHERE
`tab{child_doc}`.parent = `tab{doctype}`.name and `tab{doctype}`.docstatus = 1 and `tab{child_doc}`.parent = `tab{doctype}`.name and `tab{doctype}`.docstatus = 1 and
@ -97,12 +98,20 @@ class DelayedItemReport(object):
"fieldtype": "Link", "fieldtype": "Link",
"options": based_on, "options": based_on,
"width": 100 "width": 100
},{ },
{
"label": _("Customer"), "label": _("Customer"),
"fieldname": "customer", "fieldname": "customer",
"fieldtype": "Link", "fieldtype": "Link",
"options": "Customer", "options": "Customer",
"width": 100 "width": 200
},
{
"label": _("Shipping Address"),
"fieldname": "shipping_address_name",
"fieldtype": "Link",
"options": "Address",
"width": 120
}, },
{ {
"label": _("Expected Delivery Date"), "label": _("Expected Delivery Date"),

2
erpnext/stock/report/delayed_order_report/delayed_order_report.js
View File

@ -55,7 +55,7 @@ frappe.query_reports["Delayed Order Report"] = {
label: __("Based On"), label: __("Based On"),
fieldtype: "Select", fieldtype: "Select",
options: ["Delivery Note", "Sales Invoice"], options: ["Delivery Note", "Sales Invoice"],
default: "Delivery Note", default: "Sales Invoice",
reqd: 1 reqd: 1
}, },
] ]

13
erpnext/stock/report/delayed_order_report/delayed_order_report.py
View File

@ -42,7 +42,14 @@ class DelayedOrderReport(DelayedItemReport):
"fieldname": "customer", "fieldname": "customer",
"fieldtype": "Link", "fieldtype": "Link",
"options": "Customer", "options": "Customer",
"width": 100 "width": 200
},
{
"label": _("Shipping Address"),
"fieldname": "shipping_address_name",
"fieldtype": "Link",
"options": "Address",
"width": 140
}, },
{ {
"label": _("Expected Delivery Date"), "label": _("Expected Delivery Date"),
@ -73,11 +80,11 @@ class DelayedOrderReport(DelayedItemReport):
"fieldname": "sales_order", "fieldname": "sales_order",
"fieldtype": "Link", "fieldtype": "Link",
"options": "Sales Order", "options": "Sales Order",
"width": 100 "width": 150
}, },
{ {
"label": _("Customer PO"), "label": _("Customer PO"),
"fieldname": "po_no", "fieldname": "po_no",
"fieldtype": "Data", "fieldtype": "Data",
"width": 100 "width": 110
}] }]