From 3ae4b9033fc14c6fa10bc32297760fcc351cde1e Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Sat, 7 May 2022 22:44:53 +0530 Subject: [PATCH] chore: Remove extra columns (cherry picked from commit b0e929b8ae8780ada76ea6b699a2b4d840b31487) # Conflicts: # erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py --- .../hsn_wise_summary_of_outward_supplies.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py b/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py index bc1e479c460..057474782d4 100644 --- a/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +++ b/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py @@ -96,6 +96,10 @@ def get_columns(): {"fieldname": "description", "label": _("Description"), "fieldtype": "Data", "width": 300}, {"fieldname": "stock_uom", "label": _("Stock UOM"), "fieldtype": "Data", "width": 100}, {"fieldname": "stock_qty", "label": _("Stock Qty"), "fieldtype": "Float", "width": 90}, +<<<<<<< HEAD +======= + {"fieldname": "tax_rate", "label": _("Tax Rate"), "fieldtype": "Data", "width": 90}, +>>>>>>> b0e929b8ae (chore: Remove extra columns) {"fieldname": "total_amount", "label": _("Total Amount"), "fieldtype": "Currency", "width": 120}, { "fieldname": "taxable_amount", @@ -256,6 +260,7 @@ def get_tax_accounts( def get_merged_data(columns, data): + print(data) merged_hsn_dict = {} # to group same hsn under one key and perform row addition result = []