nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 15:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #36031 from frappe/mergify/bp/version-13/pr-36028

Browse Source 
fix: gst_hsn_code is ambiguous on gst reports (backport #36028)
This commit is contained in:
ruthra kumar
2023-07-08 18:46:34 +05:30
committed by GitHub
parent 1116cee831 2893ae72f5
commit a4d8f9cb94
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/regional/report/gst_itemised_purchase_register/gst_itemised_purchase_register.py
View File

@@ -28,7 +28,7 @@ def execute(filters=None):
"gst_category", "gst_category",
"export_type", "export_type",
"ecommerce_gstin", "ecommerce_gstin",
"gst_hsn_code", "`tabPurchase Invoice Item`.gst_hsn_code",
"bill_no", "bill_no",
"bill_date", "bill_date",
], ],

2
erpnext/regional/report/gst_itemised_sales_register/gst_itemised_sales_register.py
View File

@@ -39,7 +39,7 @@ def execute(filters=None):
"gst_category", "gst_category",
"export_type", "export_type",
"ecommerce_gstin", "ecommerce_gstin",
"gst_hsn_code", "`tabSales Invoice Item`.gst_hsn_code",
] ]
additional_conditions = get_conditions(filters, additional_query_columns) additional_conditions = get_conditions(filters, additional_query_columns)