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

Merge pull request #48746 from frappe/version-14-hotfix

Browse Source 
chore: release v14
This commit is contained in:
ruthra kumar
2025-07-23 08:19:35 +05:30
committed by GitHub
parent 259251dfab 77ea06dc7d
commit 942aca31f2
4 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@@ -1016,6 +1016,9 @@ class PurchaseInvoice(BuyingController):
def get_provisional_accounts(self): def get_provisional_accounts(self):
self.provisional_accounts = frappe._dict() self.provisional_accounts = frappe._dict()
linked_purchase_receipts = set([d.purchase_receipt for d in self.items if d.purchase_receipt]) linked_purchase_receipts = set([d.purchase_receipt for d in self.items if d.purchase_receipt])
if not linked_purchase_receipts:
return
pr_items = frappe.get_all( pr_items = frappe.get_all(
"Purchase Receipt Item", "Purchase Receipt Item",
filters={"parent": ("in", linked_purchase_receipts)}, filters={"parent": ("in", linked_purchase_receipts)},

2
erpnext/accounts/report/general_ledger/general_ledger.py
View File

@@ -205,7 +205,7 @@ def get_gl_entries(filters, accounting_dimensions):
) )
if filters.get("presentation_currency"): if filters.get("presentation_currency"):
return convert_to_presentation_currency(gl_entries, currency_map) return convert_to_presentation_currency(gl_entries, currency_map, filters)
else: else:
return gl_entries return gl_entries

15
erpnext/accounts/report/utils.py
View File

@@ -86,7 +86,7 @@ def get_rate_as_at(date, from_currency, to_currency):
return rate return rate
def convert_to_presentation_currency(gl_entries, currency_info): def convert_to_presentation_currency(gl_entries, currency_info, filters=None):
""" """
Take a list of GL Entries and change the 'debit' and 'credit' values to currencies Take a list of GL Entries and change the 'debit' and 'credit' values to currencies
in `currency_info`. in `currency_info`.
@@ -99,6 +99,13 @@ def convert_to_presentation_currency(gl_entries, currency_info):
company_currency = currency_info["company_currency"] company_currency = currency_info["company_currency"]
account_currencies = list(set(entry["account_currency"] for entry in gl_entries)) account_currencies = list(set(entry["account_currency"] for entry in gl_entries))
exchange_gain_or_loss = False
if filters and isinstance(filters.get("account"), list):
account_filter = filters.get("account")
gain_loss_account = frappe.db.get_value("Company", filters.company, "exchange_gain_loss_account")
exchange_gain_or_loss = len(account_filter) == 1 and account_filter[0] == gain_loss_account
for entry in gl_entries: for entry in gl_entries:
debit = flt(entry["debit"]) debit = flt(entry["debit"])
@@ -107,7 +114,11 @@ def convert_to_presentation_currency(gl_entries, currency_info):
credit_in_account_currency = flt(entry["credit_in_account_currency"]) credit_in_account_currency = flt(entry["credit_in_account_currency"])
account_currency = entry["account_currency"] account_currency = entry["account_currency"]
if len(account_currencies) == 1 and account_currency == presentation_currency: if (
len(account_currencies) == 1
and account_currency == presentation_currency
and not exchange_gain_or_loss
):
entry["debit"] = debit_in_account_currency entry["debit"] = debit_in_account_currency
entry["credit"] = credit_in_account_currency entry["credit"] = credit_in_account_currency
else: else:

8
erpnext/manufacturing/doctype/production_plan/production_plan.js
View File

@@ -37,6 +37,14 @@ frappe.ui.form.on("Production Plan", {
}; };
}); });
frm.set_query("sub_assembly_warehouse", function (doc) {
return {
filters: {
company: doc.company,
},
};
});
frm.set_query("material_request", "material_requests", function () { frm.set_query("material_request", "material_requests", function () {
return { return {
filters: { filters: {