From 87441bf62e30294d73bd7ebfe380cd53c53b2815 Mon Sep 17 00:00:00 2001 From: Zarrar Date: Mon, 8 Oct 2018 14:34:34 +0530 Subject: [PATCH] columns without fieldname's data not shown (#15618) --- .../gst_itemised_purchase_register.py | 18 +++++++++--------- .../gst_itemised_sales_register.py | 18 +++++++++--------- .../gst_purchase_register.py | 12 ++++++------ .../gst_sales_register/gst_sales_register.py | 16 ++++++++-------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/erpnext/regional/report/gst_itemised_purchase_register/gst_itemised_purchase_register.py b/erpnext/regional/report/gst_itemised_purchase_register/gst_itemised_purchase_register.py index b0dfdcbfeaa..34ebb72a9fa 100644 --- a/erpnext/regional/report/gst_itemised_purchase_register/gst_itemised_purchase_register.py +++ b/erpnext/regional/report/gst_itemised_purchase_register/gst_itemised_purchase_register.py @@ -7,15 +7,15 @@ from erpnext.accounts.report.item_wise_purchase_register.item_wise_purchase_regi def execute(filters=None): return _execute(filters, additional_table_columns=[ - dict(fieldtype='Data', label='Supplier GSTIN', width=120), - dict(fieldtype='Data', label='Company GSTIN', width=120), - dict(fieldtype='Data', label='Reverse Charge', width=120), - dict(fieldtype='Data', label='Invoice Type', width=120), - 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='Date', label='Supplier Invoice Date', width=100) + dict(fieldtype='Data', label='Supplier GSTIN', fieldname="supplier_gstin", width=120), + dict(fieldtype='Data', label='Company GSTIN', fieldname="company_gstin", width=120), + dict(fieldtype='Data', label='Reverse Charge', fieldname="reverse_charge", width=120), + dict(fieldtype='Data', label='Invoice Type', fieldname="invoice_type", 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) ], additional_query_columns=[ 'supplier_gstin', 'company_gstin', diff --git a/erpnext/regional/report/gst_itemised_sales_register/gst_itemised_sales_register.py b/erpnext/regional/report/gst_itemised_sales_register/gst_itemised_sales_register.py index 4e57a52665d..d0b11635472 100644 --- a/erpnext/regional/report/gst_itemised_sales_register/gst_itemised_sales_register.py +++ b/erpnext/regional/report/gst_itemised_sales_register/gst_itemised_sales_register.py @@ -7,15 +7,15 @@ from erpnext.accounts.report.item_wise_sales_register.item_wise_sales_register i def execute(filters=None): return _execute(filters, additional_table_columns=[ - dict(fieldtype='Data', label='Customer GSTIN', width=120), - dict(fieldtype='Data', label='Billing Address GSTIN', width=140), - dict(fieldtype='Data', label='Company GSTIN', width=120), - dict(fieldtype='Data', label='Place of Supply', width=120), - dict(fieldtype='Data', label='Reverse Charge', width=120), - dict(fieldtype='Data', label='Invoice Type', width=120), - 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='Customer GSTIN', fieldname="customer_gstin", width=120), + dict(fieldtype='Data', label='Billing Address GSTIN', fieldname="billing_address_gstin", width=140), + dict(fieldtype='Data', label='Company GSTIN', fieldname="company_gstin", width=120), + dict(fieldtype='Data', label='Place of Supply', fieldname="place_of_supply", width=120), + dict(fieldtype='Data', label='Reverse Charge', fieldname="reverse_charge", width=120), + dict(fieldtype='Data', label='Invoice Type', fieldname="invoice_type", 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) ], additional_query_columns=[ 'customer_gstin', 'billing_address_gstin', diff --git a/erpnext/regional/report/gst_purchase_register/gst_purchase_register.py b/erpnext/regional/report/gst_purchase_register/gst_purchase_register.py index 8d479a96cd7..59df553e5ab 100644 --- a/erpnext/regional/report/gst_purchase_register/gst_purchase_register.py +++ b/erpnext/regional/report/gst_purchase_register/gst_purchase_register.py @@ -7,12 +7,12 @@ from erpnext.accounts.report.purchase_register.purchase_register import _execute def execute(filters=None): return _execute(filters, additional_table_columns=[ - dict(fieldtype='Data', label='Supplier GSTIN', width=120), - dict(fieldtype='Data', label='Company GSTIN', width=120), - dict(fieldtype='Data', label='Reverse Charge', width=120), - dict(fieldtype='Data', label='Invoice Type', width=120), - dict(fieldtype='Data', label='Export Type', width=120), - dict(fieldtype='Data', label='E-Commerce GSTIN', width=130) + dict(fieldtype='Data', label='Supplier GSTIN', fieldname="supplier_gstin", width=120), + dict(fieldtype='Data', label='Company GSTIN', fieldname="company_gstin", width=120), + dict(fieldtype='Data', label='Reverse Charge', fieldname="reverse_charge", width=120), + dict(fieldtype='Data', label='Invoice Type', fieldname="invoice_type", 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) ], additional_query_columns=[ 'supplier_gstin', 'company_gstin', diff --git a/erpnext/regional/report/gst_sales_register/gst_sales_register.py b/erpnext/regional/report/gst_sales_register/gst_sales_register.py index e79d722b9fb..4b320817e04 100644 --- a/erpnext/regional/report/gst_sales_register/gst_sales_register.py +++ b/erpnext/regional/report/gst_sales_register/gst_sales_register.py @@ -7,14 +7,14 @@ from erpnext.accounts.report.sales_register.sales_register import _execute def execute(filters=None): return _execute(filters, additional_table_columns=[ - dict(fieldtype='Data', label='Customer GSTIN', width=120), - dict(fieldtype='Data', label='Billing Address GSTIN', width=140), - dict(fieldtype='Data', label='Company GSTIN', width=120), - dict(fieldtype='Data', label='Place of Supply', width=120), - dict(fieldtype='Data', label='Reverse Charge', width=120), - dict(fieldtype='Data', label='Invoice Type', width=120), - dict(fieldtype='Data', label='Export Type', width=120), - dict(fieldtype='Data', label='E-Commerce GSTIN', width=130) + dict(fieldtype='Data', label='Customer GSTIN', fieldname="customer_gstin", width=120), + dict(fieldtype='Data', label='Billing Address GSTIN', fieldname="billing_address_gstin", width=140), + dict(fieldtype='Data', label='Company GSTIN', fieldname="company_gstin", width=120), + dict(fieldtype='Data', label='Place of Supply', fieldname="place_of_supply", width=120), + dict(fieldtype='Data', label='Reverse Charge', fieldname="reverse_charge", width=120), + dict(fieldtype='Data', label='Invoice Type', fieldname="invoice_type", 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) ], additional_query_columns=[ 'customer_gstin', 'billing_address_gstin',