Merge branch 'develop'

frappe/__init__.py

@@ -13,7 +13,7 @@ import os, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template
 
-__version__ = "7.0.6"
+__version__ = "7.0.7"
 
 local = Local()
 

frappe/docs/user/en/bench/guides/lets-encrypt-ssl-setup.md

@@ -12,7 +12,7 @@
 
 Just run: 
 
-    sudo bench setup lets-encrypt [site-name]
+    sudo -H bench setup lets-encrypt [site-name]
 
 You will be faced with several prompts, respond to them accordingly. This command will also add an entry to the crontab of the user that will attempt to renew the certificate every month.
 

frappe/docs/user/en/guides/desk/formatter_for_link_fields.md

@@ -0,0 +1,17 @@
+In case where a code and a name is maintained for an entity, (for example for Employee there may be an Employee Code and Employee Name) and we want to show both the ID and name in a link field, we can make a formatter.
+
+#### Example:
+
+	frappe.form.link_formatters['Employee'] = function(value, doc) {
+		if(doc.employee_name && doc.employee_name !== value) {
+			return value + ': ' + doc.employee_name;
+		} else {
+			return value;
+		}
+	}
+
+Notes:
+
+1. Both the primary key (`name) and the descriptive name (e.g. `employee_name`) must be present in the document. The descriptive name field could be hidden
+1. This needs to be loaded before the document is loaded and can be re-used for all forms. You can also add it in `build.json`
+

frappe/docs/user/en/guides/desk/index.md

@@ -0,0 +1,5 @@
+# Desk Customization
+
+Articles related to customization of Frappe Desk
+
+{index}

frappe/limits.py

@@ -120,7 +120,8 @@ def get_upgrade_url(upgrade_url):
 	params.update({
 		'site': frappe.local.site,
 		'email': frappe.session.user,
-		'full_name': get_fullname()
+		'full_name': get_fullname(),
+		'country': frappe.db.get_value("System Settings", "System Settings", 'country')
 	})
 
 	query = urllib.urlencode(params, doseq=True)

frappe/public/js/frappe/form/formatters.js

@@ -5,6 +5,8 @@
 
 frappe.provide("frappe.form.formatters");
 
+frappe.form.link_formatters = {};
+
 frappe.form.formatters = {
 	_right: function(value, options) {
 		if(options && options.inline) {
@@ -60,11 +62,16 @@ frappe.form.formatters = {
 			return '<i class="icon-ban-circle text-extra-muted" style="margin-right: 3px;"></i>';
 		}
 	},
-	Link: function(value, docfield, options) {
+	Link: function(value, docfield, options, doc) {
 		var doctype = docfield._options || docfield.options;
 		if(value && value.match(/^['"].*['"]$/)) {
-			return value.replace(/^.(.*).$/, "$1");
+			value.replace(/^.(.*).$/, "$1");
+		}
+
+		if(frappe.form.link_formatters[doctype]) {
+			value = frappe.form.link_formatters[doctype](value, doc);
 		}
+
 		if(options && options.for_print) {
 			return value;
 		}

frappe/website/doctype/blog_post/blog_post.py

@@ -21,7 +21,7 @@ class BlogPost(WebsiteGenerator):
 
 	def make_route(self):
 		if not self.route:
-			return 'blog/' + frappe.db.get_value('Blog Category', self.blog_category,
+			return frappe.db.get_value('Blog Category', self.blog_category,
 				'route') + '/' + self.scrub(self.title)
 
 	def get_feed(self):