CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-26 08:05:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(currency exchange settings): added backward compatibility for frankfurter api

Browse Source 
(cherry picked from commit 5c2bb66028)

# Conflicts:
#	erpnext/patches.txt
This commit is contained in:
diptanilsaha
2025-12-11 14:59:05 +05:30
committed by Mergify
parent 8f569d9711
commit 8d32ba9a2e
4 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.js
View File

@@ -19,7 +19,7 @@ frappe.ui.form.on("Currency Exchange Settings", {
to: "{to_currency}", to: "{to_currency}",
}; };
add_param(frm, r.message, params, result); add_param(frm, r.message, params, result);
} else if (frm.doc.service_provider == "frankfurter.dev") { } else if (["frankfurter.app", "frankfurter.dev"].includes(frm.doc.service_provider)) {
let result = ["rates", "{to_currency}"]; let result = ["rates", "{to_currency}"];
let params = { let params = {
base: "{from_currency}", base: "{from_currency}",

6
erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py
View File

@@ -60,7 +60,7 @@ class CurrencyExchangeSettings(Document):
self.append("req_params", {"key": "date", "value": "{transaction_date}"}) self.append("req_params", {"key": "date", "value": "{transaction_date}"})
self.append("req_params", {"key": "from", "value": "{from_currency}"}) self.append("req_params", {"key": "from", "value": "{from_currency}"})
self.append("req_params", {"key": "to", "value": "{to_currency}"}) self.append("req_params", {"key": "to", "value": "{to_currency}"})
elif self.service_provider == "frankfurter.dev": elif self.service_provider in ("frankfurter.dev", "frankfurter.app"):
self.set("result_key", []) self.set("result_key", [])
self.set("req_params", []) self.set("req_params", [])
@@ -105,9 +105,11 @@ class CurrencyExchangeSettings(Document):
@frappe.whitelist() @frappe.whitelist()
def get_api_endpoint(service_provider: str | None = None, use_http: bool = False): def get_api_endpoint(service_provider: str | None = None, use_http: bool = False):
if service_provider and service_provider in ["exchangerate.host", "frankfurter.dev"]: if service_provider and service_provider in ["exchangerate.host", "frankfurter.dev", "frankfurter.app"]:
if service_provider == "exchangerate.host": if service_provider == "exchangerate.host":
api = "api.exchangerate.host/convert" api = "api.exchangerate.host/convert"
elif service_provider == "frankfurter.app":
api = "api.frankfurter.app/{transaction_date}"
elif service_provider == "frankfurter.dev": elif service_provider == "frankfurter.dev":
api = "api.frankfurter.dev/v1/{transaction_date}" api = "api.frankfurter.dev/v1/{transaction_date}"

11
erpnext/patches.txt
View File

@@ -424,6 +424,17 @@ erpnext.patches.v15_0.update_uae_zero_rated_fetch
erpnext.patches.v15_0.update_fieldname_in_accounting_dimension_filter erpnext.patches.v15_0.update_fieldname_in_accounting_dimension_filter
erpnext.patches.v15_0.set_asset_status_if_not_already_set erpnext.patches.v15_0.set_asset_status_if_not_already_set
erpnext.patches.v15_0.toggle_legacy_controller_for_period_closing erpnext.patches.v15_0.toggle_legacy_controller_for_period_closing
<<<<<<< HEAD
execute:frappe.db.set_single_value("Accounts Settings", "show_party_balance", 1) execute:frappe.db.set_single_value("Accounts Settings", "show_party_balance", 1)
execute:frappe.db.set_single_value("Accounts Settings", "show_account_balance", 1) execute:frappe.db.set_single_value("Accounts Settings", "show_account_balance", 1)
erpnext.patches.v16_0.update_currency_exchange_settings_for_frankfurter erpnext.patches.v16_0.update_currency_exchange_settings_for_frankfurter
=======
erpnext.patches.v16_0.update_serial_batch_entries
erpnext.patches.v16_0.set_company_wise_warehouses
erpnext.patches.v16_0.set_valuation_method_on_companies
erpnext.patches.v15_0.migrate_old_item_wise_tax_detail_data_to_table
erpnext.patches.v16_0.migrate_budget_records_to_new_structure
erpnext.patches.v16_0.update_currency_exchange_settings_for_frankfurter #2025-12-11
erpnext.patches.v16_0.migrate_account_freezing_settings_to_company
erpnext.patches.v16_0.populate_budget_distribution_total
>>>>>>> 5c2bb66028 (fix(currency exchange settings): added backward compatibility for frankfurter api)

7
erpnext/patches/v16_0/update_currency_exchange_settings_for_frankfurter.py
View File

@@ -2,8 +2,13 @@ import frappe
def execute(): def execute():
settings_meta = frappe.get_meta("Currency Exchange Settings")
settings = frappe.get_doc("Currency Exchange Settings") settings = frappe.get_doc("Currency Exchange Settings")
if settings.service_provider != "frankfurter.app":
if (
"frankfurter.dev" not in settings_meta.get_options("service_provider").split("\n")
or settings.service_provider != "frankfurter.app"
):
return return
settings.service_provider = "frankfurter.dev" settings.service_provider = "frankfurter.dev"