From 46df181d0092b9b8f756fae19e0bc00f19819543 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 25 Nov 2021 13:45:44 +0530
Subject: [PATCH 1/2] fix: do not get password if client_secret is not set
 (#28554)

---
 erpnext/regional/india/e_invoice/utils.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/erpnext/regional/india/e_invoice/utils.py b/erpnext/regional/india/e_invoice/utils.py
index 1e329d41702..983740e5523 100644
--- a/erpnext/regional/india/e_invoice/utils.py
+++ b/erpnext/regional/india/e_invoice/utils.py
@@ -642,9 +642,14 @@ class GSPConnector():
 		request_log.save(ignore_permissions=True)
 		frappe.db.commit()
 
+	def get_client_credentials(self):
+		if self.e_invoice_settings.client_id and self.e_invoice_settings.client_secret:
+			return self.e_invoice_settings.client_id, self.e_invoice_settings.get_password('client_secret')
+
+		return frappe.conf.einvoice_client_id, frappe.conf.einvoice_client_secret
+
 	def fetch_auth_token(self):
-		client_id = self.e_invoice_settings.client_id or frappe.conf.einvoice_client_id
-		client_secret = self.e_invoice_settings.get_password('client_secret') or frappe.conf.einvoice_client_secret
+		client_id, client_secret = self.get_client_credentials()
 		headers = {
 			'gspappid': client_id,
 			'gspappsecret': client_secret

From 652b7393dc35c2b5bc9cc2b1cf97df4da708313b Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Fri, 26 Nov 2021 12:58:50 +0550
Subject: [PATCH 2/2] bumped to version 13.15.1

---
 erpnext/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 3b5e2a1be9b..5cfab4c93ee 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -7,7 +7,7 @@ import frappe
 
 from erpnext.hooks import regional_overrides
 
-__version__ = '13.15.0'
+__version__ = '13.15.1'
 
 def get_default_company(user=None):
 	'''Get default company for user'''