diff --git a/erpnext/patches.txt b/erpnext/patches.txt index c6c3ae38b92..9b5cc7f0ab0 100755 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -599,4 +599,5 @@ erpnext.patches.v11_1.rename_depends_on_lwp erpnext.patches.v11_1.set_missing_title_for_quotation execute:frappe.delete_doc("Report", "Inactive Items") erpnext.patches.v11_1.delete_scheduling_tool -erpnext.patches.v11_1.update_bank_transaction_status \ No newline at end of file +erpnext.patches.v11_1.update_bank_transaction_status +erpnext.patches.v11_1.renamed_delayed_item_report \ No newline at end of file diff --git a/erpnext/patches/v11_1/renamed_delayed_item_report.py b/erpnext/patches/v11_1/renamed_delayed_item_report.py new file mode 100644 index 00000000000..222b9a0b170 --- /dev/null +++ b/erpnext/patches/v11_1/renamed_delayed_item_report.py @@ -0,0 +1,10 @@ +# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors +# License: GNU General Public License v3. See license.txt + +from __future__ import unicode_literals +import frappe + +def execute(): + for report in ["Delayed Order Item Summary", "Delayed Order Summary"]: + if frappe.db.exists("Report", report): + frappe.delete_doc("Report", report) \ No newline at end of file diff --git a/erpnext/stock/report/delayed_order_item_summary/__init__.py b/erpnext/stock/report/delayed_item_report/__init__.py similarity index 100% rename from erpnext/stock/report/delayed_order_item_summary/__init__.py rename to erpnext/stock/report/delayed_item_report/__init__.py diff --git a/erpnext/stock/report/delayed_order_summary/delayed_order_summary.js b/erpnext/stock/report/delayed_item_report/delayed_item_report.js similarity index 93% rename from erpnext/stock/report/delayed_order_summary/delayed_order_summary.js rename to erpnext/stock/report/delayed_item_report/delayed_item_report.js index a3e2d8eb7d6..f1ead2c9fbb 100644 --- a/erpnext/stock/report/delayed_order_summary/delayed_order_summary.js +++ b/erpnext/stock/report/delayed_item_report/delayed_item_report.js @@ -2,7 +2,7 @@ // For license information, please see license.txt /* eslint-disable */ -frappe.query_reports["Delayed Order Summary"] = { +frappe.query_reports["Delayed Item Report"] = { "filters": [ { fieldname: "company", @@ -55,7 +55,7 @@ frappe.query_reports["Delayed Order Summary"] = { label: __("Based On"), fieldtype: "Select", options: ["Delivery Note", "Sales Invoice"], - default: "Sales Invoice", + default: "Delivery Note", reqd: 1 }, ] diff --git a/erpnext/stock/report/delayed_order_summary/delayed_order_summary.json b/erpnext/stock/report/delayed_item_report/delayed_item_report.json similarity index 77% rename from erpnext/stock/report/delayed_order_summary/delayed_order_summary.json rename to erpnext/stock/report/delayed_item_report/delayed_item_report.json index 0987a9c59ea..47b86f5ff85 100644 --- a/erpnext/stock/report/delayed_order_summary/delayed_order_summary.json +++ b/erpnext/stock/report/delayed_item_report/delayed_item_report.json @@ -1,6 +1,6 @@ { "add_total_row": 0, - "creation": "2019-05-12 12:38:44.907187", + "creation": "2019-05-27 19:11:50.605376", "disable_prepared_report": 0, "disabled": 0, "docstatus": 0, @@ -8,14 +8,14 @@ "idx": 0, "is_standard": "Yes", "letter_head": "Gadgets International", - "modified": "2019-05-12 12:39:16.378341", + "modified": "2019-05-27 19:11:50.605376", "modified_by": "Administrator", "module": "Stock", - "name": "Delayed Order Summary", + "name": "Delayed Item Report", "owner": "Administrator", "prepared_report": 0, "ref_doctype": "Delivery Note", - "report_name": "Delayed Order Summary", + "report_name": "Delayed Item Report", "report_type": "Script Report", "roles": [ { diff --git a/erpnext/stock/report/delayed_order_item_summary/delayed_order_item_summary.py b/erpnext/stock/report/delayed_item_report/delayed_item_report.py similarity index 95% rename from erpnext/stock/report/delayed_order_item_summary/delayed_order_item_summary.py rename to erpnext/stock/report/delayed_item_report/delayed_item_report.py index cc08d45429d..f8aa98886c1 100644 --- a/erpnext/stock/report/delayed_order_item_summary/delayed_order_item_summary.py +++ b/erpnext/stock/report/delayed_item_report/delayed_item_report.py @@ -7,11 +7,11 @@ from frappe import _ from frappe.utils import date_diff def execute(filters=None, consolidated = False): - data, columns = DelayedOrderItemSummary(filters).run() + data, columns = DelayedItemReport(filters).run() return data, columns -class DelayedOrderItemSummary(object): +class DelayedItemReport(object): def __init__(self, filters=None): self.filters = frappe._dict(filters or {}) @@ -83,7 +83,7 @@ class DelayedOrderItemSummary(object): key = row.sales_order if consolidated else (row.sales_order, row.so_detail) row.update({ 'delivery_date': so_data.get(key), - 'delay_days': date_diff(row.posting_date, so_data.get(key)) + 'delayed_days': date_diff(row.posting_date, so_data.get(key)) }) return self.transactions @@ -148,8 +148,8 @@ class DelayedOrderItemSummary(object): "width": 100 }, { - "label": _("Delay Days"), - "fieldname": "delay_days", + "label": _("Delayed Days"), + "fieldname": "delayed_days", "fieldtype": "Int", "width": 100 }, diff --git a/erpnext/stock/report/delayed_order_summary/__init__.py b/erpnext/stock/report/delayed_order_report/__init__.py similarity index 100% rename from erpnext/stock/report/delayed_order_summary/__init__.py rename to erpnext/stock/report/delayed_order_report/__init__.py diff --git a/erpnext/stock/report/delayed_order_item_summary/delayed_order_item_summary.js b/erpnext/stock/report/delayed_order_report/delayed_order_report.js similarity index 93% rename from erpnext/stock/report/delayed_order_item_summary/delayed_order_item_summary.js rename to erpnext/stock/report/delayed_order_report/delayed_order_report.js index 41322544ede..5b02a58fafc 100644 --- a/erpnext/stock/report/delayed_order_item_summary/delayed_order_item_summary.js +++ b/erpnext/stock/report/delayed_order_report/delayed_order_report.js @@ -2,7 +2,7 @@ // For license information, please see license.txt /* eslint-disable */ -frappe.query_reports["Delayed Order Item Summary"] = { +frappe.query_reports["Delayed Order Report"] = { "filters": [ { fieldname: "company", @@ -55,7 +55,7 @@ frappe.query_reports["Delayed Order Item Summary"] = { label: __("Based On"), fieldtype: "Select", options: ["Delivery Note", "Sales Invoice"], - default: "Sales Invoice", + default: "Delivery Note", reqd: 1 }, ] diff --git a/erpnext/stock/report/delayed_order_item_summary/delayed_order_item_summary.json b/erpnext/stock/report/delayed_order_report/delayed_order_report.json similarity index 76% rename from erpnext/stock/report/delayed_order_item_summary/delayed_order_item_summary.json rename to erpnext/stock/report/delayed_order_report/delayed_order_report.json index 760be6f8bc6..a9289beee41 100644 --- a/erpnext/stock/report/delayed_order_item_summary/delayed_order_item_summary.json +++ b/erpnext/stock/report/delayed_order_report/delayed_order_report.json @@ -1,6 +1,6 @@ { "add_total_row": 0, - "creation": "2019-05-12 13:05:39.162734", + "creation": "2019-05-27 19:12:24.719610", "disable_prepared_report": 0, "disabled": 0, "docstatus": 0, @@ -8,14 +8,14 @@ "idx": 0, "is_standard": "Yes", "letter_head": "Gadgets International", - "modified": "2019-05-12 13:05:39.162734", + "modified": "2019-05-27 19:12:24.719610", "modified_by": "Administrator", "module": "Stock", - "name": "Delayed Order Item Summary", + "name": "Delayed Order Report", "owner": "Administrator", "prepared_report": 0, "ref_doctype": "Delivery Note", - "report_name": "Delayed Order Item Summary", + "report_name": "Delayed Order Report", "report_type": "Script Report", "roles": [ { diff --git a/erpnext/stock/report/delayed_order_summary/delayed_order_summary.py b/erpnext/stock/report/delayed_order_report/delayed_order_report.py similarity index 81% rename from erpnext/stock/report/delayed_order_summary/delayed_order_summary.py rename to erpnext/stock/report/delayed_order_report/delayed_order_report.py index 8827decde09..d2a1a30d9e2 100644 --- a/erpnext/stock/report/delayed_order_summary/delayed_order_summary.py +++ b/erpnext/stock/report/delayed_order_report/delayed_order_report.py @@ -3,21 +3,21 @@ from __future__ import unicode_literals from frappe import _ -from erpnext.stock.report.delayed_order_item_summary.delayed_order_item_summary import DelayedOrderItemSummary +from erpnext.stock.report.delayed_item_report.delayed_item_report import DelayedItemReport def execute(filters=None): columns, data = [], [] - columns, data = DelayedOrderSummary(filters).run() + columns, data = DelayedOrderReport(filters).run() return columns, data -class DelayedOrderSummary(DelayedOrderItemSummary): +class DelayedOrderReport(DelayedItemReport): def run(self): return self.get_columns(), self.get_data(consolidated=True) or [] def get_data(self, consolidated=False): - data = super(DelayedOrderSummary, self).get_data(consolidated) or [] + data = super(DelayedOrderReport, self).get_data(consolidated) or [] so_list = [] result = [] @@ -63,8 +63,8 @@ class DelayedOrderSummary(DelayedOrderItemSummary): "width": 100 }, { - "label": _("Delay Days"), - "fieldname": "delay_days", + "label": _("Delayed Days"), + "fieldname": "delayed_days", "fieldtype": "Int", "width": 100 },