Skip to content

Commit

Permalink
fix: changes as per review
Browse files Browse the repository at this point in the history
  • Loading branch information
ljain112 committed Jan 16, 2024
1 parent d558707 commit a275bc7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions india_compliance/gst_india/report/gstr_1/gstr_1.py
Original file line number Diff line number Diff line change
Expand Up @@ -1293,15 +1293,15 @@ def is_same_naming_series(self, name_1, name_2):

def seperate_data_by_nature_of_document(self, data):
nature_of_document = {
"Excluded from Report (Out of Scope of GST)": [],
"Excluded from Report (Excluded from GST)": [],
"Invoices for outward supply": [],
"Debit Note": [],
"Credit Note": [],
}

for doc in data:
if doc.exclude_from_gst:
nature_of_document["Excluded from Report (Out of Scope of GST)"].append(
nature_of_document["Excluded from Report (Excluded from GST)"].append(
doc
)
elif doc.is_return:
Expand Down
5 changes: 4 additions & 1 deletion india_compliance/gst_india/utils/e_waybill.py
Original file line number Diff line number Diff line change
Expand Up @@ -1070,7 +1070,10 @@ def validate_applicability(self):
- Sales Invoice with same company and billing gstin
"""

if self.doc.exclude_from_gst:
if self.doc.exclude_from_gst and self.doc.doctype not in (
"Delivery Note",
"Purchase Receipt",
):
frappe.throw(
_("Cannot generate e-waybill for transactions excluded from GST")
)
Expand Down
2 changes: 1 addition & 1 deletion india_compliance/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"setup_custom_fields_for_gst",
"set_gst_category",
"update_gst_category",
"set_excluded_from_gst",
"add_einvoice_status_field",
"update_tax_category_for_rcm",
"add_company_link_to_einvoice_settings",
Expand All @@ -25,7 +26,6 @@
"rename_import_of_capital_goods",
"update_hsn_code",
"update_company_fixtures",
"set_excluded_from_gst",
"merge_utgst_account_into_sgst_account",
"remove_consumer_gst_category",
"migrate_e_invoice_settings_to_gst_settings",
Expand Down

0 comments on commit a275bc7

Please sign in to comment.