From 4334df015f9770c5676663c9ce87208137ff070a Mon Sep 17 00:00:00 2001 From: ljain112 Date: Fri, 29 Mar 2024 19:24:48 +0530 Subject: [PATCH] fix: show export invoice with payment of gst in "Outward taxable supplies(zero rated)" --- .../doctype/gstr_3b_report/gstr_3b_report.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/india_compliance/gst_india/doctype/gstr_3b_report/gstr_3b_report.py b/india_compliance/gst_india/doctype/gstr_3b_report/gstr_3b_report.py index d838a0e17..641ab857d 100644 --- a/india_compliance/gst_india/doctype/gstr_3b_report/gstr_3b_report.py +++ b/india_compliance/gst_india/doctype/gstr_3b_report/gstr_3b_report.py @@ -464,6 +464,9 @@ def set_outward_taxable_supplies(self): place_of_supply = ( invoice_details.get("place_of_supply") or "00-Other Territory" ) + is_overseas_invoice = is_overseas_transaction( + "Sales Invoice", gst_category, place_of_supply + ) for rate, items in items_based_on_rate.items(): for item_code, taxable_value in self.invoice_items.get(inv).items(): @@ -476,15 +479,14 @@ def set_outward_taxable_supplies(self): self.report_dict["sup_details"]["osup_nongst"][ "txval" ] += taxable_value - elif rate == 0 or ( - is_overseas_transaction( - "Sales Invoice", gst_category, place_of_supply - ) - and not invoice_details.get("is_export_with_gst") - ): + elif rate == 0 or (is_overseas_invoice): self.report_dict["sup_details"]["osup_zero"][ "txval" ] += taxable_value + + self.report_dict["sup_details"]["osup_zero"]["iamt"] += flt( + taxable_value * rate / 100, 2 + ) else: if inv in self.cgst_sgst_invoices: tax_rate = rate / 2 @@ -531,7 +533,10 @@ def set_outward_taxable_supplies(self): ]["iamt"] += flt(taxable_value * rate / 100, 2) if self.invoice_cess.get(inv): - self.report_dict["sup_details"]["osup_det"]["csamt"] += flt( + + invoice_category = "osup_zero" if is_overseas_invoice else "osup_det" + + self.report_dict["sup_details"][invoice_category]["csamt"] += flt( self.invoice_cess.get(inv), 2 )