From 9e06ad82986f0e0da65a272f27b1aa2b6714df90 Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Tue, 16 Apr 2024 20:58:45 +0200 Subject: [PATCH] fix: filter accounts by company --- erpnext/regional/doctype/fec_import/fec_import.py | 10 +++++++--- .../doctype/fec_import_document/fec_import_document.py | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/erpnext/regional/doctype/fec_import/fec_import.py b/erpnext/regional/doctype/fec_import/fec_import.py index 534ba489bc..6691ef1b42 100644 --- a/erpnext/regional/doctype/fec_import/fec_import.py +++ b/erpnext/regional/doctype/fec_import/fec_import.py @@ -166,7 +166,9 @@ class FECImport(Document): if l["JournalCode"] == journal and l["CompteNum"].startswith("512") } )[0] - account = frappe.get_value("Account", dict(account_number=account_number)) + account = frappe.get_value( + "Account", dict(account_number=account_number, company=self.company) + ) elif journal in cash_journals: journal_type = "Cash" account_number = list( @@ -176,7 +178,9 @@ class FECImport(Document): if l["JournalCode"] == journal and l["CompteNum"].startswith("53") } )[0] - account = frappe.get_value("Account", dict(account_number=account_number)) + account = frappe.get_value( + "Account", dict(account_number=account_number, company=self.company) + ) elif journal in sales_journals: journal_type = "Sales" elif journal in purchase_journals: @@ -222,7 +226,7 @@ class FECImport(Document): "type": _("accounts created"), }, ) - if not frappe.db.exists("Account", dict(account_number=account)): + if not frappe.db.exists("Account", dict(account_number=account, company=self.company)): doc = frappe.new_doc("Account") doc.company = self.company doc.account_name = accounts[account] diff --git a/erpnext/regional/doctype/fec_import_document/fec_import_document.py b/erpnext/regional/doctype/fec_import_document/fec_import_document.py index 115f3e69fa..70bc651175 100644 --- a/erpnext/regional/doctype/fec_import_document/fec_import_document.py +++ b/erpnext/regional/doctype/fec_import_document/fec_import_document.py @@ -118,7 +118,7 @@ class FECImportDocument(Document): x.account_number.strip(): x.name for x in frappe.get_all( "Account", - filters={"disabled": 0, "account_number": ("is", "set")}, + filters={"disabled": 0, "account_number": ("is", "set"), "company": self.company}, fields=["name", "account_number"], ) } -- GitLab