Merge pull request #3888 from karm1000/handle/is-return-in-ewaybill

fix: set `to state code` from billing address for returns

Author: karm1000

india_compliance/gst_india/data/test_e_waybill.json

@@ -1356,5 +1356,78 @@
             "Status": "CAN",
             "StatusDesc": "Cancelled"
         }
+    },
+    "overseas_customer_domestic_shipping": {
+        "kwargs": {
+            "customer": "_Test Foreign Customer-1",
+            "customer_address": "_Test Foreign Customer-1-Billing",
+            "shipping_address_name": "_Test Foreign Customer-1-Shipping",
+            "vehicle_no": "GJ07DL9009",
+            "company_address": "_Test Indian Registered Company-Billing",
+            "is_in_state": 1
+        },
+        "request_data": {
+            "userGstin": "05AAACG2115R1ZN",
+            "supplyType": "O",
+            "subSupplyType": 1,
+            "docType": "INV",
+            "docNo": "test_invoice_no",
+            "docDate": "09/01/2026",
+            "transactionType": 2,
+            "fromTrdName": "_Test Indian Registered Company",
+            "fromGstin": "05AAACG2115R1ZN",
+            "fromAddr1": "Test Address - 1",
+            "fromPlace": "Test City",
+            "fromPincode": 380015,
+            "fromStateCode": 24,
+            "actFromStateCode": 24,
+            "toTrdName": "_Test Foreign Customer-1",
+            "toGstin": "URP",
+            "toAddr1": "Test Address - 13",
+            "toPlace": "Test City",
+            "toPincode": 380015,
+            "toStateCode": 24,
+            "actToStateCode": 24,
+            "totalValue": 100.0,
+            "cgstValue": 9.0,
+            "sgstValue": 9.0,
+            "igstValue": 0,
+            "cessValue": 0,
+            "cessNonAdvolValue": 0,
+            "otherValue": 0.0,
+            "totInvValue": 118.0,
+            "transMode": 1,
+            "transDistance": 10,
+            "transporterName": "Test Common Supplier",
+            "vehicleNo": "GJ07DL9009",
+            "vehicleType": "R",
+            "itemList": [
+                {
+                    "itemNo": 1,
+                    "productDesc": "Test Trading Goods 1",
+                    "hsnCode": "61149090",
+                    "qtyUnit": "NOS",
+                    "quantity": 1.0,
+                    "taxableAmount": 100.0,
+                    "sgstRate": 9.0,
+                    "cgstRate": 9.0,
+                    "igstRate": 0,
+                    "cessRate": 0,
+                    "cessNonAdvol": 0
+                }
+            ],
+            "mainHsnCode": "61149090"
+        },
+        "params": "action=GENEWAYBILL",
+        "response_data": {
+            "message": "E-Way Bill is generated successfully",
+            "result": {
+                "alert": "",
+                "ewayBillDate": "09/01/2026 12:00:00 PM",
+                "ewayBillNo": 391010000001,
+                "validUpto": "10/01/2026 11:59:00 PM"
+            },
+            "success": true
+        }
     }
 }

india_compliance/gst_india/utils/e_waybill.py

@@ -1730,7 +1730,10 @@ def _get_sandbox_gstin(address, key):
             self.bill_from.gstin = _get_sandbox_gstin(self.bill_from, 0)
             self.bill_to.gstin = _get_sandbox_gstin(self.bill_to, 1)
 
-        to_state_code = int(self.transaction_details.pos_state_code)
+        if self.doc.get("is_return"):
+            to_state_code = self.bill_to.state_number
+        else:
+            to_state_code = int(self.transaction_details.pos_state_code)
 
         data = {
             "userGstin": self.transaction_details.company_gstin,

india_compliance/gst_india/utils/test_e_waybill.py

@@ -1333,6 +1333,61 @@ def test_generate_e_waybill_with_cancelled_gstin_error_3029_standard(self):
             "GSTIN -29AAACI1195H2ZH is inactive or cancelled", str(cm.exception)
         )
 
+    @responses.activate
+    def test_e_waybill_overseas_customer_with_domestic_shipping(self):
+        """Test e-waybill for overseas customer with domestic shipping address.
+
+        When an overseas customer has goods shipped within India the toStateCode should be set based on
+        the place of supply, not as 96-Other Countries.
+        """
+        test_data = self.e_waybill_test_data.get("overseas_customer_domestic_shipping")
+        si = self.create_sales_invoice_for("overseas_customer_domestic_shipping")
+
+        e_waybill_data = EWaybillData(si).get_data()
+
+        self.assertEqual(
+            e_waybill_data.get("toStateCode"),
+            24,
+            "toStateCode should be set from place of supply (shipping address state)",
+        )
+
+        expected_request_data = test_data.get("request_data")
+        for key, value in e_waybill_data.items():
+            self.assertEqual(
+                expected_request_data.get(key), value, f"Mismatch for key '{key}'"
+            )
+
+    def test_e_waybill_for_inter_state_sales_return(self):
+        """Test e-waybill generation for inter-state sales return.
+
+        For return documents (is_return=1) with inter-state transport,
+        the toStateCode should come from bill_to's state number.
+        """
+        si = create_sales_invoice(
+            vehicle_no="GJ07DL9009",
+            company_address="_Test Indian Registered Company-Billing",
+            customer="_Test Registered Customer",
+            customer_address="_Test Registered Customer-Billing-3",
+            is_out_state=1,
+        )
+
+        credit_note = make_return_doc("Sales Invoice", si.name)
+        credit_note.vehicle_no = "GJ07DL9009"
+        credit_note.save()
+        credit_note.submit()
+
+        e_waybill_data = EWaybillData(credit_note).get_data()
+
+        # For inter-state return, toStateCode should be company's state (bill_to after swap)
+        self.assertEqual(
+            e_waybill_data.get("toStateCode"),
+            24,
+            "For inter-state returns, toStateCode should be from bill_to.state_number",
+        )
+
+        self.assertEqual(e_waybill_data.get("supplyType"), "I")
+        self.assertEqual(e_waybill_data.get("subSupplyType"), 7)
+
     # helper functions
     def _generate_e_waybill(
         self, docname=None, doctype="Sales Invoice", test_data=None, force=False