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

frappe · Nov 7, 2024 · 33a9c5e · 33a9c5e
2 parents 710771e + 9838eaa
commit 33a9c5e
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/erpnext/accounts/deferred_revenue.py b/erpnext/accounts/deferred_revenue.py
@@ -58,7 +58,7 @@ def build_conditions(process_type, account, company):
 	)
 
 	if account:
-		conditions += f"AND {deferred_account}='{frappe.db.escape(account)}'"
+		conditions += f"AND {deferred_account}={frappe.db.escape(account)}"
 	elif company:
 		conditions += f"AND p.company = {frappe.db.escape(company)}"
 

diff --git a/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py b/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py
@@ -389,7 +389,9 @@ def split_invoices(invoices):
 			if not item.serial_no:
 				continue
 
-			return_against_is_added = any(d for d in _invoices if d.pos_invoice == pos_invoice.return_against)
+			return_against_is_added = any(
+				d for d in _invoices if d and d[0].pos_invoice == pos_invoice.return_against
+			)
 			if return_against_is_added:
 				break
 

diff --git a/erpnext/stock/doctype/serial_no/serial_no.js b/erpnext/stock/doctype/serial_no/serial_no.js
@@ -18,3 +18,21 @@ cur_frm.cscript.onload = function () {
 frappe.ui.form.on("Serial No", "refresh", function (frm) {
 	frm.toggle_enable("item_code", frm.doc.__islocal);
 });
+
+frappe.ui.form.on("Serial No", {
+	refresh(frm) {
+		frm.trigger("view_ledgers");
+	},
+
+	view_ledgers(frm) {
+		frm.add_custom_button(__("View Ledgers"), () => {
+			frappe.route_options = {
+				item_code: frm.doc.item_code,
+				serial_no: frm.doc.name,
+				posting_date: frappe.datetime.now_date(),
+				posting_time: frappe.datetime.now_time(),
+			};
+			frappe.set_route("query-report", "Serial No Ledger");
+		});
+	},
+});
diff --git a/erpnext/stock/report/serial_no_ledger/serial_no_ledger.js b/erpnext/stock/report/serial_no_ledger/serial_no_ledger.js
@@ -45,8 +45,16 @@ frappe.query_reports["Serial No Ledger"] = {
 		{
 			label: __("As On Date"),
 			fieldtype: "Date",
+			reqd: 1,
 			fieldname: "posting_date",
 			default: frappe.datetime.get_today(),
 		},
+		{
+			label: __("Posting Time"),
+			fieldtype: "Time",
+			reqd: 1,
+			fieldname: "posting_time",
+			default: frappe.datetime.now_time(),
+		},
 	],
 };
diff --git a/erpnext/templates/pages/projects.py b/erpnext/templates/pages/projects.py
@@ -51,7 +51,7 @@ def get_tasks(project, start=0, search=None, item_status=None):
 			"parent_task",
 		],
 		limit_start=start,
-		limit_page_length=10,
+		limit_page_length=100,
 	)
 	task_nest = []
 	for task in tasks: