Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: release v14 #44007

Merged
merged 8 commits into from
Nov 7, 2024
2 changes: 1 addition & 1 deletion erpnext/accounts/deferred_revenue.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)}"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
18 changes: 18 additions & 0 deletions erpnext/stock/doctype/serial_no/serial_no.js
Original file line number Diff line number Diff line change
Expand Up @@ -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");
});
},
});
8 changes: 8 additions & 0 deletions erpnext/stock/report/serial_no_ledger/serial_no_ledger.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
},
],
};
2 changes: 1 addition & 1 deletion erpnext/templates/pages/projects.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading