commit 93a186aa11c51a24b9a62302ce67d4a004dfe9e5
author Zarrar <zarrar65@gmail.com> Tue May 22 09:16:42 2018 +0530
committer Nabin Hait <nabinhait@gmail.com> Tue May 22 09:16:42 2018 +0530
tree 09d5b86d67bde28ce0895c07d8ebf52161cdda4e
parent 742d3e5549ecf21144a344432d900de9801491c6

fetch customer_gstin or billing_address_gstin optionally (#14075)

erpnext/regional/report/gstr_1/gstr_1.py

diff --git a/erpnext/regional/report/gstr_1/gstr_1.py b/erpnext/regional/report/gstr_1/gstr_1.py
index a14500a..52f0748 100644
--- a/erpnext/regional/report/gstr_1/gstr_1.py
+++ b/erpnext/regional/report/gstr_1/gstr_1.py
@@ -23,7 +23,7 @@
 			posting_date,
 			base_grand_total,
 			base_rounded_total,
-			customer_gstin,
+			COALESCE(NULLIF(customer_gstin,''), NULLIF(billing_address_gstin, '')) as customer_gstin,
 			place_of_supply,
 			ecommerce_gstin,
 			reverse_charge,