[regional] ability to load country-wise js for forms

frappe/__init__.py

@@ -139,6 +139,7 @@ def init(site, sites_path=None, new_site=False):
 	local.module_app = None
 	local.app_modules = None
 	local.system_settings = None
+	local.system_country = None
 
 	local.user = None
 	local.user_perms = None
@@ -1360,4 +1361,9 @@ def get_active_domains():
 		active_domains.append("")
 		cache().hset("domains", "active_domains", active_domains)
 
-	return active_domains
+	return active_domains
+
+def get_system_country():
+	if not local.system_country:
+		local.system_country = db.get_single_value('System Settings', 'country')
+	return local.system_country

frappe/desk/form/meta.py

@@ -65,7 +65,10 @@ class FormMeta(Meta):
 		def _get_path(fname):
 			return os.path.join(path, scrub(fname))
 
+		system_country = frappe.get_system_country()
+
 		self._add_code(_get_path(self.name + '.js'), '__js')
+		self._add_code(_get_path(os.path.join('regional', system_country + '.js')), '__js')
 		self._add_code(_get_path(self.name + '.css'), "__css")
 		self._add_code(_get_path(self.name + '_list.js'), '__list_js')
 		self._add_code(_get_path(self.name + '_calendar.js'), '__calendar_js')

frappe/public/css/website.css

@@ -290,6 +290,14 @@ a.no-decoration:active {
 .avatar-large .standard-image {
   font-size: 36px;
 }
+.avatar-xl {
+  margin-right: 10px;
+  width: 108px;
+  height: 108px;
+}
+.avatar-xl .standard-image {
+  font-size: 72px;
+}
 .avatar-xs {
   margin-right: 3px;
   margin-top: -2px;
@@ -980,3 +988,8 @@ li.footer-child-item {
 .page-card .btn {
   margin-top: 30px;
 }
+.bordered {
+  border: 1px solid #d1d8dd;
+  padding: 10px;
+  border-radius: 4px;
+}

frappe/public/js/frappe/ui/page.js

@@ -251,12 +251,22 @@ frappe.ui.Page = Class.extend({
 	},
 
 	add_inner_button: function(label, action, group) {
+		let _action = function() {
+			let btn = $(this);
+			let promise = action();
+			if (promise && promise.then) {
+				btn.attr('disabled', true);
+				promise.then(() => {
+					btn.attr('disabled', false);
+				})
+			}
+		}
 		if(group) {
 			var $group = this.get_inner_group_button(group);
-			return $('<li><a>'+label+'</a></li>').on('click', action).appendTo($group.find(".dropdown-menu"));
+			return $('<li><a>'+label+'</a></li>').on('click', _action).appendTo($group.find(".dropdown-menu"));
 		} else {
 			return $('<button class="btn btn-default btn-xs" style="margin-left: 10px;">'+__(label)+'</btn>')
-				.on("click", action).appendTo(this.inner_toolbar.removeClass("hide"))
+				.on("click", _action).appendTo(this.inner_toolbar.removeClass("hide"))
 		}
 	},
 

frappe/public/less/website.less

@@ -720,3 +720,9 @@ li.footer-child-item {
 		margin-top: 30px;
 	}
 }
+
+.bordered {
+	border: 1px solid @border-color;
+	padding: 10px;
+	border-radius: 4px;
+}

frappe/website/context.py

@@ -48,7 +48,7 @@ def update_controller_context(context, controller):
 					context.update(ret)
 			except frappe.Redirect:
 				raise
-			except frappe.PermissionError:
+			except (frappe.PermissionError, frappe.DoesNotExistError):
 				raise
 			except:
 				if not frappe.flags.in_migrate: