nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 00:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48816 from diptanilsaha/backport_48675

Browse Source 
feat(internal-transaction): fetch valuation rate for internal transaction (backport #48675, #48794)
This commit is contained in:
Diptanil Saha
2025-07-28 18:45:30 +05:30
committed by GitHub
parent f772976676 bf5b6a540f
commit 95470b4262
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/doctype/accounts_settings/accounts_settings.json
View File

@@ -41,6 +41,7 @@
"show_payment_schedule_in_print", "show_payment_schedule_in_print",
"item_price_settings_section", "item_price_settings_section",
"maintain_same_internal_transaction_rate", "maintain_same_internal_transaction_rate",
"fetch_valuation_rate_for_internal_transaction",
"column_break_feyo", "column_break_feyo",
"maintain_same_rate_action", "maintain_same_rate_action",
"role_to_override_stop_action", "role_to_override_stop_action",
@@ -622,6 +623,12 @@
"fieldname": "drop_ar_procedures", "fieldname": "drop_ar_procedures",
"fieldtype": "Button", "fieldtype": "Button",
"label": "Drop Procedures" "label": "Drop Procedures"
},
{
"default": "0",
"fieldname": "fetch_valuation_rate_for_internal_transaction",
"fieldtype": "Check",
"label": "Fetch Valuation Rate for Internal Transaction"
} }
], ],
"icon": "icon-cog", "icon": "icon-cog",
@@ -629,7 +636,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2025-06-23 15:55:33.346398", "modified": "2025-07-18 13:56:47.192437",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Accounts Settings", "name": "Accounts Settings",

1
erpnext/accounts/doctype/accounts_settings/accounts_settings.py
View File

@@ -48,6 +48,7 @@ class AccountsSettings(Document):
enable_immutable_ledger: DF.Check enable_immutable_ledger: DF.Check
enable_party_matching: DF.Check enable_party_matching: DF.Check
exchange_gain_loss_posting_date: DF.Literal["Invoice", "Payment", "Reconciliation Date"] 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 frozen_accounts_modifier: DF.Link | None
general_ledger_remarks_length: DF.Int general_ledger_remarks_length: DF.Int
ignore_account_closing_balance: DF.Check ignore_account_closing_balance: DF.Check

1
erpnext/patches.txt
View File

@@ -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.set_company_on_pos_inv_merge_log
erpnext.patches.v15_0.rename_price_list_to_buying_price_list erpnext.patches.v15_0.rename_price_list_to_buying_price_list
erpnext.patches.v15_0.remove_sales_partner_from_consolidated_sales_invoice 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)

7
erpnext/public/js/controllers/transaction.js
View File

@@ -652,9 +652,12 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
me.apply_product_discount(d); me.apply_product_discount(d);
} }
}, },
() => { async () => {
// for internal customer instead of pricing rule directly apply valuation rate on item // 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.get_incoming_rate(item, me.frm.posting_date, me.frm.posting_time,
me.frm.doc.doctype, me.frm.doc.company); me.frm.doc.doctype, me.frm.doc.company);
} else { } else {