');
+ this.layout.wrapper.prepend(wrapper);
+ }
+
+ frappe
+ .call({
+ method: "frappe.core.doctype.submission_queue.submission_queue.get_latest_submissions",
+ args: { doctype: this.doctype, docname: this.docname },
+ })
+ .then((r) => {
+ if (r.message.latest_submission) {
+ // if we are here that means some submission(s) were queued and are in queued/failed state
+ let col_width = 4;
+ let failed_link = "";
+ let submission_label = __("Previous Submission");
+
+ if (r.message.latest_failed_submission) {
+ if (r.message.latest_failed_submission !== r.message.latest_submission) {
+ col_width = 3;
+ failed_link = `
`;
+ } else {
+ submission_label = __("Previous Falied Submission");
+ }
+ }
+
+ let html = `
+
+
+ ${__("Submission Status:")}
+
+
+ ${failed_link}
+
+
+ `;
+
+ wrapper.show();
+ wrapper.html(html);
+ } else {
+ wrapper.hide();
+ wrapper.html("");
+ }
+ });
+ }
};
frappe.validated = 0;
diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js
index 4a30ad68e0..f9f09187bc 100644
--- a/frappe/public/js/frappe/form/grid_row.js
+++ b/frappe/public/js/frappe/form/grid_row.js
@@ -944,19 +944,21 @@ export default class GridRow {
vertical = false;
horizontal = false;
})
- .on("click", function () {
+ .on("click", function (event) {
if (frappe.ui.form.editable_row !== me) {
var out = me.toggle_editable_row();
}
var col = this;
let first_input_field = $(col).find('input[type="Text"]:first');
-
- first_input_field.length && on_input_focus(first_input_field);
-
first_input_field.trigger("focus");
- first_input_field.one("blur", () => (input_in_focus = false));
- first_input_field.data("fieldtype") == "Date" && handle_date_picker();
+ if (event.pointerType == "touch") {
+ first_input_field.length && on_input_focus(first_input_field);
+
+ first_input_field.one("blur", () => (input_in_focus = false));
+
+ first_input_field.data("fieldtype") == "Date" && handle_date_picker();
+ }
return out;
});
diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 66ff5107a1..52d0026e37 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -1179,7 +1179,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
this.$result.on("click", ".list-row, .image-view-header, .file-header", (e) => {
const $target = $(e.target);
// tick checkbox if Ctrl/Meta key is pressed
- if (e.ctrlKey || (e.metaKey && !$target.is("a"))) {
+ if ((e.ctrlKey || e.metaKey) && !$target.is("a")) {
const $list_row = $(e.currentTarget);
const $check = $list_row.find(".list-row-checkbox");
$check.prop("checked", !$check.prop("checked"));
diff --git a/frappe/public/js/frappe/list/list_view_select.js b/frappe/public/js/frappe/list/list_view_select.js
index 0e7033cf9a..5265ace340 100644
--- a/frappe/public/js/frappe/list/list_view_select.js
+++ b/frappe/public/js/frappe/list/list_view_select.js
@@ -315,7 +315,7 @@ frappe.views.ListViewSelect = class ListViewSelect {
accounts.forEach((account) => {
let email_account =
account.email_id == "All Accounts" ? "All Accounts" : account.email_account;
- let route = `/app/communication/inbox/${email_account}`;
+ let route = `/app/communication/view/inbox/${email_account}`;
let display_name = ["All Accounts", "Sent Mail", "Spam", "Trash"].includes(
account.email_id
)
diff --git a/frappe/public/js/frappe/ui/keyboard.js b/frappe/public/js/frappe/ui/keyboard.js
index 14418528a6..2e3bd95616 100644
--- a/frappe/public/js/frappe/ui/keyboard.js
+++ b/frappe/public/js/frappe/ui/keyboard.js
@@ -331,7 +331,7 @@ function close_grid_and_dialog() {
}
// close open dialog
- if (cur_dialog && !cur_dialog.no_cancel_flag) {
+ if (cur_dialog && !cur_dialog.no_cancel_flag && !cur_dialog.static) {
cur_dialog.cancel();
return false;
}
diff --git a/frappe/public/js/frappe/ui/page.js b/frappe/public/js/frappe/ui/page.js
index 0c15eef774..e381f332a9 100644
--- a/frappe/public/js/frappe/ui/page.js
+++ b/frappe/public/js/frappe/ui/page.js
@@ -327,13 +327,14 @@ frappe.ui.Page = class Page {
//--- Menu --//
- add_menu_item(label, click, standard, shortcut) {
+ add_menu_item(label, click, standard, shortcut, show_parent) {
return this.add_dropdown_item({
label,
click,
standard,
parent: this.menu,
shortcut,
+ show_parent,
});
}
@@ -424,7 +425,7 @@ frappe.ui.Page = class Page {
icon = null,
}) {
if (show_parent) {
- parent.parent().removeClass("hide");
+ parent.parent().removeClass("hide hidden-xl");
}
let $link = this.is_in_group_button_dropdown(parent, "li > a.grey-link > span", label);
@@ -600,6 +601,14 @@ frappe.ui.Page = class Page {
let response = action();
me.btn_disable_enable(btn, response);
};
+ // Add actions as menu item in Mobile View
+ let menu_item_label = group ? `${group} > ${label}` : label;
+ let menu_item = this.add_menu_item(menu_item_label, _action, false, false, false);
+ menu_item.parent().addClass("hidden-xl");
+ if (this.menu_btn_group.hasClass("hide")) {
+ this.menu_btn_group.removeClass("hide").addClass("hidden-xl");
+ }
+
if (group) {
var $group = this.get_or_add_inner_group_button(group);
$(this.inner_toolbar).removeClass("hide");
diff --git a/frappe/public/js/frappe/ui/toolbar/about.js b/frappe/public/js/frappe/ui/toolbar/about.js
index e23706eff1..69cbbfaba0 100644
--- a/frappe/public/js/frappe/ui/toolbar/about.js
+++ b/frappe/public/js/frappe/ui/toolbar/about.js
@@ -19,6 +19,8 @@ frappe.ui.misc.about = function () {
Facebook:
https://facebook.com/erpnext
Twitter: https://twitter.com/erpnext
+
+ YouTube: https://www.youtube.com/@erpnextofficial
${__("Installed Apps")}
${__("Loading versions...")}
diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
index 3d17e8a8f6..cf5b619c37 100644
--- a/frappe/public/js/frappe/utils/utils.js
+++ b/frappe/public/js/frappe/utils/utils.js
@@ -1383,7 +1383,7 @@ Object.assign(frappe.utils, {
: "";
return $(`
-
${summary.label}
+
${__(summary.label)}
${value}
`);
},
diff --git a/frappe/public/js/frappe/views/breadcrumbs.js b/frappe/public/js/frappe/views/breadcrumbs.js
index 5236c21ac2..74560cebbc 100644
--- a/frappe/public/js/frappe/views/breadcrumbs.js
+++ b/frappe/public/js/frappe/views/breadcrumbs.js
@@ -40,7 +40,6 @@ frappe.breadcrumbs = {
type: type,
};
}
-
this.all[frappe.breadcrumbs.current_page()] = obj;
this.update();
},
@@ -137,13 +136,13 @@ frappe.breadcrumbs = {
const doctype_meta = frappe.get_doc("DocType", doctype);
if (
(doctype === "User" && !frappe.user.has_role("System Manager")) ||
- (doctype_meta && doctype_meta.issingle)
+ doctype_meta?.issingle
) {
// no user listview for non-system managers and single doctypes
} else {
let route;
const doctype_route = frappe.router.slug(frappe.router.doctype_layout || doctype);
- if (doctype_meta.is_tree) {
+ if (doctype_meta?.is_tree) {
let view = frappe.model.user_settings[doctype].last_view || "Tree";
route = `${doctype_route}/view/${view}`;
} else {
diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index f71391a1c3..7f20a69efc 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -1067,7 +1067,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
{
fieldname: "sb_1",
fieldtype: "Section Break",
- label: "Y axis",
+ label: "Y Axis",
},
{
fieldname: "y_axis_fields",
diff --git a/frappe/query_builder/builder.py b/frappe/query_builder/builder.py
index 60d0a1208d..5a7b06221f 100644
--- a/frappe/query_builder/builder.py
+++ b/frappe/query_builder/builder.py
@@ -47,6 +47,8 @@ class Base:
class MariaDB(Base, MySQLQuery):
Field = terms.Field
+ _BuilderClasss = MySQLQueryBuilder
+
@classmethod
def _builder(cls, *args, **kwargs) -> "MySQLQueryBuilder":
return super()._builder(*args, wrapper_cls=ParameterizedValueWrapper, **kwargs)
@@ -70,6 +72,8 @@ class Postgres(Base, PostgreSQLQuery):
# they are two different objects. The quick fix used here is to replace the
# Field names in the "Field" function.
+ _BuilderClasss = PostgreSQLQueryBuilder
+
@classmethod
def _builder(cls, *args, **kwargs) -> "PostgreSQLQueryBuilder":
return super()._builder(*args, wrapper_cls=ParameterizedValueWrapper, **kwargs)
diff --git a/frappe/query_builder/utils.py b/frappe/query_builder/utils.py
index f0130ca813..be0403a291 100644
--- a/frappe/query_builder/utils.py
+++ b/frappe/query_builder/utils.py
@@ -12,6 +12,16 @@ from frappe.query_builder.terms import NamedParameterWrapper
from .builder import MariaDB, Postgres
+class PseudoColumnMapper(PseudoColumn):
+ def __init__(self, name: str) -> None:
+ super().__init__(name)
+
+ def get_sql(self, **kwargs):
+ if frappe.db.db_type == "postgres":
+ self.name = self.name.replace("`", '"')
+ return self.name
+
+
class db_type_is(Enum):
MARIADB = "mariadb"
POSTGRES = "postgres"
@@ -102,8 +112,7 @@ def patch_query_execute():
raise frappe.PermissionError("Only SELECT SQL allowed in scripting")
return query, param_collector.get_parameters()
- query_class = get_attr(str(frappe.qb).split("'")[1])
- builder_class = get_type_hints(query_class._builder).get("return")
+ builder_class = frappe.qb._BuilderClasss
if not builder_class:
raise BuilderIdentificationFailed
diff --git a/frappe/templates/includes/navbar/navbar_items.html b/frappe/templates/includes/navbar/navbar_items.html
index 8a10751441..99a40a02a0 100644
--- a/frappe/templates/includes/navbar/navbar_items.html
+++ b/frappe/templates/includes/navbar/navbar_items.html
@@ -3,7 +3,7 @@
{% if parent %}
-{%- set dropdown_id = 'id-' + frappe.utils.generate_hash('Dropdown', 12) -%}
+{%- set dropdown_id = 'id-' + frappe.utils.generate_hash(length=12) -%}
{% else %}
-{%- set dropdown_id = 'id-' + frappe.utils.generate_hash('Dropdown', 12) -%}
+{%- set dropdown_id = 'id-' + frappe.utils.generate_hash(length=12) -%}