Fixed version conflict

frappe/core/page/data_import_tool/data_import_tool.js

@@ -139,7 +139,7 @@ frappe.DataImportTool = Class.extend({
 				}
 			},
 			callback: function(attachment, r) {
-				if(r.message.error) {
+				if(r.message.error || r.message.messages.length==0) {
 					me.onerror(r);
 				} else {
 					if(me.has_progress) {
@@ -202,7 +202,7 @@ frappe.DataImportTool = Class.extend({
 			r.messages = ["<h4 style='color:red'>" + __("Import Failed") + "</h4>"]
 				.concat(r.messages);
 
-			r.messages.push("Please correct and import again.");
+			r.messages.push("Please correct the format of the file and import again.");
 
 			frappe.show_progress(__("Importing"), 1, 1);
 

frappe/public/js/frappe/model/indicator.js

@@ -42,12 +42,18 @@ frappe.get_indicator = function(doc, doctype) {
 	if(workflow_fieldname) {
 		var value = doc[workflow_fieldname];
 		if(value) {
-			var colour = {
-				"Success": "green",
-				"Warning": "orange",
-				"Danger": "red",
-				"Primary": "blue",
-			}[locals["Workflow State"][value].style] || "darkgrey";
+			var colour = "";
+			
+			if(in_list(locals["Workflow State"], value) && locals["Workflow State"][value].style) {
+				var colour = {
+					"Success": "green",
+					"Warning": "orange",
+					"Danger": "red",
+					"Primary": "blue",
+				}[locals["Workflow State"][value].style];
+			}
+			if(!colour) colour = "darkgrey";
+
 			return [__(value), colour, workflow_fieldname + ',=,' + value];
 		}
 	}

frappe/templates/styles/standard.css

@@ -75,7 +75,6 @@
 }
 
 .print-item-image {
-	max-height: 110px;
 	object-fit: contain;
 }
 

frappe/translations/de.csv

@@ -954,6 +954,7 @@ apps/frappe/frappe/limits.py +72,Your subscription will expire on {0}.,Ihr Abonn
 apps/frappe/frappe/utils/backups.py +159,Download link for your backup will be emailed on the following email address: {0},Download-Link für Datensicherung wird an die folgende E-Mail-Adresse gesendet: {0}
 apps/frappe/frappe/core/page/permission_manager/permission_manager_help.html +14,"Meaning of Submit, Cancel, Amend","Bedeutung von Übertragen, Stornieren, Abändern"
 apps/frappe/frappe/desk/doctype/todo/todo_list.js +7,To Do,Tun
+apps/frappe/frappe/templates/generators/web_form.html +279,Successfully Updated. Redirecting...,Erfolgreich aktualisiert. Umleiten ...
 apps/frappe/frappe/public/js/frappe/ui/editor.html +24,Paragraph,Absatz
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +133,Any existing permission will be deleted / overwritten.,Alle vorhandenen Berechtigungen werden gelöscht/überschrieben.
 apps/frappe/frappe/public/js/frappe/views/reports/reportview.js +508,Then By (optional),Dann von (optional)
@@ -1836,6 +1837,7 @@ DocType: Email Account,Add Signature,Signatur hinzufügen
 apps/frappe/frappe/email/doctype/email_unsubscribe/email_unsubscribe.py +38,Left this conversation,Hat diese Unterhaltung verlassen
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +474,Did not set,Wurde nicht übernommen
 ,Background Jobs,Hintergrundjobs
+apps/frappe/frappe/core/page/permission_manager/permission_manager_help.html +33,Setup > User Permissions Manager,Setup> Benutzerberechtigungen-Manager
 DocType: ToDo,ToDo,Tun
 DocType: DocField,No Copy,Keine Kopie
 DocType: Workflow State,qrcode,QR-Code