Merge pull request #21889 from frappe/version-13-hotfix

chore: release v13
frappe · Aug 1, 2023 · 2648908 · 2648908
2 parents b4bdf30 + 706892d
commit 2648908
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/.github/helper/install_dependencies.sh b/.github/helper/install_dependencies.sh
@@ -16,4 +16,6 @@ sudo mv /tmp/wkhtmltox/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf
 sudo chmod o+x /usr/local/bin/wkhtmltopdf
 
 # install cups
-sudo apt update && sudo apt install libcups2-dev redis-server mariadb-client-10.3
+sudo apt update
+sudo apt remove mysql-server mysql-client
+sudo apt install libcups2-dev redis-server mariadb-client-10.3
diff --git a/frappe/desk/doctype/console_log/console_log.json b/frappe/desk/doctype/console_log/console_log.json
@@ -6,8 +6,7 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "script",
-  "output"
+  "script"
  ],
  "fields": [
   {
@@ -16,20 +15,15 @@
    "in_list_view": 1,
    "label": "Script",
    "read_only": 1
-  },
-  {
-   "fieldname": "output",
-   "fieldtype": "Code",
-   "label": "Output",
-   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2020-08-18 20:07:57.587344",
+ "modified": "2023-07-05 22:16:02.823955",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Console Log",
+ "naming_rule": "Expression",
  "owner": "Administrator",
  "permissions": [
   {
@@ -48,5 +42,6 @@
  "quick_entry": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
diff --git a/frappe/desk/doctype/system_console/system_console.py b/frappe/desk/doctype/system_console/system_console.py
@@ -26,7 +26,7 @@ def run(self):
 		else:
 			frappe.db.rollback()
 
-		frappe.get_doc(dict(doctype="Console Log", script=self.console, output=self.output)).insert()
+		frappe.get_doc(dict(doctype="Console Log", script=self.console)).insert()
 		frappe.db.commit()
 
 

diff --git a/frappe/public/js/frappe/form/save.js b/frappe/public/js/frappe/form/save.js
@@ -156,7 +156,10 @@ frappe.ui.form.save = function (frm, action, callback, btn) {
 			if (error_fields.length) {
 				let meta = frappe.get_meta(doc.doctype);
 				if (meta.istable) {
-					const table_label = __(frappe.meta.docfield_map[doc.parenttype][doc.parentfield].label).bold();
+					const table_field = frappe.meta.docfield_map[doc.parenttype][doc.parentfield];
+					const table_label = __(
+						table_field.label || frappe.unscrub(table_field.fieldname)
+					).bold();
 					var message = __('Mandatory fields required in table {0}, Row {1}', [table_label, doc.idx]);
 				} else {
 					var message = __('Mandatory fields required in {0}', [__(doc.doctype)]);

diff --git a/frappe/public/js/frappe/model/model.js b/frappe/public/js/frappe/model/model.js
@@ -57,10 +57,10 @@ $.extend(frappe.model, {
 					cur_frm.doc.doctype === doc.doctype &&
 					cur_frm.doc.name === doc.name
 				) {
-					if (data.modified !== cur_frm.doc.modified) {
+					if (data.modified !== cur_frm.doc.modified && !frappe.ui.form.is_saving) {
 						if (!cur_frm.is_dirty()) {
 							cur_frm.reload_doc();
-						} else if (!frappe.ui.form.is_saving) {
+						} else {
 							doc.__needs_refresh = true;
 							cur_frm.check_doctype_conflict();
 						}