fix: scope VAT Return GL entry query to the current company

csf_za/__init__.py

@@ -1 +1 @@
-__version__ = "0.3.1"
+__version__ = "0.3.2"

csf_za/tax_compliance/doctype/value_added_tax_return/test_value_added_tax_return.py

@@ -942,3 +942,87 @@ def test_expense_claim_unclassified_when_no_account_configured(self):
 		result = results[0]
 		self.assertEqual(result.incl_tax_amount, 23.0)
 		self.assertIsNone(result.classification)
+
+	def test_gl_entries_are_scoped_to_company(self):
+		"""
+		GL entries from a second company must not appear in a VAT Return
+		created for the first company, even when they fall in the same
+		date range and use the same account type.
+		"""
+		other_company_name = "_Test Company with perpetual inventory"
+
+		# Resolve parent accounts dynamically — they differ per chart of accounts template.
+		def _group(root_type: str) -> str:
+			return frappe.db.get_value(
+				"Account",
+				{"company": other_company_name, "is_group": 1, "root_type": root_type},
+				"name",
+				order_by="lft asc",
+			)
+
+		other_vat_account = create_account(
+			"VAT Other Company",
+			_group("Asset"),
+			other_company_name,
+			account_type="Tax",
+		)
+
+		other_expense_account = create_account(
+			"Expense Other Company",
+			_group("Expense"),
+			other_company_name,
+			account_type="Expense Account",
+		)
+		other_expense_account.custom_vat_return_debit_classification = (
+			"Input - C Other goods supplied to you (excl capital goods)"
+		)
+		other_expense_account.save()
+
+		other_bank_account = create_account(
+			"Bank Other Company",
+			_group("Asset"),
+			other_company_name,
+			account_type="Bank",
+		)
+
+		je_other = frappe.get_doc(
+			{
+				"doctype": "Journal Entry",
+				"voucher_type": "Journal Entry",
+				"company": other_company_name,
+				"posting_date": "2025-08-15",
+				"accounts": [
+					{"account": other_expense_account.name, "debit_in_account_currency": 100},
+					{"account": other_vat_account.name, "debit_in_account_currency": 15},
+					{"account": other_bank_account.name, "credit_in_account_currency": 115},
+				],
+			}
+		)
+		je_other.insert()
+		je_other.submit()
+
+		vat_return = frappe.get_doc(
+			{
+				"doctype": "Value-added Tax Return",
+				"company": self.company,
+				"date_from": "2025-08-01",
+				"date_to": "2025-08-31",
+			}
+		)
+		vat_return.insert()
+
+		gl_entries_data = vat_return.get_gl_entries()
+
+		returned_voucher_nos = {entry.get("voucher_no") for entry in gl_entries_data}
+		self.assertNotIn(
+			je_other.name,
+			returned_voucher_nos,
+			"Journal Entry from another company appeared in the VAT Return",
+		)
+
+		returned_accounts = {entry.get("account") for entry in gl_entries_data}
+		self.assertNotIn(
+			other_vat_account.name,
+			returned_accounts,
+			"GL entry from another company leaked into the VAT Return",
+		)

csf_za/tax_compliance/doctype/value_added_tax_return/value_added_tax_return.py

@@ -228,11 +228,19 @@ def get_gl_entries(self):
 			.left_join(jea)
 			.on(jea.parent == je.name)
 			.left_join(si)
-			.on((gle.voucher_type == "Sales Invoice") & (si.name == gle.voucher_no))
+			.on(
+				(gle.voucher_type == "Sales Invoice")
+				& (si.name == gle.voucher_no)
+				& (si.company == self.company)
+			)
 			.left_join(sitc)
 			.on((sitc.parent == si.name) & (sitc.account_head == gle.account))
 			.left_join(pi)
-			.on((gle.voucher_type == "Purchase Invoice") & (pi.name == gle.voucher_no))
+			.on(
+				(gle.voucher_type == "Purchase Invoice")
+				& (pi.name == gle.voucher_no)
+				& (pi.company == self.company)
+			)
 			.left_join(pitc)
 			.on((pitc.parent == pi.name) & (pitc.account_head == gle.account))
 			.select(
@@ -262,14 +270,21 @@ def get_gl_entries(self):
 				.as_("taxes_and_charges_template"),
 			)
 			.where(
-				(gle.posting_date >= self.date_from) & (gle.posting_date <= self.date_to) & account_condition
+				(gle.company == self.company)
+				& (gle.posting_date >= self.date_from)
+				& (gle.posting_date <= self.date_to)
+				& account_condition
 			)
 		)
 
 		if expense_claims_available:
 			query = (
 				query.left_join(ec)
-				.on((gle.voucher_type == "Expense Claim") & (ec.name == gle.voucher_no))
+				.on(
+					(gle.voucher_type == "Expense Claim")
+					& (ec.name == gle.voucher_no)
+					& (ec.company == self.company)
+				)
 				.left_join(ectc)
 				.on((ectc.parent == ec.name) & (ectc.account_head == gle.account))
 				.select(

package.json

@@ -1,6 +1,6 @@
 {
   "name": "csf_za",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "author": "Starktail (Pty) Ltd <support@starktail.com>",
   "main": "index.js",
   "devDependencies": {