Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(india): e-invoice generation for registered composition gst category type (#30814)

Browse Source
This commit is contained in:
maharshivpatel 2022-05-02 21:51:27 +05:30 committed by GitHub
parent 2b354270eb
commit 80a13c38bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,6 +57,7 @@ def validate_eligibility(doc):
invalid_company = not frappe.db.get_value("E Invoice User", {"company": doc.get("company")}) invalid_company = not frappe.db.get_value("E Invoice User", {"company": doc.get("company")})
invalid_supply_type = doc.get("gst_category") not in [ invalid_supply_type = doc.get("gst_category") not in [
"Registered Regular", "Registered Regular",
"Registered Composition",
"SEZ", "SEZ",
"Overseas", "Overseas",
"Deemed Export", "Deemed Export",
@ -124,7 +125,9 @@ def read_json(name):
def get_transaction_details(invoice): def get_transaction_details(invoice):
supply_type = "" supply_type = ""
if invoice.gst_category == "Registered Regular": if (
invoice.gst_category == "Registered Regular" or invoice.gst_category == "Registered Composition"
):
supply_type = "B2B" supply_type = "B2B"
elif invoice.gst_category == "SEZ": elif invoice.gst_category == "SEZ":
if invoice.export_type == "Without Payment of Tax": if invoice.export_type == "Without Payment of Tax":
@ -140,14 +143,15 @@ def get_transaction_details(invoice):
supply_type = "DEXP" supply_type = "DEXP"
if not supply_type: if not supply_type:
rr, sez, overseas, export = ( rr, rc, sez, overseas, export = (
bold("Registered Regular"), bold("Registered Regular"),
bold("Registered Composition"),
bold("SEZ"), bold("SEZ"),
bold("Overseas"), bold("Overseas"),
bold("Deemed Export"), bold("Deemed Export"),
) )
frappe.throw( frappe.throw(
_("GST category should be one of {}, {}, {}, {}").format(rr, sez, overseas, export), _("GST category should be one of {}, {}, {}, {}, {}").format(rr, rc, sez, overseas, export),
title=_("Invalid Supply Type"), title=_("Invalid Supply Type"),
) )

2
erpnext/regional/india/setup.py
View File

@ -762,7 +762,7 @@ def get_custom_fields():
insert_after="customer", insert_after="customer",
no_copy=1, no_copy=1,
print_hide=1, print_hide=1,
depends_on='eval:in_list(["Registered Regular", "SEZ", "Overseas", "Deemed Export"], doc.gst_category) && doc.irn_cancelled === 0', depends_on='eval:in_list(["Registered Regular", "Registered Composition", "SEZ", "Overseas", "Deemed Export"], doc.gst_category) && doc.irn_cancelled === 0',
), ),
dict( dict(
fieldname="irn_cancelled", fieldname="irn_cancelled",