mirror of
https://github.com/frappe/erpnext.git
synced 2026-09-09 15:29:30 +00:00
fix(gross-profit): include item_name in export (#58631)
(cherry picked from commit 467f54162f)
This commit is contained in:
committed by
Mergify
parent
a64b78d283
commit
c752bb34a8
@@ -180,13 +180,15 @@ def get_data_when_grouped_by_invoice(columns, gross_profit_data, filters, group_
|
|||||||
columns[0]["fieldname"] = "sales_invoice"
|
columns[0]["fieldname"] = "sales_invoice"
|
||||||
columns[0]["options"] = "Item"
|
columns[0]["options"] = "Item"
|
||||||
columns[0]["width"] = 300
|
columns[0]["width"] = 300
|
||||||
# removing Item Code and Item Name columns
|
# removing the duplicate Item Code column and moving Item Name before Customer
|
||||||
supplier_master_name = frappe.db.get_single_value("Buying Settings", "supp_master_name")
|
supplier_master_name = frappe.db.get_single_value("Buying Settings", "supp_master_name")
|
||||||
customer_master_name = frappe.db.get_single_value("Selling Settings", "cust_master_name")
|
customer_master_name = frappe.db.get_single_value("Selling Settings", "cust_master_name")
|
||||||
if supplier_master_name == "Supplier Name" and customer_master_name == "Customer Name":
|
if supplier_master_name == "Supplier Name" and customer_master_name == "Customer Name":
|
||||||
del columns[4:6]
|
del columns[4]
|
||||||
|
columns.insert(1, columns.pop(4))
|
||||||
else:
|
else:
|
||||||
del columns[5:7]
|
del columns[5]
|
||||||
|
columns.insert(1, columns.pop(5))
|
||||||
|
|
||||||
total_base_amount = 0
|
total_base_amount = 0
|
||||||
total_buying_amount = 0
|
total_buying_amount = 0
|
||||||
|
|||||||
Reference in New Issue
Block a user