CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 10:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'version-13-pre-release' into version-13

Browse Source
This commit is contained in:
Rohit Waghchaure
2021-11-26 12:38:51 +05:30
parent c92dfa988e 652b7393dc
commit a0579ece92
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@@ -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'''

9
erpnext/regional/india/e_invoice/utils.py
View File

@@ -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