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

fix(e-invoicing): minor ux fixes (#24366)

Browse Source
This commit is contained in:
Saqib
2021-01-14 12:22:23 +05:30
committed by GitHub
parent 4d83564188
commit 8862166223
3 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/regional/doctype/e_invoice_request_log/e_invoice_request_log.json
View File

@@ -24,9 +24,8 @@
}, },
{ {
"fieldname": "reference_invoice", "fieldname": "reference_invoice",
"fieldtype": "Link", "fieldtype": "Data",
"label": "Reference Invoice", "label": "Reference Invoice"
"options": "Sales Invoice"
}, },
{ {
"fieldname": "headers", "fieldname": "headers",
@@ -64,7 +63,7 @@
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"modified": "2020-12-24 21:09:38.882866", "modified": "2021-01-13 12:06:57.253111",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Regional", "module": "Regional",
"name": "E Invoice Request Log", "name": "E Invoice Request Log",

9
erpnext/regional/doctype/e_invoice_settings/e_invoice_settings.json
View File

@@ -7,6 +7,7 @@
"field_order": [ "field_order": [
"enable", "enable",
"section_break_2", "section_break_2",
"sandbox_mode",
"credentials", "credentials",
"auth_token", "auth_token",
"token_expiry" "token_expiry"
@@ -41,12 +42,18 @@
"label": "Credentials", "label": "Credentials",
"mandatory_depends_on": "enable", "mandatory_depends_on": "enable",
"options": "E Invoice User" "options": "E Invoice User"
},
{
"default": "0",
"fieldname": "sandbox_mode",
"fieldtype": "Check",
"label": "Sandbox Mode"
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2020-12-22 15:34:57.280044", "modified": "2021-01-13 12:04:49.449199",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Regional", "module": "Regional",
"name": "E Invoice Settings", "name": "E Invoice Settings",

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

@@ -421,18 +421,22 @@ class RequestFailed(Exception): pass
class GSPConnector(): class GSPConnector():
def __init__(self, doctype=None, docname=None): def __init__(self, doctype=None, docname=None):
self.e_invoice_settings = frappe.get_cached_doc('E Invoice Settings') self.e_invoice_settings = frappe.get_cached_doc('E Invoice Settings')
sandbox_mode = self.e_invoice_settings.sandbox_mode
self.invoice = frappe.get_cached_doc(doctype, docname) if doctype and docname else None self.invoice = frappe.get_cached_doc(doctype, docname) if doctype and docname else None
self.credentials = self.get_credentials() self.credentials = self.get_credentials()
self.base_url = 'https://gsp.adaequare.com/' # authenticate url is same for sandbox & live
self.authenticate_url = self.base_url + 'gsp/authenticate?grant_type=token' self.authenticate_url = 'https://gsp.adaequare.com/gsp/authenticate?grant_type=token'
self.gstin_details_url = self.base_url + 'test/enriched/ei/api/master/gstin' self.base_url = 'https://gsp.adaequare.com' if not sandbox_mode else 'https://gsp.adaequare.com/test'
self.generate_irn_url = self.base_url + 'test/enriched/ei/api/invoice'
self.irn_details_url = self.base_url + 'test/enriched/ei/api/invoice/irn' self.cancel_irn_url = self.base_url + '/enriched/ei/api/invoice/cancel'
self.cancel_irn_url = self.base_url + 'test/enriched/ei/api/invoice/cancel' self.irn_details_url = self.base_url + '/enriched/ei/api/invoice/irn'
self.cancel_ewaybill_url = self.base_url + '/test/enriched/ei/api/ewayapi' self.generate_irn_url = self.base_url + '/enriched/ei/api/invoice'
self.generate_ewaybill_url = self.base_url + 'test/enriched/ei/api/ewaybill' self.gstin_details_url = self.base_url + '/enriched/ei/api/master/gstin'
self.cancel_ewaybill_url = self.base_url + '/enriched/ei/api/ewayapi'
self.generate_ewaybill_url = self.base_url + '/enriched/ei/api/ewaybill'
def get_credentials(self): def get_credentials(self):
if self.invoice: if self.invoice:
gstin = self.get_seller_gstin() gstin = self.get_seller_gstin()
@@ -765,7 +769,7 @@ class GSPConnector():
_file = frappe.new_doc('File') _file = frappe.new_doc('File')
_file.update({ _file.update({
'file_name': 'QRCode_{}.png'.format(docname), 'file_name': 'QRCode_{}.png'.format(docname.replace('/', '-')),
'attached_to_doctype': doctype, 'attached_to_doctype': doctype,
'attached_to_name': docname, 'attached_to_name': docname,
'content': 'qrcode', 'content': 'qrcode',