Merge branch 'develop'

frappe/__init__.py

@@ -48,9 +48,9 @@ def _(msg, lang=None):
 
 	# msg should always be unicode
 	msg = cstr(msg)
-		
+
 	return get_full_dict(local.lang).get(msg) or msg
-	
+
 def get_lang_dict(fortype, name=None):
 	"""Returns the translated language dict for the given type and name.
 
@@ -836,7 +836,10 @@ def copy_doc(doc, ignore_no_copy=True):
 			if hasattr(d, df.fieldname):
 				d.set(df.fieldname, None)
 
-	fields_to_clear = ['name', 'owner', 'creation', 'modified', 'modified_by', 'docstatus']
+	fields_to_clear = ['name', 'owner', 'creation', 'modified', 'modified_by']
+
+	if not local.flags.in_test:
+		fields_to_clear.append("docstatus")
 
 	if not isinstance(doc, dict):
 		d = doc.as_dict()

frappe/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = "6.27.2"
+__version__ = "6.27.3"

frappe/core/page/modules_setup/modules_setup.py

@@ -48,17 +48,21 @@ def get_user_icons(user):
 
 	icons = []
 	for icon in get_desktop_icons(user):
+		add = True
 		if icon.hidden_in_standard:
-			continue
+			add = False
+
 		if not icon.custom:
-			if icon.type=="page" and icon.link not in allowed_pages:
-				continue
+			if icon.module_name=='Learn':
+				pass
+
+			elif icon.type=="page" and icon.link not in allowed_pages:
+				add = False
 
 			elif icon.type=="module" and icon.module_name not in user_perms.allow_modules:
-				continue
+				add = False
 
-		icons.append(icon)
+		if add:
+			icons.append(icon)
 
 	return icons
-
-

frappe/desk/doctype/desktop_icon/desktop_icon.py

@@ -97,7 +97,15 @@ def add_user_icon(label, link, type, _doctype):
 			frappe.session.user)[0][0] or \
 			frappe.db.sql('select count(*) from `tabDesktop Icon` where standard=1')[0][0]
 
-		color = random.choice(palette)
+		module = frappe.db.get_value('DocType', _doctype, 'module')
+		module_icon = frappe.get_value('Desktop Icon', {'standard':1, 'module_name':module},
+			['icon', 'color', 'reverse'], as_dict=True)
+
+		if not module_icon:
+			module_icon = frappe._dict()
+			opts = random.choice(palette)
+			module_icon.color = opts[0]
+			module_icon.reverse = 0 if (len(opts) > 1) else 1
 
 		try:
 			frappe.get_doc({
@@ -107,8 +115,9 @@ def add_user_icon(label, link, type, _doctype):
 				'link': link,
 				'type': type,
 				'_doctype': _doctype,
-				'color': color[0],
-				'reverse': 0 if (len(color) > 1) else 1,
+				'icon': module_icon.icon,
+				'color': module_icon.color,
+				'reverse': module_icon.reverse,
 				'idx': idx + 1,
 				'custom': 1,
 				'standard': 0
@@ -128,8 +137,9 @@ def set_order(new_order):
 	if isinstance(new_order, basestring):
 		new_order = json.loads(new_order)
 	for i, module_name in enumerate(new_order):
-		icon = get_user_copy(module_name, frappe.session.user)
-		icon.db_set('idx', i)
+		if module_name not in ('Explore',):
+			icon = get_user_copy(module_name, frappe.session.user)
+			icon.db_set('idx', i)
 
 	clear_desktop_icons_cache()
 

frappe/desk/page/modules/modules_sidebar_item.html

@@ -1,7 +1,7 @@
-    <li data-label="{{ item.label }}" class="strong module-sidebar-item">
+    <li class="strong module-sidebar-item">
         <a class="module-link" data-name="{{ item.module_name }}"
 					href="#modules/{{ item.module_name }}">
           <i class="icon icon-chevron-right pull-right"
 						style="display: none;"></i>
-          <span>{{ item.label }}</span></a>
+          <span>{{ item._label }}</span></a>
     </li>

frappe/hooks.py

@@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies"
 app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node"
 
 app_icon = "octicon octicon-circuit-board"
-app_version = "6.27.2"
+app_version = "6.27.3"
 app_color = "orange"
 source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"

frappe/model/base_document.py

@@ -201,6 +201,9 @@ class BaseDocument(object):
 					# unique empty field should be set to None
 					d[fieldname] = None
 
+				if isinstance(d[fieldname], list) and df.fieldtype != 'Table':
+					frappe.throw(_('Value for {0} cannot be a list').format(_(df.label)))
+
 		return d
 
 	def init_valid_columns(self):

frappe/model/document.py

@@ -211,6 +211,10 @@ class Document(BaseDocument):
 		self.run_post_save_methods()
 		self.flags.in_insert = False
 
+		# delete __islocal
+		if hasattr(self, "__islocal"):
+			delattr(self, "__islocal")
+
 		return self
 
 	def save(self, ignore_permissions=None):

frappe/public/css/desk.css

@@ -317,14 +317,9 @@ a.form-link {
 textarea.form-control {
   height: 120px;
 }
-ul.linked-with-list {
-  list-style: none;
-  margin: 0 0 20px 0;
-  padding: 0 0 0 0;
-}
-ul.linked-with-list li {
-  padding: 5px 0px;
-  border-bottom: 1px solid #d1d8dd;
+.link-select-row {
+  padding: 5px;
+  border-bottom: 1px solid #EBEFF2;
 }
 /* jquery ui */
 .ui-datepicker .ui-datepicker-header {

frappe/public/js/frappe/form/control.js

@@ -1302,6 +1302,12 @@ frappe.ui.form.ControlDynamicLink = frappe.ui.form.ControlLink.extend({
 		if(this.df.get_options) {
 			return this.df.get_options();
 		}
+		if (this.docname==null && cur_dialog!=null){ //for dialog box
+			return cur_dialog.get_value(this.df.options)
+		}
+		if (cur_frm==null){//for list page
+			return $("input[data-fieldname*="+this.df.options+"]").val()
+		}
 		var options = frappe.model.get_value(this.df.parent, this.docname, this.df.options);
 		// if(!options) {
 		// 	msgprint(__("Please set {0} first",

frappe/public/js/frappe/form/grid.js

@@ -17,6 +17,7 @@ frappe.ui.form.Grid = Class.extend({
 		this.fieldinfo = {};
 		this.doctype = this.df.options;
 		this.template = null;
+		this.multiple_set = false;
 		if(this.frm.meta.__form_grid_templates
 			&& this.frm.meta.__form_grid_templates[this.df.fieldname]) {
 				this.template = this.frm.meta.__form_grid_templates[this.df.fieldname];
@@ -99,7 +100,21 @@ frappe.ui.form.Grid = Class.extend({
 
 			if(this.is_editable()) {
 				this.wrapper.find(".grid-footer").toggle(true);
-				this.wrapper.find(".grid-add-row, .grid-add-multiple-rows").toggle(!this.cannot_add_rows);
+
+				// show, hide buttons to add rows
+				if(this.cannot_add_rows) {
+					// add 'hide' to buttons
+					this.wrapper.find(".grid-add-row, .grid-add-multiple-rows")
+						.addClass('hide');
+				} else {
+					// show buttons
+					this.wrapper.find(".grid-add-row").removeClass('hide');
+
+					if(this.multiple_set) {
+						this.wrapper.find(".grid-add-multiple-rows").removeClass('hide')
+					}
+				}
+
 				this.make_sortable($rows);
 			} else {
 				this.wrapper.find(".grid-footer").toggle(false);
@@ -213,18 +228,22 @@ frappe.ui.form.Grid = Class.extend({
 		if(this.multiple_set) return;
 		var me = this;
 		var link_field = frappe.meta.get_docfield(this.df.options, link);
-		$(this.wrapper).find(".grid-add-multiple-rows")
-			.removeClass("hide")
-			.on("click", function() {
-				new frappe.ui.form.LinkSelector({
-					doctype: link_field.options,
-					fieldname: link,
-					qty_fieldname: qty,
-					target: me,
-					txt: ""
-				});
-				return false;
+		var btn = $(this.wrapper).find(".grid-add-multiple-rows");
+
+		// show button
+		btn.removeClass('hide');
+
+		// open link selector on click
+		btn.on("click", function() {
+			new frappe.ui.form.LinkSelector({
+				doctype: link_field.options,
+				fieldname: link,
+				qty_fieldname: qty,
+				target: me,
+				txt: ""
 			});
+			return false;
+		});
 		this.multiple_set = true;
 	},
 	setup_allow_bulk_edit: function() {

frappe/public/js/frappe/form/grid_body.html

@@ -7,11 +7,11 @@
 			<div class="small form-clickable-section grid-footer">
                 <div class="row">
                     <div class="col-sm-6">
-        				<a href="#" class="btn btn-xs btn-default grid-add-row">
-                            {%= __("Add new row") %}</a>
         				<a href="#" class="grid-add-multiple-rows btn btn-xs btn-default hide"
-                            style="margin-left: 10px;">
+                            style="margin-right: 10px;">
                             {%= __("Add multiple rows") %}</a>
+        				<a href="#" class="btn btn-xs btn-default grid-add-row">
+                            {%= __("Add new row") %}</a>
                     </div>
                     <div class="col-sm-6 text-right">
         				<a href="#" class="grid-download btn btn-xs btn-default hide"

frappe/public/js/frappe/form/link_selector.js

@@ -44,8 +44,9 @@ frappe.ui.form.LinkSelector = Class.extend({
 			}
 		});
 		this.dialog.show();
+		this.search();
 	},
-	search: function(btn) {
+	search: function() {
 		var args = {
 				txt: this.dialog.fields_dict.txt.get_value(),
 				doctype: this.doctype,
@@ -73,8 +74,12 @@ frappe.ui.form.LinkSelector = Class.extend({
 				parent.empty();
 				if(r.values.length) {
 					$.each(r.values, function(i, v) {
-						var row = $(repl('<p><b><a href="#" data-value="%(name)s">%(name)s</a></b> \
-							<span class="text-muted">%(values)s</span></p>', {
+						var row = $(repl('<div class="row link-select-row">\
+							<div class="col-xs-4">\
+								<b><a href="#" data-value="%(name)s">%(name)s</a></b></div>\
+							<div class="col-xs-8">\
+								<span class="text-muted">%(values)s</span></div>\
+							</div>', {
 								name: v[0],
 								values: v.splice(1).join(", ")
 							})).appendTo(parent);

frappe/public/less/desk.less

@@ -121,16 +121,11 @@ textarea.form-control {
 	height: 120px;
 }
 
-ul.linked-with-list {
-	list-style: none;
-	margin: 0 0 20px 0;
-	padding: 0 0 0 0;
+.link-select-row {
+	padding: 5px;
+	border-bottom: 1px solid @light-border-color;
 }
 
-ul.linked-with-list li {
-	padding: 5px 0px;
-	border-bottom: 1px solid @border-color;
-}
 
 /* jquery ui */
 

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 from pip.req import parse_requirements
 
-version = "6.27.2"
+version = "6.27.3"
 requirements = parse_requirements("requirements.txt", session="")
 
 setup(