From f8d1e5a0d383e44d137c71597ed218d86cde1662 Mon Sep 17 00:00:00 2001 From: l0gesh29 Date: Fri, 18 Jul 2025 14:07:25 +0530 Subject: [PATCH 1/3] feat: add fetch_valuation_rate_for_internal_transaction in accounts settings --- .../doctype/accounts_settings/accounts_settings.json | 9 ++++++++- .../doctype/accounts_settings/accounts_settings.py | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json index 946e8d1a5cc..abb9b96020a 100644 --- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json +++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -41,6 +41,7 @@ "show_payment_schedule_in_print", "item_price_settings_section", "maintain_same_internal_transaction_rate", + "fetch_valuation_rate_for_internal_transaction", "column_break_feyo", "maintain_same_rate_action", "role_to_override_stop_action", @@ -622,6 +623,12 @@ "fieldname": "drop_ar_procedures", "fieldtype": "Button", "label": "Drop Procedures" + }, + { + "default": "0", + "fieldname": "fetch_valuation_rate_for_internal_transaction", + "fieldtype": "Check", + "label": "Fetch Valuation Rate for Internal Transaction" } ], "icon": "icon-cog", @@ -629,7 +636,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2025-06-23 15:55:33.346398", + "modified": "2025-07-18 13:56:47.192437", "modified_by": "Administrator", "module": "Accounts", "name": "Accounts Settings", diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.py b/erpnext/accounts/doctype/accounts_settings/accounts_settings.py index 362b235b2f6..f5a5eb70f96 100644 --- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.py @@ -48,6 +48,7 @@ class AccountsSettings(Document): enable_immutable_ledger: DF.Check enable_party_matching: DF.Check exchange_gain_loss_posting_date: DF.Literal["Invoice", "Payment", "Reconciliation Date"] + fetch_valuation_rate_for_internal_transaction: DF.Check frozen_accounts_modifier: DF.Link | None general_ledger_remarks_length: DF.Int ignore_account_closing_balance: DF.Check From b23f7a9d913656560d3f4c781c277f3705c54f72 Mon Sep 17 00:00:00 2001 From: diptanilsaha Date: Mon, 28 Jul 2025 12:48:57 +0530 Subject: [PATCH 2/3] fix: fetch item valuation rate for internal transactions --- erpnext/public/js/controllers/transaction.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index 03cb670c4df..c9c589b6599 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -652,9 +652,12 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe me.apply_product_discount(d); } }, - () => { + async () => { // for internal customer instead of pricing rule directly apply valuation rate on item - if ((me.frm.doc.is_internal_customer || me.frm.doc.is_internal_supplier) && me.frm.doc.represents_company === me.frm.doc.company) { + const fetch_valuation_rate_for_internal_transactions = await frappe.db.get_single_value( + "Accounts Settings", "fetch_valuation_rate_for_internal_transaction" + ); + if ((me.frm.doc.is_internal_customer || me.frm.doc.is_internal_supplier) && fetch_valuation_rate_for_internal_transactions) { me.get_incoming_rate(item, me.frm.posting_date, me.frm.posting_time, me.frm.doc.doctype, me.frm.doc.company); } else { From bf5b6a540f660ef66041214a23559400bc350018 Mon Sep 17 00:00:00 2001 From: diptanilsaha Date: Mon, 28 Jul 2025 18:25:16 +0530 Subject: [PATCH 3/3] fix: patch to enable fetch_valuation_rate_for_internal_transaction --- erpnext/patches.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 5f4c3672228..abad865a1ed 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -414,3 +414,4 @@ erpnext.patches.v15_0.update_pegged_currencies erpnext.patches.v15_0.set_company_on_pos_inv_merge_log erpnext.patches.v15_0.rename_price_list_to_buying_price_list erpnext.patches.v15_0.remove_sales_partner_from_consolidated_sales_invoice +execute:frappe.db.set_single_value("Accounts Settings", "fetch_valuation_rate_for_internal_transaction", 1)