Merge branch 'hotfix'

frappe/__init__.py

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '10.0.3'
+__version__ = '10.0.4'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/core/doctype/data_import/importer.py

@@ -201,19 +201,20 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False,
 	def validate_naming(doc):
 		autoname = frappe.get_meta(doctype).autoname
 
-		if ".#" in autoname or "hash" in autoname:
-			autoname = ""
-		elif autoname[0:5] == 'field':
-			autoname = autoname[6:]
-		elif autoname=='naming_series:':
-			autoname = 'naming_series'
-		else:
-			return True
+		if autoname:
+			if ".#" in autoname or "hash" in autoname:
+				autoname = ""
+			elif autoname[0:5] == 'field':
+				autoname = autoname[6:]
+			elif autoname=='naming_series:':
+				autoname = 'naming_series'
+			else:
+				return True
 
-		if (autoname and autoname not in doc) or (autoname and not doc[autoname]):
-			from frappe.model.base_document import get_controller
-			if not hasattr(get_controller(doctype), "autoname"):
-				frappe.throw(_("{0} is a mandatory field".format(autoname)))
+			if (autoname not in doc) or (not doc[autoname]):
+				from frappe.model.base_document import get_controller
+				if not hasattr(get_controller(doctype), "autoname"):
+					frappe.throw(_("{0} is a mandatory field".format(autoname)))
 		return True
 
 	users = frappe.db.sql_list("select name from tabUser")

frappe/translations/da-DK.csv

-apps/frappe/frappe/utils/nestedset.py +240,{0} {1} cannot be a leaf node as it has children,"{0} {1} kan ikke være en blad node, da den har undernoder"
+apps/frappe/frappe/utils/nestedset.py +243,{0} {1} cannot be a leaf node as it has children,"{0} {1} kan ikke være en blad node, da den har undernoder"
 apps/frappe/frappe/utils/csvutils.py +52,"Unknown file encoding. Tried utf-8, windows-1250, windows-1252.","Ukendt fil kodning. Prøvede utf-8, vinduer-1250, vinduer-1252."
 DocType: About Us Settings,"""Company History""",'Virksomhedshistorie'
 DocType: Currency,"1 Currency = [?] Fraction
@@ -6,4 +6,4 @@ For e.g. 1 USD = 100 Cent",1 Valuta = [?] Fraktion For eksempel 1 USD = 100 Cent
 DocType: Workflow State,zoom-in,zoom-in
 DocType: Workflow State,zoom-out,zoom-out
 apps/frappe/frappe/public/js/frappe/form/workflow.js +32, by Role ,af rolle
-apps/frappe/frappe/public/js/frappe/views/gantt/gantt_view.js +100,Half Day,Half Day
+apps/frappe/frappe/public/js/frappe/views/gantt/gantt_view.js +136,Half Day,Half Day

frappe/translations/es-CL.csv

@@ -24,7 +24,7 @@ DocType: Address Template,"<h4>Default Template</h4>
  <!-- code--> <!-- pre--></code></pre></h4>"
 apps/frappe/frappe/email/receive.py +197,Can not find UIDVALIDITY in imap status response,No se puede encontrar UIDVALIDITY en la respuesta de estado IMAP
 apps/frappe/frappe/public/js/frappe/form/footer/timeline.js +491,changed values for {0},Valores modificados para {0}
-DocType: Communication,Link DocType,Enlace DocType
+DocType: Activity Log,Link DocType,Enlace DocType
 apps/frappe/frappe/desk/doctype/kanban_board/kanban_board.py +20,Column Name cannot be empty,El Nombre de la Columna no puede estar vacía
 ,Feedback Ratings,Ratings de Feedback
 apps/frappe/frappe/email/queue.py +249,Cannot send this email. You have crossed the sending limit of {0} emails for this month.,No se puede enviar este correo electrónico. Usted ha cruzado el límite de envío de {0} mensajes de correo electrónico para este mes.