Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #20890 from deepeshgarg007/itemised_purchase_register

Browse Source 
fix: HSN code not visible in GST Itemised Purchase register
This commit is contained in:
Deepesh Garg 2020-03-10 10:05:31 +05:30 committed by GitHub
commit 9f28a3124c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,8 +54,8 @@ def _execute(filters=None, additional_table_columns=None, additional_query_colum
'description': d.description,
'invoice': d.parent,
'posting_date': d.posting_date,
'customer': d.supplier,
'customer_name': d.supplier_name
'supplier': d.supplier,
'supplier_name': d.supplier_name
}
if additional_query_columns:

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

@ -13,9 +13,9 @@ def execute(filters=None):
dict(fieldtype='Data', label='GST Category', fieldname="gst_category", width=120),
dict(fieldtype='Data', label='Export Type', fieldname="export_type", width=120),
dict(fieldtype='Data', label='E-Commerce GSTIN', fieldname="ecommerce_gstin", width=130),
dict(fieldtype='Data', label='HSN Code', fieldname="hsn_code", width=120),
dict(fieldtype='Data', label='Supplier Invoice No', fieldname="supplier_invoice_no", width=120),
dict(fieldtype='Date', label='Supplier Invoice Date', fieldname="supplier_invoice_date", width=100)
dict(fieldtype='Data', label='HSN Code', fieldname="gst_hsn_code", width=120),
dict(fieldtype='Data', label='Supplier Invoice No', fieldname="bill_no", width=120),
dict(fieldtype='Date', label='Supplier Invoice Date', fieldname="bill_date", width=100)
], additional_query_columns=[
'supplier_gstin',
'company_gstin',