nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: generate & cancel IRN

Browse Source
This commit is contained in:
Saqib Ansari
2020-11-04 12:35:05 +05:30
parent eb9f216b40
commit 6d5a8aea9a
2 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/regional/india/e_invoice/einvoice.js
View File

@@ -13,7 +13,7 @@ erpnext.setup_einvoice_actions = (doctype) => {
const action = () => { const action = () => {
frappe.call({ frappe.call({
method: 'erpnext.regional.india.e_invoice.utils.generate_irn', method: 'erpnext.regional.india.e_invoice.utils.generate_irn',
args: { doctype: doctype, name: name }, args: { docname: name },
freeze: true, freeze: true,
callback: () => frm.reload_doc() callback: () => frm.reload_doc()
}) })
@@ -48,8 +48,7 @@ erpnext.setup_einvoice_actions = (doctype) => {
frappe.call({ frappe.call({
method: 'erpnext.regional.india.e_invoice.utils.cancel_irn', method: 'erpnext.regional.india.e_invoice.utils.cancel_irn',
args: { args: {
doctype: doctype, docname: name,
name: name,
irn: irn, irn: irn,
reason: data.reason.split('-')[0], reason: data.reason.split('-')[0],
remark: data.remark remark: data.remark

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

@@ -77,9 +77,7 @@ def get_doc_details(invoice):
return frappe._dict(dict(invoice_type=invoice_type, invoice_name=invoice_name, invoice_date=invoice_date)) return frappe._dict(dict(invoice_type=invoice_type, invoice_name=invoice_name, invoice_date=invoice_date))
def get_party_details(address): def get_party_details(address_name):
from erpnext.regional.doctype.e_invoice_settings.e_invoice_settings import GSPConnector
address = frappe.get_all('Address', filters={'name': address_name}, fields=['*'])[0] address = frappe.get_all('Address', filters={'name': address_name}, fields=['*'])[0]
gstin = address.get('gstin') gstin = address.get('gstin')
@@ -333,30 +331,27 @@ def validate_einvoice(validations, einvoice, errors=[]):
return errors return errors
def update_invoice(invoice, res): def update_invoice(doctype, docname, res):
doctype = invoice.doctype
name = invoice.name
enc_signed_invoice = res.get('SignedInvoice') enc_signed_invoice = res.get('SignedInvoice')
dec_signed_invoice = jwt.decode(enc_signed_invoice)['data'] dec_signed_invoice = jwt.decode(enc_signed_invoice, verify=False)['data']
frappe.db.set_value(doctype, name, 'irn', res.get('Irn')) frappe.db.set_value(doctype, docname, 'irn', res.get('Irn'))
frappe.db.set_value(doctype, name, 'ewaybill', res.get('EwbNo')) frappe.db.set_value(doctype, docname, 'ewaybill', res.get('EwbNo'))
frappe.db.set_value(doctype, name, 'signed_invoice', dec_signed_invoice) frappe.db.set_value(doctype, docname, 'signed_einvoice', dec_signed_invoice)
signed_qrcode = res.get('SignedQRCode') signed_qr_code = res.get('SignedQRCode')
frappe.db.set_value(doctype, name, 'signed_qr_code', signed_qrcode) frappe.db.set_value(doctype, docname, 'signed_qr_code', signed_qr_code)
attach_qrcode_image(doctype, name, signed_qrcode) attach_qrcode_image(doctype, docname, signed_qr_code)
def attach_qrcode_image(doctype, name, qrcode): def attach_qrcode_image(doctype, docname, qrcode):
if not qrcode: return if not qrcode: return
_file = frappe.new_doc('File') _file = frappe.new_doc('File')
_file.update({ _file.update({
'file_name': f'QRCode_{name}.png', 'file_name': f'QRCode_{docname}.png',
'attached_to_doctype': doctype, 'attached_to_doctype': doctype,
'attached_to_name': name, 'attached_to_name': docname,
'content': 'qrcode', 'content': 'qrcode',
'is_private': 1 'is_private': 1
}) })
@@ -366,7 +361,7 @@ def attach_qrcode_image(doctype, name, qrcode):
abs_file_path = os.path.abspath(_file.get_full_path()) abs_file_path = os.path.abspath(_file.get_full_path())
url.png(abs_file_path, scale=2) url.png(abs_file_path, scale=2)
frappe.db.set_value(doctype, name, 'qrcode_image', _file.file_url) frappe.db.set_value(doctype, docname, 'qrcode_image', _file.file_url)
class GSPConnector(): class GSPConnector():
def __init__(self): def __init__(self):
@@ -458,10 +453,10 @@ class GSPConnector():
try: try:
res = make_post_request(self.generate_irn_url, headers=headers, data=data) res = make_post_request(self.generate_irn_url, headers=headers, data=data)
if res.get('success'): if res.get('success'):
update_invoice(invoice, res) update_invoice(doctype, docname, res.get('result'))
else: else:
# {'success': False, 'message': '3039 : Seller Details:Pincode-560009 does not belong to the state-1, 2177 : Invalid item unit code(s)-UNIT'} # {'success': False, 'message': '3039 : Seller Details:Pincode-560009 does not belong to the state-1, 2177 : Invalid item unit code(s)-UNIT'}
self.log_error() self.log_error(res)
except Exception as e: except Exception as e:
self.log_error(e) self.log_error(e)
@@ -504,3 +499,13 @@ class GSPConnector():
def log_error(self, exc): def log_error(self, exc):
print(exc) print(exc)
@frappe.whitelist()
def generate_irn(docname):
gsp_connector = GSPConnector()
gsp_connector.generate_irn(docname)
@frappe.whitelist()
def cancel_irn(docname, irn, reason, remark):
gsp_connector = GSPConnector()
gsp_connector.cancel_irn(docname, irn, reason, remark)