nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 11:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42191 from frappe/mergify/bp/version-15/pr-41975

Browse Source 
fix: group by in item-wise purchase register (backport #41975)
This commit is contained in:
ruthra kumar
2024-07-05 08:15:58 +05:30
committed by GitHub
parent 7568af67e9 8baef24541
commit a8cd49112d
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js
View File

@@ -52,7 +52,7 @@ frappe.query_reports["Item-wise Purchase Register"] = {
label: __("Group By"), label: __("Group By"),
fieldname: "group_by", fieldname: "group_by",
fieldtype: "Select", fieldtype: "Select",
options: ["Supplier", "Item Group", "Item", "Invoice"], options: ["", "Supplier", "Item Group", "Item", "Invoice"],
}, },
], ],
formatter: function (value, row, column, data, default_formatter) { formatter: function (value, row, column, data, default_formatter) {

2
erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
View File

@@ -309,7 +309,7 @@ def apply_conditions(query, pi, pii, filters):
query = query.orderby(pi.posting_date, order=Order.desc) query = query.orderby(pi.posting_date, order=Order.desc)
query = query.orderby(pii.item_group, order=Order.desc) query = query.orderby(pii.item_group, order=Order.desc)
else: else:
query = apply_group_by_conditions(filters, "Purchase Invoice") query = apply_group_by_conditions(query, pi, pii, filters)
return query return query

2
erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js
View File

@@ -70,7 +70,7 @@ frappe.query_reports["Item-wise Sales Register"] = {
label: __("Group By"), label: __("Group By"),
fieldname: "group_by", fieldname: "group_by",
fieldtype: "Select", fieldtype: "Select",
options: ["Customer Group", "Customer", "Item Group", "Item", "Territory", "Invoice"], options: ["", "Customer Group", "Customer", "Item Group", "Item", "Territory", "Invoice"],
}, },
], ],
formatter: function (value, row, column, data, default_formatter) { formatter: function (value, row, column, data, default_formatter) {