nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 19:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolved merge conflicts

Browse Source
This commit is contained in:
mbauskar
2017-09-14 15:32:10 +05:30
parent beb2f3c415 fd39e6f3c8
commit ea832b8157
17 changed files with 66 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,8 @@ def execute(filters=None):
dict(fieldtype='Data', label='Export Type', width=120),
dict(fieldtype='Data', label='E-Commerce GSTIN', width=130),
dict(fieldtype='Data', label='HSN Code', width=120),
dict(fieldtype='Data', label='Supplier Invoice No', width=120)
dict(fieldtype='Data', label='Supplier Invoice No', width=120),
dict(fieldtype='Date', label='Supplier Invoice Date', width=100)
], additional_query_columns=[
'supplier_gstin',
'company_gstin',
@@ -23,5 +24,6 @@ def execute(filters=None):
'export_type',
'ecommerce_gstin',
'gst_hsn_code',
'bill_no'
'bill_no',
'bill_date'
])