From 114a5f8cca6db794f5672a0103ae42cb7a602793 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 14 Aug 2024 17:30:46 +0530 Subject: [PATCH 1/2] refactor: allow foreign currency accounts in customer group (cherry picked from commit 066e9358920d8409904b685f1054dba5c82420bc) --- .../doctype/customer_group/customer_group.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/erpnext/setup/doctype/customer_group/customer_group.py b/erpnext/setup/doctype/customer_group/customer_group.py index 6d95d3bcb24..06f2f43374e 100644 --- a/erpnext/setup/doctype/customer_group/customer_group.py +++ b/erpnext/setup/doctype/customer_group/customer_group.py @@ -42,7 +42,6 @@ class CustomerGroup(NestedSet): def validate_currency_for_receivable_and_advance_account(self): for x in self.accounts: - company_default_currency = frappe.get_cached_value("Company", x.company, "default_currency") receivable_account_currency = None advance_account_currency = None @@ -56,21 +55,6 @@ class CustomerGroup(NestedSet): "Account", x.advance_account, "account_currency" ) - if receivable_account_currency and receivable_account_currency != company_default_currency: - frappe.throw( - _("Receivable Account: {0} must be in Company default currency: {1}").format( - frappe.bold(x.account), - frappe.bold(company_default_currency), - ) - ) - - if advance_account_currency and advance_account_currency != company_default_currency: - frappe.throw( - _("Advance Account: {0} must be in Company default currency: {1}").format( - frappe.bold(x.advance_account), frappe.bold(company_default_currency) - ) - ) - if ( receivable_account_currency and advance_account_currency From b2e108afccacc69726a00b5b8bedf66fc83cc5d3 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 14 Aug 2024 17:31:19 +0530 Subject: [PATCH 2/2] refactor: allow foreign currency accounts in Supplier Group (cherry picked from commit 164498bafb0f7763011d62cc615d4018c95ae248) --- .../doctype/supplier_group/supplier_group.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/erpnext/setup/doctype/supplier_group/supplier_group.py b/erpnext/setup/doctype/supplier_group/supplier_group.py index fa0c6beac49..5e1cab40450 100644 --- a/erpnext/setup/doctype/supplier_group/supplier_group.py +++ b/erpnext/setup/doctype/supplier_group/supplier_group.py @@ -37,7 +37,6 @@ class SupplierGroup(NestedSet): def validate_currency_for_payable_and_advance_account(self): for x in self.accounts: - company_default_currency = frappe.get_cached_value("Company", x.company, "default_currency") payable_account_currency = None advance_account_currency = None @@ -49,21 +48,6 @@ class SupplierGroup(NestedSet): "Account", x.advance_account, "account_currency" ) - if payable_account_currency and payable_account_currency != company_default_currency: - frappe.throw( - _("Payable Account: {0} must be in Company default currency: {1}").format( - frappe.bold(x.account), - frappe.bold(company_default_currency), - ) - ) - - if advance_account_currency and advance_account_currency != company_default_currency: - frappe.throw( - _("Advance Account: {0} must be in Company default currency: {1}").format( - frappe.bold(x.advance_account), frappe.bold(company_default_currency) - ) - ) - if ( payable_account_currency and advance_account_currency