From 7bf3e4857e3b25492abeff90b868b08e57953efc Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 4 Oct 2016 13:15:19 +0530 Subject: [PATCH 1/5] [fix] image size in print format --- frappe/templates/styles/standard.css | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/templates/styles/standard.css b/frappe/templates/styles/standard.css index 262f6d44bc..e06f2117f0 100644 --- a/frappe/templates/styles/standard.css +++ b/frappe/templates/styles/standard.css @@ -75,7 +75,6 @@ } .print-item-image { - max-height: 110px; object-fit: contain; } From 4bc486a39c1547afa1a3405c68dc6d69daa55101 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 4 Oct 2016 17:15:41 +0530 Subject: [PATCH 2/5] Get indicator for wrokflow state --- frappe/public/js/frappe/model/indicator.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/model/indicator.js b/frappe/public/js/frappe/model/indicator.js index b9060f1396..05a2b67b78 100644 --- a/frappe/public/js/frappe/model/indicator.js +++ b/frappe/public/js/frappe/model/indicator.js @@ -28,12 +28,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]; } } From 08616c7a0e36470acb69b1e4e0d5843480e7f0c1 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 4 Oct 2016 17:29:01 +0530 Subject: [PATCH 3/5] [fix] translation fix for ToDo --- frappe/translations/de.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/translations/de.csv b/frappe/translations/de.csv index 1458393aa3..8923a6964a 100644 --- a/frappe/translations/de.csv +++ b/frappe/translations/de.csv @@ -945,7 +945,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +494,{0}: No basic permission apps/frappe/frappe/limits.py +72,Your subscription will expire on {0}.,Ihr Abonnement endet am {0}. 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,Aufgaben +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. @@ -1825,7 +1825,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 apps/frappe/frappe/core/page/permission_manager/permission_manager_help.html +33,Setup > User Permissions Manager,Setup> Benutzerberechtigungen-Manager -DocType: ToDo,ToDo,Aufgabe +DocType: ToDo,ToDo,Tun DocType: DocField,No Copy,Keine Kopie DocType: Workflow State,qrcode,QR-Code DocType: Web Form,Breadcrumbs,Breadcrumbs From 98304ca1e2bfc9f90e75181d71574d3be2aa026d Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 4 Oct 2016 17:29:52 +0530 Subject: [PATCH 4/5] [Fix] data import tool, file format issue --- frappe/core/page/data_import_tool/data_import_tool.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/core/page/data_import_tool/data_import_tool.js b/frappe/core/page/data_import_tool/data_import_tool.js index f1094ae472..b7f9662b8b 100644 --- a/frappe/core/page/data_import_tool/data_import_tool.js +++ b/frappe/core/page/data_import_tool/data_import_tool.js @@ -134,7 +134,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) { @@ -197,7 +197,7 @@ frappe.DataImportTool = Class.extend({ r.messages = ["

" + __("Import Failed") + "

"] .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); From 4498cfffd6f5c25ac129a682b90a0febd06deaaf Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 4 Oct 2016 18:05:09 +0600 Subject: [PATCH 5/5] bumped to version 7.0.40 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index ea9603813f..3aa25b1e7e 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template -__version__ = "7.0.39" +__version__ = "7.0.40" local = Local()