diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py index d00b5dc522e..e0f0e3bd2a8 100644 --- a/erpnext/accounts/utils.py +++ b/erpnext/accounts/utils.py @@ -348,8 +348,8 @@ def get_actual_expense(args): def get_currency_precision(currency=None): if not currency: currency = frappe.db.get_value("Company", - frappe.db.get_default("company"), "default_currency") - currency_format = frappe.db.get_value("Currency", currency, "number_format") + frappe.db.get_default("company"), "default_currency", cache=True) + currency_format = frappe.db.get_value("Currency", currency, "number_format", cache=True) from frappe.utils import get_number_format_info return get_number_format_info(currency_format)[2] diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index c6224787289..fa6e63a35f3 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -358,7 +358,7 @@ def get_taxes_and_charges(master_doctype, master_name, tax_parentfield): def validate_conversion_rate(currency, conversion_rate, conversion_rate_label, company): """common validation for currency and price list currency""" - company_currency = frappe.db.get_value("Company", company, "default_currency") + company_currency = frappe.db.get_value("Company", company, "default_currency", cache=True) if not conversion_rate: throw(_("{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.").format( diff --git a/erpnext/setup/utils.py b/erpnext/setup/utils.py index b4ae5ef6cf6..e3a034c787b 100644 --- a/erpnext/setup/utils.py +++ b/erpnext/setup/utils.py @@ -7,7 +7,7 @@ from frappe import _, throw from frappe.utils import flt def get_company_currency(company): - currency = frappe.db.get_value("Company", company, "default_currency") + currency = frappe.db.get_value("Company", company, "default_currency", cache=True) if not currency: currency = frappe.db.get_default("currency") if not currency: diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py index 5bb2f0c5175..954a03b3bf6 100644 --- a/erpnext/stock/stock_ledger.py +++ b/erpnext/stock/stock_ledger.py @@ -98,7 +98,7 @@ class update_entries_after(object): self.company = frappe.db.get_value("Warehouse", self.warehouse, "company") self.precision = get_field_precision(frappe.get_meta("Stock Ledger Entry").get_field("stock_value"), - currency=frappe.db.get_value("Company", self.company, "default_currency")) + currency=frappe.db.get_value("Company", self.company, "default_currency", cache=True)) self.prev_stock_value = self.previous_sle.stock_value or 0.0 self.stock_queue = json.loads(self.previous_sle.stock_queue or "[]")