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

chore: release v14 (#49057)

Browse Source 
* fix: timeout while submitting purchase receipt

(cherry picked from commit c433943c46)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.json

* chore: fix conflicts

* fix: nonetype error on applying presentation_currency filter on financial statements and trial balance report

(cherry picked from commit d7e22de44c)

* fix(purchase invoice): filter only enabled account

(cherry picked from commit c3111db6e2)

* fix: add condition to fetch active accounts

(cherry picked from commit 7c8dd86a35)

* chore: add back filter

(cherry picked from commit 23308f6d10)

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
Co-authored-by: diptanilsaha <diptanil@frappe.io>
Co-authored-by: mithili <mithili15602@gamil.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
This commit is contained in:
MochaMind
2025-08-11 11:50:29 +05:30
committed by GitHub
parent a7d13d580c
commit 67dad765dc
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
View File

@@ -29,7 +29,10 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
this.frm.set_query("expense_account", "items", function () { this.frm.set_query("expense_account", "items", function () {
return { return {
query: "erpnext.controllers.queries.get_expense_account", query: "erpnext.controllers.queries.get_expense_account",
filters: { company: doc.company }, filters: {
company: doc.company,
disabled: 0,
},
}; };
}); });
} }

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

@@ -118,7 +118,7 @@ def convert_to_presentation_currency(gl_entries, currency_info, filters=None):
len(account_currencies) == 1 len(account_currencies) == 1
and account_currency == presentation_currency and account_currency == presentation_currency
and not exchange_gain_or_loss and not exchange_gain_or_loss
) and not filters.get("show_amount_in_company_currency"): ) and not (filters and filters.get("show_amount_in_company_currency")):
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:

2
erpnext/controllers/queries.py
View File

@@ -646,7 +646,7 @@ def get_expense_account(doctype, txt, searchfield, start, page_len, filters):
where (tabAccount.report_type = "Profit and Loss" where (tabAccount.report_type = "Profit and Loss"
or tabAccount.account_type in ("Expense Account", "Fixed Asset", "Temporary", "Asset Received But Not Billed", "Capital Work in Progress")) or tabAccount.account_type in ("Expense Account", "Fixed Asset", "Temporary", "Asset Received But Not Billed", "Capital Work in Progress"))
and tabAccount.is_group=0 and tabAccount.is_group=0
and tabAccount.docstatus!=2 and tabAccount.disabled = 0
and tabAccount.{searchfield} LIKE %(txt)s and tabAccount.{searchfield} LIKE %(txt)s
{condition} {get_match_cond(doctype)}""", {condition} {get_match_cond(doctype)}""",
{"company": filters.get("company", ""), "txt": "%" + txt + "%"}, {"company": filters.get("company", ""), "txt": "%" + txt + "%"},

5
erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
View File

@@ -1077,7 +1077,8 @@
"no_copy": 1, "no_copy": 1,
"options": "Delivery Note", "options": "Delivery Note",
"print_hide": 1, "print_hide": 1,
"read_only": 1 "read_only": 1,
"search_index": 1
}, },
{ {
"fieldname": "scan_barcode", "fieldname": "scan_barcode",
@@ -1242,7 +1243,7 @@
"idx": 261, "idx": 261,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2024-11-13 16:55:14.129055", "modified": "2025-08-06 16:41:02.690658",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Purchase Receipt", "name": "Purchase Receipt",