Merge pull request #18142 from frappe/surajshetty3416-patch-1
refactor: Remove an unwanted debug flag
diff --git a/erpnext/regional/report/gstr_1/gstr_1.json b/erpnext/regional/report/gstr_1/gstr_1.json
index 4ef8d53..2012bb8 100644
--- a/erpnext/regional/report/gstr_1/gstr_1.json
+++ b/erpnext/regional/report/gstr_1/gstr_1.json
@@ -1,29 +1,30 @@
{
- "add_total_row": 0,
- "apply_user_permissions": 1,
- "creation": "2018-01-02 15:54:41.424225",
- "disabled": 0,
- "docstatus": 0,
- "doctype": "Report",
- "idx": 0,
- "is_standard": "Yes",
- "modified": "2018-01-02 17:56:15.379347",
- "modified_by": "Administrator",
- "module": "Regional",
- "name": "GSTR-1",
- "owner": "Administrator",
- "ref_doctype": "GL Entry",
- "report_name": "GSTR-1",
- "report_type": "Script Report",
+ "add_total_row": 1,
+ "creation": "2018-01-02 15:54:41.424225",
+ "disable_prepared_report": 0,
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 0,
+ "is_standard": "Yes",
+ "modified": "2019-06-30 19:33:59.769385",
+ "modified_by": "Administrator",
+ "module": "Regional",
+ "name": "GSTR-1",
+ "owner": "Administrator",
+ "prepared_report": 0,
+ "ref_doctype": "GL Entry",
+ "report_name": "GSTR-1",
+ "report_type": "Script Report",
"roles": [
{
"role": "Accounts User"
- },
+ },
{
"role": "Accounts Manager"
- },
+ },
{
"role": "Auditor"
}
]
-}
+}
\ No newline at end of file
diff --git a/erpnext/regional/report/gstr_1/gstr_1.py b/erpnext/regional/report/gstr_1/gstr_1.py
index ee3619b..eff5780 100644
--- a/erpnext/regional/report/gstr_1/gstr_1.py
+++ b/erpnext/regional/report/gstr_1/gstr_1.py
@@ -559,19 +559,19 @@
res = {}
if filters["type_of_business"] == "B2B":
- for item in report_data:
+ for item in report_data[:-1]:
res.setdefault(item["customer_gstin"], {}).setdefault(item["invoice_number"],[]).append(item)
out = get_b2b_json(res, gstin)
gst_json["b2b"] = out
elif filters["type_of_business"] == "B2C Large":
- for item in report_data:
+ for item in report_data[:-1]:
res.setdefault(item["place_of_supply"], []).append(item)
out = get_b2cl_json(res, gstin)
gst_json["b2cl"] = out
elif filters["type_of_business"] == "EXPORT":
- for item in report_data:
+ for item in report_data[:-1]:
res.setdefault(item["export_type"], []).append(item)
out = get_export_json(res)
diff --git a/erpnext/stock/report/delayed_item_report/delayed_item_report.js b/erpnext/stock/report/delayed_item_report/delayed_item_report.js
index f1ead2c..40e6abe 100644
--- a/erpnext/stock/report/delayed_item_report/delayed_item_report.js
+++ b/erpnext/stock/report/delayed_item_report/delayed_item_report.js
@@ -55,7 +55,7 @@
label: __("Based On"),
fieldtype: "Select",
options: ["Delivery Note", "Sales Invoice"],
- default: "Delivery Note",
+ default: "Sales Invoice",
reqd: 1
},
]
diff --git a/erpnext/stock/report/delayed_item_report/delayed_item_report.py b/erpnext/stock/report/delayed_item_report/delayed_item_report.py
index 7b968b8..4fc4027 100644
--- a/erpnext/stock/report/delayed_item_report/delayed_item_report.py
+++ b/erpnext/stock/report/delayed_item_report/delayed_item_report.py
@@ -46,7 +46,8 @@
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}`.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}`
WHERE
`tab{child_doc}`.parent = `tab{doctype}`.name and `tab{doctype}`.docstatus = 1 and
@@ -97,12 +98,20 @@
"fieldtype": "Link",
"options": based_on,
"width": 100
- },{
+ },
+ {
"label": _("Customer"),
"fieldname": "customer",
"fieldtype": "Link",
"options": "Customer",
- "width": 100
+ "width": 200
+ },
+ {
+ "label": _("Shipping Address"),
+ "fieldname": "shipping_address_name",
+ "fieldtype": "Link",
+ "options": "Address",
+ "width": 120
},
{
"label": _("Expected Delivery Date"),
diff --git a/erpnext/stock/report/delayed_order_report/delayed_order_report.js b/erpnext/stock/report/delayed_order_report/delayed_order_report.js
index 5b02a58..aab0f3d 100644
--- a/erpnext/stock/report/delayed_order_report/delayed_order_report.js
+++ b/erpnext/stock/report/delayed_order_report/delayed_order_report.js
@@ -55,7 +55,7 @@
label: __("Based On"),
fieldtype: "Select",
options: ["Delivery Note", "Sales Invoice"],
- default: "Delivery Note",
+ default: "Sales Invoice",
reqd: 1
},
]
diff --git a/erpnext/stock/report/delayed_order_report/delayed_order_report.py b/erpnext/stock/report/delayed_order_report/delayed_order_report.py
index d2a1a30..79dc5d8 100644
--- a/erpnext/stock/report/delayed_order_report/delayed_order_report.py
+++ b/erpnext/stock/report/delayed_order_report/delayed_order_report.py
@@ -42,7 +42,14 @@
"fieldname": "customer",
"fieldtype": "Link",
"options": "Customer",
- "width": 100
+ "width": 200
+ },
+ {
+ "label": _("Shipping Address"),
+ "fieldname": "shipping_address_name",
+ "fieldtype": "Link",
+ "options": "Address",
+ "width": 140
},
{
"label": _("Expected Delivery Date"),
@@ -73,11 +80,11 @@
"fieldname": "sales_order",
"fieldtype": "Link",
"options": "Sales Order",
- "width": 100
+ "width": 150
},
{
"label": _("Customer PO"),
"fieldname": "po_no",
"fieldtype": "Data",
- "width": 100
+ "width": 110
}]
\ No newline at end of file