From 56b28d0a0ae7cd27412b87bdad880f05be82e656 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 19 Mar 2019 14:08:35 +0530
Subject: [PATCH 001/256] feat: Init energy points

---
 frappe/boot.py                                |   2 +-
 frappe/core/doctype/user/user.js              |  43 +-
 frappe/core/doctype/user/user.json            | 110 ++-
 frappe/core/doctype/user/user.py              |   2 +-
 .../page/energy_point_history/__init__.py     |   0
 .../energy_point_history.js                   |  19 +
 .../energy_point_history.json                 |  18 +
 .../energy_point_transactions.html            |  10 +
 frappe/hooks.py                               |   5 +-
 frappe/integrations/github_event_handler.py   |  81 +++
 frappe/modules.txt                            |   2 +-
 frappe/public/build.json                      |   2 +-
 frappe/public/js/frappe/misc/user.js          |   6 +-
 .../public/js/frappe/ui/toolbar/navbar.html   |  20 +-
 frappe/public/less/avatar.less                |   2 +-
 frappe/public/less/common.less                |   6 +-
 frappe/public/less/flex.less                  |   4 +
 frappe/public/less/social.less                |   2 +-
 frappe/public/less/variables.less             |   1 +
 frappe/social/doctype/badge/__init__.py       |   0
 frappe/social/doctype/badge/badge.js          |   8 +
 frappe/social/doctype/badge/badge.json        | 191 ++++++
 frappe/social/doctype/badge/badge.py          |  10 +
 .../doctype/energy_point_log/__init__.py      |   0
 .../energy_point_log/energy_point_log.js      |   8 +
 .../energy_point_log/energy_point_log.json    | 226 +++++++
 .../energy_point_log/energy_point_log.py      |  79 +++
 .../doctype/energy_point_rule/__init__.py     |   0
 .../energy_point_rule/energy_point_rule.js    |   8 +
 .../energy_point_rule/energy_point_rule.json  | 226 +++++++
 .../energy_point_rule/energy_point_rule.py    |  10 +
 frappe/social/doctype/post/post.json          | 624 +++++++++---------
 frappe/social/doctype/post/post.py            |   2 +-
 frappe/social/doctype/user_badge/__init__.py  |   0
 .../social/doctype/user_badge/user_badge.json | 108 +++
 .../social/doctype/user_badge/user_badge.py   |  10 +
 frappe/utils/user.py                          |   2 +-
 37 files changed, 1497 insertions(+), 350 deletions(-)
 create mode 100644 frappe/core/page/energy_point_history/__init__.py
 create mode 100644 frappe/core/page/energy_point_history/energy_point_history.js
 create mode 100644 frappe/core/page/energy_point_history/energy_point_history.json
 create mode 100644 frappe/core/page/energy_point_history/energy_point_transactions.html
 create mode 100644 frappe/integrations/github_event_handler.py
 create mode 100644 frappe/social/doctype/badge/__init__.py
 create mode 100644 frappe/social/doctype/badge/badge.js
 create mode 100644 frappe/social/doctype/badge/badge.json
 create mode 100644 frappe/social/doctype/badge/badge.py
 create mode 100644 frappe/social/doctype/energy_point_log/__init__.py
 create mode 100644 frappe/social/doctype/energy_point_log/energy_point_log.js
 create mode 100644 frappe/social/doctype/energy_point_log/energy_point_log.json
 create mode 100644 frappe/social/doctype/energy_point_log/energy_point_log.py
 create mode 100644 frappe/social/doctype/energy_point_rule/__init__.py
 create mode 100644 frappe/social/doctype/energy_point_rule/energy_point_rule.js
 create mode 100644 frappe/social/doctype/energy_point_rule/energy_point_rule.json
 create mode 100644 frappe/social/doctype/energy_point_rule/energy_point_rule.py
 create mode 100644 frappe/social/doctype/user_badge/__init__.py
 create mode 100644 frappe/social/doctype/user_badge/user_badge.json
 create mode 100644 frappe/social/doctype/user_badge/user_badge.py

diff --git a/frappe/boot.py b/frappe/boot.py
index 05117acb7a..1e99b6bb30 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -195,7 +195,7 @@ def load_translations(bootinfo):
 def get_fullnames():
 	"""map of user fullnames"""
 	ret = frappe.db.sql("""select `name`, full_name as fullname,
-		user_image as image, gender, email, username, bio, location, interest, banner_image, allowed_in_mentions
+		user_image as image, gender, email, username, bio, location, interest, banner_image, allowed_in_mentions, energy_points
 		from tabUser where enabled=1 and user_type!='Website User'""", as_dict=1)
 
 	d = {}
diff --git a/frappe/core/doctype/user/user.js b/frappe/core/doctype/user/user.js
index d334731015..d9f87a1db1 100644
--- a/frappe/core/doctype/user/user.js
+++ b/frappe/core/doctype/user/user.js
@@ -2,7 +2,7 @@ frappe.ui.form.on('User', {
 	before_load: function(frm) {
 		var update_tz_select = function(user_language) {
 			frm.set_df_property("time_zone", "options", [""].concat(frappe.all_timezones));
-		}
+		};
 
 		if(!frappe.all_timezones) {
 			frappe.call({
@@ -25,7 +25,7 @@ frappe.ui.form.on('User', {
 				args: {
 					role_profile: frm.doc.role_profile_name
 				},
-				callback: function (data) {
+				callback: function(data) {
 					frm.set_value("roles", []);
 					$.each(data.message || [], function(i, v){
 						var d = frm.add_child("roles");
@@ -60,6 +60,15 @@ frappe.ui.form.on('User', {
 			frm.reload_doc();
 			return;
 		}
+		if (!frm.points) {
+			frm.points = frm.sidebar.image_section.append(`
+				<ul class="list-unstyled sidebar-menu">
+					<li align="center" class="bold text-muted">
+						<span class="text-large">${frm.doc.energy_points}</span> points
+					</li>
+				</ul>
+			`);
+		}
 		if(doc.name===frappe.session.user && !doc.__unsaved
 			&& frappe.all_timezones
 			&& (doc.language || frappe.boot.user.language)
@@ -78,7 +87,7 @@ frappe.ui.form.on('User', {
 						"user": doc.name
 					};
 					frappe.set_route('List', 'User Permission');
-				}, __("Permissions"))
+				}, __("Permissions"));
 
 				frm.add_custom_button(__('View Permitted Documents'),
 					() => frappe.set_route('query-report', 'Permitted Documents For User',
@@ -93,7 +102,7 @@ frappe.ui.form.on('User', {
 					args: {
 						"user": frm.doc.name
 					}
-				})
+				});
 			}, __("Password"));
 
 			frm.add_custom_button(__("Reset OTP Secret"), function() {
@@ -102,7 +111,7 @@ frappe.ui.form.on('User', {
 					args: {
 						"user": frm.doc.name
 					}
-				})
+				});
 			}, __("Password"));
 
 			frm.trigger('enabled');
@@ -130,8 +139,8 @@ frappe.ui.form.on('User', {
 			}
 			if (!found){
 				frm.add_custom_button(__("Create User Email"), function() {
-					frm.events.create_user_email(frm)
-				})
+					frm.events.create_user_email(frm);
+				});
 			}
 		}
 
@@ -146,7 +155,7 @@ frappe.ui.form.on('User', {
 	},
 	validate: function(frm) {
 		if(frm.roles_editor) {
-			frm.roles_editor.set_roles_in_table()
+			frm.roles_editor.set_roles_in_table();
 		}
 	},
 	enabled: function(frm) {
@@ -173,18 +182,18 @@ frappe.ui.form.on('User', {
 						"awaiting_password": 1,
 						"enable_incoming": 1
 					};
-					frappe.model.with_doctype("Email Account", function (doc) {
+					frappe.model.with_doctype("Email Account", function(doc) {
 						var doc = frappe.model.get_new_doc("Email Account");
 						frappe.route_flags.linked_user = frm.doc.name;
 						frappe.route_flags.delete_user_from_locals = true;
 						frappe.set_route("Form", "Email Account", doc.name);
-					})
+					});
 				} else {
 					frappe.route_flags.create_user_account = frm.doc.name;
 					frappe.set_route("Form", "Email Account", r.message[0]["name"]);
 				}
 			}
-		})
+		});
 	},
 	generate_keys: function(frm){
 		frappe.call({
@@ -197,9 +206,9 @@ frappe.ui.form.on('User', {
 					frappe.msgprint(__("Save API Secret: ") + r.message.api_secret);
 				}
 			}
-		})
+		});
 	}
-})
+});
 
 function has_access_to_edit_user() {
 	return has_common(frappe.user_roles, get_roles_for_editing_user());
@@ -239,10 +248,14 @@ frappe.ModuleEditor = Class.extend({
 			var module = $(this).attr('data-module');
 			if($(this).prop("checked")) {
 				// remove from block_modules
-				me.frm.doc.block_modules = $.map(me.frm.doc.block_modules || [], function(d) { if(d.module != module){ return d } });
+				me.frm.doc.block_modules = $.map(me.frm.doc.block_modules || [], function(d) {
+					if(d.module != module){
+						return d;
+					}
+				});
 			} else {
 				me.frm.add_child("block_modules", {"module": module});
 			}
 		});
 	}
-})
+});
diff --git a/frappe/core/doctype/user/user.json b/frappe/core/doctype/user/user.json
index e96cdf6f36..c565aa562a 100644
--- a/frappe/core/doctype/user/user.json
+++ b/frappe/core/doctype/user/user.json
@@ -21,6 +21,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "sb0_5",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -53,6 +54,7 @@
    "collapsible": 0,
    "columns": 0,
    "default": "1",
+   "fetch_if_empty": 0,
    "fieldname": "enabled",
    "fieldtype": "Check",
    "hidden": 0,
@@ -87,6 +89,7 @@
    "collapsible": 0,
    "columns": 0,
    "depends_on": "enabled",
+   "fetch_if_empty": 0,
    "fieldname": "section_break_3",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -118,6 +121,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "email",
    "fieldtype": "Data",
    "hidden": 0,
@@ -152,6 +156,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "first_name",
    "fieldtype": "Data",
    "hidden": 0,
@@ -185,6 +190,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "middle_name",
    "fieldtype": "Data",
    "hidden": 0,
@@ -218,6 +224,7 @@
    "bold": 1,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "last_name",
    "fieldtype": "Data",
    "hidden": 0,
@@ -251,6 +258,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "full_name",
    "fieldtype": "Data",
    "hidden": 0,
@@ -285,6 +293,7 @@
    "columns": 0,
    "default": "1",
    "depends_on": "eval:doc.__islocal",
+   "fetch_if_empty": 0,
    "fieldname": "send_welcome_email",
    "fieldtype": "Check",
    "hidden": 0,
@@ -317,6 +326,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "unsubscribed",
    "fieldtype": "Check",
    "hidden": 1,
@@ -348,6 +358,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "column_break0",
    "fieldtype": "Column Break",
    "hidden": 0,
@@ -381,6 +392,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "username",
    "fieldtype": "Data",
    "hidden": 0,
@@ -414,6 +426,7 @@
    "collapsible": 0,
    "columns": 0,
    "description": "",
+   "fetch_if_empty": 0,
    "fieldname": "language",
    "fieldtype": "Link",
    "hidden": 0,
@@ -447,6 +460,7 @@
    "collapsible": 0,
    "columns": 0,
    "description": "",
+   "fetch_if_empty": 0,
    "fieldname": "time_zone",
    "fieldtype": "Select",
    "hidden": 0,
@@ -479,6 +493,7 @@
    "collapsible": 0,
    "columns": 0,
    "description": "Get your globally recognized avatar from Gravatar.com",
+   "fetch_if_empty": 0,
    "fieldname": "user_image",
    "fieldtype": "Attach Image",
    "hidden": 1,
@@ -512,6 +527,7 @@
    "columns": 0,
    "depends_on": "enabled",
    "description": "",
+   "fetch_if_empty": 0,
    "fieldname": "sb1",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -543,6 +559,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "role_profile_name",
    "fieldtype": "Link",
    "hidden": 0,
@@ -576,6 +593,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "roles_html",
    "fieldtype": "HTML",
    "hidden": 0,
@@ -607,6 +625,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "roles",
    "fieldtype": "Table",
    "hidden": 1,
@@ -641,6 +660,7 @@
    "collapsible": 1,
    "columns": 0,
    "depends_on": "enabled",
+   "fetch_if_empty": 0,
    "fieldname": "short_bio",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -672,6 +692,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "gender",
    "fieldtype": "Link",
    "hidden": 0,
@@ -706,6 +727,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "phone",
    "fieldtype": "Data",
    "hidden": 0,
@@ -738,6 +760,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "mobile_no",
    "fieldtype": "Data",
    "hidden": 0,
@@ -770,6 +793,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "birth_date",
    "fieldtype": "Date",
    "hidden": 0,
@@ -803,6 +827,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "location",
    "fieldtype": "Data",
    "hidden": 0,
@@ -834,6 +859,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "banner_image",
    "fieldtype": "Attach Image",
    "hidden": 0,
@@ -866,6 +892,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "column_break_22",
    "fieldtype": "Column Break",
    "hidden": 0,
@@ -896,6 +923,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "interest",
    "fieldtype": "Small Text",
    "hidden": 0,
@@ -928,6 +956,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "bio",
    "fieldtype": "Small Text",
    "hidden": 0,
@@ -959,6 +988,40 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "energy_points",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Energy Points",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "mute_sounds",
    "fieldtype": "Check",
    "hidden": 0,
@@ -992,6 +1055,7 @@
    "collapsible": 1,
    "columns": 0,
    "depends_on": "eval:doc.enabled && (!doc.__islocal || !cint(doc.send_welcome_email))",
+   "fetch_if_empty": 0,
    "fieldname": "change_password",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -1023,6 +1087,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "new_password",
    "fieldtype": "Password",
    "hidden": 0,
@@ -1055,6 +1120,7 @@
    "collapsible": 0,
    "columns": 0,
    "depends_on": "eval:!doc.__islocal",
+   "fetch_if_empty": 0,
    "fieldname": "send_password_update_notification",
    "fieldtype": "Check",
    "hidden": 0,
@@ -1088,6 +1154,7 @@
    "collapsible": 0,
    "columns": 0,
    "default": "0",
+   "fetch_if_empty": 0,
    "fieldname": "logout_all_sessions",
    "fieldtype": "Check",
    "hidden": 0,
@@ -1120,6 +1187,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "reset_password_key",
    "fieldtype": "Data",
    "hidden": 1,
@@ -1151,6 +1219,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "redirect_url",
    "fieldtype": "Small Text",
    "hidden": 1,
@@ -1184,6 +1253,7 @@
    "collapsible": 1,
    "columns": 0,
    "depends_on": "",
+   "fetch_if_empty": 0,
    "fieldname": "document_follow_notifications_section",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -1216,6 +1286,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "document_follow_notify",
    "fieldtype": "Check",
    "hidden": 0,
@@ -1251,6 +1322,7 @@
    "columns": 0,
    "default": "Daily",
    "depends_on": "eval:(doc.document_follow_notify== 1)",
+   "fetch_if_empty": 0,
    "fieldname": "document_follow_frequency",
    "fieldtype": "Select",
    "hidden": 0,
@@ -1285,6 +1357,7 @@
    "collapsible": 1,
    "columns": 0,
    "depends_on": "enabled",
+   "fetch_if_empty": 0,
    "fieldname": "email_settings",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -1318,6 +1391,7 @@
    "collapsible": 0,
    "columns": 0,
    "default": "1",
+   "fetch_if_empty": 0,
    "fieldname": "thread_notify",
    "fieldtype": "Check",
    "hidden": 0,
@@ -1350,6 +1424,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "send_me_a_copy",
    "fieldtype": "Check",
    "hidden": 0,
@@ -1383,6 +1458,7 @@
    "collapsible": 0,
    "columns": 0,
    "default": "1",
+   "fetch_if_empty": 0,
    "fieldname": "allowed_in_mentions",
    "fieldtype": "Check",
    "hidden": 0,
@@ -1415,6 +1491,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "email_signature",
    "fieldtype": "Small Text",
    "hidden": 0,
@@ -1446,6 +1523,7 @@
    "bold": 0,
    "collapsible": 1,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "email_inbox",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -1479,6 +1557,7 @@
    "collapsible": 0,
    "columns": 0,
    "description": "",
+   "fetch_if_empty": 0,
    "fieldname": "user_emails",
    "fieldtype": "Table",
    "hidden": 0,
@@ -1513,6 +1592,7 @@
    "collapsible": 1,
    "columns": 0,
    "depends_on": "enabled",
+   "fetch_if_empty": 0,
    "fieldname": "background",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -1545,6 +1625,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "background_image",
    "fieldtype": "Attach",
    "hidden": 0,
@@ -1577,6 +1658,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "background_style",
    "fieldtype": "Select",
    "hidden": 0,
@@ -1612,6 +1694,7 @@
    "columns": 0,
    "default": "",
    "description": "",
+   "fetch_if_empty": 0,
    "fieldname": "sb_allow_modules",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -1644,6 +1727,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "modules_html",
    "fieldtype": "HTML",
    "hidden": 0,
@@ -1676,6 +1760,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "block_modules",
    "fieldtype": "Table",
    "hidden": 1,
@@ -1710,6 +1795,7 @@
    "collapsible": 0,
    "columns": 0,
    "default": "",
+   "fetch_if_empty": 0,
    "fieldname": "home_settings",
    "fieldtype": "Code",
    "hidden": 0,
@@ -1743,6 +1829,7 @@
    "collapsible": 0,
    "columns": 0,
    "description": "These values will be automatically updated in transactions and also will be useful to restrict permissions for this user on transactions containing these values.",
+   "fetch_if_empty": 0,
    "fieldname": "sb2",
    "fieldtype": "Section Break",
    "hidden": 1,
@@ -1778,6 +1865,7 @@
    "collapsible": 0,
    "columns": 0,
    "description": "Enter default value fields (keys) and values. If you add multiple values for a field, the first one will be picked. These defaults are also used to set \"match\" permission rules. To see list of fields, go to \"Customize Form\".",
+   "fetch_if_empty": 0,
    "fieldname": "defaults",
    "fieldtype": "Table",
    "hidden": 1,
@@ -1811,6 +1899,7 @@
    "collapsible": 1,
    "columns": 0,
    "depends_on": "enabled",
+   "fetch_if_empty": 0,
    "fieldname": "sb3",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -1844,6 +1933,7 @@
    "collapsible": 0,
    "columns": 0,
    "default": "1",
+   "fetch_if_empty": 0,
    "fieldname": "simultaneous_sessions",
    "fieldtype": "Int",
    "hidden": 0,
@@ -1878,6 +1968,7 @@
    "columns": 0,
    "default": "System User",
    "description": "If the user has any role checked, then the user becomes a \"System User\". \"System User\" has access to the desktop",
+   "fetch_if_empty": 0,
    "fieldname": "user_type",
    "fieldtype": "Select",
    "hidden": 0,
@@ -1913,6 +2004,7 @@
    "collapsible": 0,
    "columns": 0,
    "description": "Allow user to login only after this hour (0-24)",
+   "fetch_if_empty": 0,
    "fieldname": "login_after",
    "fieldtype": "Int",
    "hidden": 0,
@@ -1945,6 +2037,7 @@
    "collapsible": 0,
    "columns": 0,
    "description": "Allow user to login only before this hour (0-24)",
+   "fetch_if_empty": 0,
    "fieldname": "login_before",
    "fieldtype": "Int",
    "hidden": 0,
@@ -1977,6 +2070,7 @@
    "collapsible": 0,
    "columns": 0,
    "description": "Restrict user from this IP address only. Multiple IP addresses can be added by separating with commas. Also accepts partial IP addresses like (111.111.111)",
+   "fetch_if_empty": 0,
    "fieldname": "restrict_ip",
    "fieldtype": "Data",
    "hidden": 0,
@@ -2010,6 +2104,7 @@
    "columns": 0,
    "depends_on": "eval:doc.restrict_ip && doc.restrict_ip.length",
    "description": "If enabled,  user can login from any IP Address using Two Factor Auth, this can also be set for all users in System Settings",
+   "fetch_if_empty": 0,
    "fieldname": "bypass_restrict_ip_check_if_2fa_enabled",
    "fieldtype": "Check",
    "hidden": 0,
@@ -2042,6 +2137,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "column_break1",
    "fieldtype": "Column Break",
    "hidden": 0,
@@ -2075,6 +2171,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "last_login",
    "fieldtype": "Read Only",
    "hidden": 0,
@@ -2108,6 +2205,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "last_ip",
    "fieldtype": "Read Only",
    "hidden": 0,
@@ -2141,6 +2239,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "last_active",
    "fieldtype": "Datetime",
    "hidden": 0,
@@ -2174,6 +2273,7 @@
    "collapsible": 0,
    "columns": 0,
    "description": "Stores the JSON of last known versions of various installed apps. It is used to show release notes.",
+   "fetch_if_empty": 0,
    "fieldname": "last_known_versions",
    "fieldtype": "Text",
    "hidden": 1,
@@ -2207,6 +2307,7 @@
    "collapsible": 1,
    "columns": 0,
    "depends_on": "enabled",
+   "fetch_if_empty": 0,
    "fieldname": "third_party_authentication",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -2238,6 +2339,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "social_logins",
    "fieldtype": "Table",
    "hidden": 0,
@@ -2271,6 +2373,7 @@
    "bold": 0,
    "collapsible": 1,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "api_access",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -2304,6 +2407,7 @@
    "collapsible": 0,
    "columns": 0,
    "description": "API Key cannot be  regenerated",
+   "fetch_if_empty": 0,
    "fieldname": "api_key",
    "fieldtype": "Data",
    "hidden": 0,
@@ -2336,6 +2440,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "generate_keys",
    "fieldtype": "Button",
    "hidden": 0,
@@ -2368,6 +2473,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "column_break_65",
    "fieldtype": "Column Break",
    "hidden": 0,
@@ -2399,6 +2505,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "api_secret",
    "fieldtype": "Password",
    "hidden": 0,
@@ -2437,7 +2544,8 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 5,
- "modified": "2019-03-03 11:10:06.162541",
+ "menu_index": 0,
+ "modified": "2019-03-19 10:52:33.592908",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "User",
diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index 17b88ffe13..9d0ea7436d 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -1082,4 +1082,4 @@ def generate_keys(user):
 		user_details.save()
 
 		return {"api_secret": api_secret}
-	frappe.throw(frappe._("Not Permitted"), frappe.PermissionError)
+	frappe.throw(frappe._("Not Permitted"), frappe.PermissionError)
\ No newline at end of file
diff --git a/frappe/core/page/energy_point_history/__init__.py b/frappe/core/page/energy_point_history/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/core/page/energy_point_history/energy_point_history.js b/frappe/core/page/energy_point_history/energy_point_history.js
new file mode 100644
index 0000000000..cb53cef9e4
--- /dev/null
+++ b/frappe/core/page/energy_point_history/energy_point_history.js
@@ -0,0 +1,19 @@
+frappe.pages['energy-point-history'].on_page_load = function(wrapper) {
+	const page = frappe.ui.make_app_page({
+		parent: wrapper,
+		title: 'Transaction',
+		single_column: true,
+		btn_primary: console.log
+
+	});
+	console.log(page);
+	frappe.db.get_list('Energy Point Log', {
+		filters: { user: frappe.session.user },
+		fields: ['point', 'reason']
+	})
+	.then((data) => {
+		console.log(data);
+		$(frappe.render_template('energy_point_transactions', {data: data}))
+			.appendTo(page.body);
+	})
+}
\ No newline at end of file
diff --git a/frappe/core/page/energy_point_history/energy_point_history.json b/frappe/core/page/energy_point_history/energy_point_history.json
new file mode 100644
index 0000000000..350feba8f4
--- /dev/null
+++ b/frappe/core/page/energy_point_history/energy_point_history.json
@@ -0,0 +1,18 @@
+{
+ "content": null,
+ "creation": "2018-08-06 12:43:28.480030",
+ "docstatus": 0,
+ "doctype": "Page",
+ "idx": 0,
+ "modified": "2018-08-06 12:43:28.480030",
+ "modified_by": "Administrator",
+ "module": "Core",
+ "name": "energy-point-history",
+ "owner": "Administrator",
+ "page_name": "Energy Point History",
+ "roles": [],
+ "script": null,
+ "standard": "Yes",
+ "style": null,
+ "system_page": 1
+}
\ No newline at end of file
diff --git a/frappe/core/page/energy_point_history/energy_point_transactions.html b/frappe/core/page/energy_point_history/energy_point_transactions.html
new file mode 100644
index 0000000000..90466ce8b8
--- /dev/null
+++ b/frappe/core/page/energy_point_history/energy_point_transactions.html
@@ -0,0 +1,10 @@
+<div style="padding: 20px;">
+    <ul class="list-group">
+    {% for d in data %}
+        <li class="list-item">
+            <span class="text-success mr-2">{{d.point}}</span>
+            <span class="text-muted">{{d.reason}}</span>
+        </li>
+    {% endfor %}
+    </ul>
+</div>
\ No newline at end of file
diff --git a/frappe/hooks.py b/frappe/hooks.py
index 6301c51f6a..0ef32601b4 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -130,12 +130,15 @@ doc_events = {
 		],
 		"on_change": [
 			"frappe.core.doctype.feedback_trigger.feedback_trigger.trigger_feedback_request",
+			"frappe.social.doctype.energy_point_log.energy_point_log.update_log"
 		]
 	},
 	"Email Group Member": {
 		"validate": "frappe.email.doctype.email_group.email_group.restrict_email_group"
 	},
-
+	"Energy Point Log": {
+		"after_insert": "frappe.social.doctype.energy_point_log.energy_point_log.update_user_energy_points"
+	},
 }
 
 scheduler_events = {
diff --git a/frappe/integrations/github_event_handler.py b/frappe/integrations/github_event_handler.py
new file mode 100644
index 0000000000..052ccecdf8
--- /dev/null
+++ b/frappe/integrations/github_event_handler.py
@@ -0,0 +1,81 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# MIT License. See license.txt
+
+from __future__ import unicode_literals
+import json
+import frappe
+import frappe.utils
+from frappe.social.doctype.energy_point_log.energy_point_log import ENERGY_POINT_VALUES, create_energy_point_log
+
+
+@frappe.whitelist(allow_guest=True)
+def handle_event(*args, **kwargs):
+	r = frappe.request
+	event_type = r.headers.get('X-Github-Event')
+	payload = json.loads(r.get_data())
+	if event_type == 'pull_request':
+		process_pull_request(payload)
+	if event_type == 'pull_request_review':
+		process_pull_request(payload)
+	elif event_type == 'issues':
+		process_issues(payload)
+	return True
+
+def process_pull_request(payload):
+	action = payload.get('action')
+	data = payload.get('pull_request')
+	user_github_id = data['user']['login']
+	if not is_local_user(user_github_id): return
+	if action == 'closed' and data['merged']:
+		process_merged_pull_request(data)
+	if action == 'submitted':
+		process_pull_request_review(data)
+
+def process_issues(payload):
+	action = payload.get('action')
+	data = payload.get('issue')
+	user_github_id = data['user']['login']
+	if not is_local_user(user_github_id): return
+	if action == 'opened':
+		create_energy_point_log(
+			ENERGY_POINT_VALUES['github_issue_open'],
+			'Opened Issue: {}'.format(data['title']),
+			None,
+			None,
+			get_user_name(data['user']['login'])
+		)
+	if action == 'closed':
+		create_energy_point_log(
+			ENERGY_POINT_VALUES['github_issue_close'],
+			'Closed Issue: {}'.format(data['title']),
+			None,
+			None,
+			get_user_name(data['user']['login'])
+		)
+
+def process_merged_pull_request(data):
+	create_energy_point_log(
+		ENERGY_POINT_VALUES['github_pull_request_merge'],
+		'Pull Request Merged: {}'.format(data['title']),
+		None,
+		None,
+		get_user_name(data['user']['login'])
+	)
+
+def process_pull_request_review(data):
+	create_energy_point_log(
+		ENERGY_POINT_VALUES['github_pull_request_review_submit'],
+		'Reviewed Pull Request: {}'.format(data['title']),
+		None,
+		None,
+		get_user_name(data['user']['login'])
+	)
+
+
+def is_local_user(github_id):
+	return frappe.db.count('Social Profile', {'github_id': github_id})
+
+def get_user_name(github_id):
+	return frappe.get_value('Social Profile', filters={
+		'github_id': github_id
+	}, fieldname='name')
diff --git a/frappe/modules.txt b/frappe/modules.txt
index 3a9ea8f05e..6505174327 100644
--- a/frappe/modules.txt
+++ b/frappe/modules.txt
@@ -11,4 +11,4 @@ Contacts
 Data Migration
 Chat
 Social
-Automation
\ No newline at end of file
+Automation
diff --git a/frappe/public/build.json b/frappe/public/build.json
index 73a9fae189..f2285fd4aa 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -264,8 +264,8 @@
 		"public/less/form_grid.less"
 	],
 	"js/form.min.js": [
-		"public/js/frappe/form/templates/print_layout.html",
 		"public/js/frappe/form/document_follow.js",
+		"public/js/frappe/form/templates/print_layout.html",
 		"public/js/frappe/form/templates/users_in_sidebar.html",
 		"public/js/frappe/form/templates/set_sharing.html",
 		"public/js/frappe/form/templates/form_sidebar.html",
diff --git a/frappe/public/js/frappe/misc/user.js b/frappe/public/js/frappe/misc/user.js
index 15e91a82c5..311f208750 100644
--- a/frappe/public/js/frappe/misc/user.js
+++ b/frappe/public/js/frappe/misc/user.js
@@ -9,7 +9,7 @@ frappe.user_info = function(uid) {
 			fullname: __("Bot"),
 			image: "/assets/frappe/images/ui/bot.png",
 			abbr: "B"
-		}
+		};
 	}
 
 	if(!(frappe.boot.user_info && frappe.boot.user_info[uid])) {
@@ -24,7 +24,7 @@ frappe.user_info = function(uid) {
 	user_info.color = frappe.get_palette(user_info.fullname);
 
 	return user_info;
-}
+};
 
 frappe.ui.set_user_background = function(src, selector, style) {
 	if(!selector) selector = "#page-desktop";
@@ -47,7 +47,7 @@ frappe.ui.set_user_background = function(src, selector, style) {
 		background:background,
 		style: style==="Fill Screen" ? "background-size: cover;" : ""
 	}));
-}
+};
 
 frappe.provide('frappe.user');
 
diff --git a/frappe/public/js/frappe/ui/toolbar/navbar.html b/frappe/public/js/frappe/ui/toolbar/navbar.html
index ea6691a7a3..0f7df81088 100644
--- a/frappe/public/js/frappe/ui/toolbar/navbar.html
+++ b/frappe/public/js/frappe/ui/toolbar/navbar.html
@@ -20,15 +20,17 @@
 				<a class="dropdown-toggle" data-toggle="dropdown" href="#"
 					onclick="return false;">
 				{{ avatar }}
-                <span class="ellipsis toolbar-user-fullname hidden-xs hidden-sm">
+				<span class="ellipsis toolbar-user-fullname hidden-xs hidden-sm">
 					{%= frappe.user.full_name() %}</span>
-                <b class="caret hidden-xs hidden-sm"></b></a>
+				<span class="ellipsis toolbar-user-fullname hidden-xs hidden-sm primary">
+					({%= frappe.user_info().energy_points %} pts)</span>
+				<b class="caret hidden-xs hidden-sm"></b></a>
 				<ul class="dropdown-menu" id="toolbar-user" role="menu">
 					<li><a href="#Form/User/{%= encodeURIComponent(frappe.session.user) %}">
-					    {%= __("My Settings") %}</a></li>
+						{%= __("My Settings") %}</a></li>
 					<li class="navbar-reload">
 						<a href="#" onclick="return frappe.ui.toolbar.clear_cache();">
-					    {%= __("Reload") %}</a></li>
+						{%= __("Reload") %}</a></li>
 					<li><a href="/index" target="_blank" rel="noopener noreferrer">
 						{%= __("View Website") %}</a></li>
 					<li><a href="#background_jobs">
@@ -86,13 +88,13 @@
 		</div>
 
 		<div class="hidden-xs">
-	        <form class="navbar-form navbar-right" role="search" onsubmit="return false;">
-	          <div class="form-group form-group-sm ui-front">
-	            <input id="navbar-search" type="text" class="form-control"
+			<form class="navbar-form navbar-right" role="search" onsubmit="return false;">
+			  <div class="form-group form-group-sm ui-front">
+				<input id="navbar-search" type="text" class="form-control"
 					placeholder="{%= __("Search or type a command") %} {%= __("(Ctrl + G)") %}" aria-haspopup="true">
 				<span class="octicon octicon-search navbar-search-icon"></span>
-	          </div>
-	        </form>
+			  </div>
+			</form>
 		</div>
 	</div>
 </div>
diff --git a/frappe/public/less/avatar.less b/frappe/public/less/avatar.less
index a3e4925bd0..23c168dac6 100644
--- a/frappe/public/less/avatar.less
+++ b/frappe/public/less/avatar.less
@@ -69,7 +69,7 @@
 	height: 108px;
 
 	.standard-image {
-		font-size: 72px;
+		font-size: 36px;
 	}
 }
 
diff --git a/frappe/public/less/common.less b/frappe/public/less/common.less
index ffc0a25f3d..1e6ff48746 100644
--- a/frappe/public/less/common.less
+++ b/frappe/public/less/common.less
@@ -145,7 +145,7 @@ a.badge-hover& {
 	max-width: 400px;
 
 	.modal-content {
-		min-height: 140px;
+		min-height: 110px;
 	}
 }
 
@@ -317,6 +317,10 @@ a.no-decoration& {
 	font-size: @text-small;
 }
 
+.text-large {
+	font-size: @text-large;
+}
+
 .disable-click {
 	pointer-events: none;
 }
diff --git a/frappe/public/less/flex.less b/frappe/public/less/flex.less
index 598e6fb0b0..ed5eee1951 100644
--- a/frappe/public/less/flex.less
+++ b/frappe/public/less/flex.less
@@ -72,3 +72,7 @@
     flex-shrink: 0;
     justify-content: center;
 }
+
+.fill-width {
+    flex: 1
+}
\ No newline at end of file
diff --git a/frappe/public/less/social.less b/frappe/public/less/social.less
index eb531ab06d..be9d18faf6 100644
--- a/frappe/public/less/social.less
+++ b/frappe/public/less/social.less
@@ -152,4 +152,4 @@ body[data-route*="social/profile"] {
 	.page-head {
 		display: none;
 	}
-}
\ No newline at end of file
+}
diff --git a/frappe/public/less/variables.less b/frappe/public/less/variables.less
index 5474a38411..3a49f2ffb5 100644
--- a/frappe/public/less/variables.less
+++ b/frappe/public/less/variables.less
@@ -15,6 +15,7 @@
 @light-yellow:			#fffce7;
 @extra-light-yellow:		#fffdf4;
 @text-extra-muted:		@border-color;
+@text-large:			16px;
 @text-regular:			14px;
 @text-medium:			12px;
 @text-small:			10px;
diff --git a/frappe/social/doctype/badge/__init__.py b/frappe/social/doctype/badge/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/social/doctype/badge/badge.js b/frappe/social/doctype/badge/badge.js
new file mode 100644
index 0000000000..eb736fd370
--- /dev/null
+++ b/frappe/social/doctype/badge/badge.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Badge', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/frappe/social/doctype/badge/badge.json b/frappe/social/doctype/badge/badge.json
new file mode 100644
index 0000000000..e698babd8f
--- /dev/null
+++ b/frappe/social/doctype/badge/badge.json
@@ -0,0 +1,191 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "autoname": "field:badge_name",
+ "beta": 0,
+ "creation": "2018-09-07 12:33:22.027439",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "badge_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Badge Name",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 1
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "description",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Badge Description",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "track_counter_type",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Track Counter Type",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "count",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Count",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2018-09-12 13:29:44.696578",
+ "modified_by": "Administrator",
+ "module": "Social",
+ "name": "Badge",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
+   "write": 1
+  }
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 0,
+ "track_seen": 0,
+ "track_views": 0
+}
\ No newline at end of file
diff --git a/frappe/social/doctype/badge/badge.py b/frappe/social/doctype/badge/badge.py
new file mode 100644
index 0000000000..f40cf51d82
--- /dev/null
+++ b/frappe/social/doctype/badge/badge.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class Badge(Document):
+	pass
diff --git a/frappe/social/doctype/energy_point_log/__init__.py b/frappe/social/doctype/energy_point_log/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.js b/frappe/social/doctype/energy_point_log/energy_point_log.js
new file mode 100644
index 0000000000..5b6bd9ab7d
--- /dev/null
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Energy Point Log', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.json b/frappe/social/doctype/energy_point_log/energy_point_log.json
new file mode 100644
index 0000000000..934d49f169
--- /dev/null
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.json
@@ -0,0 +1,226 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2018-06-21 14:58:55.913619",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "user",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "User",
+   "length": 0,
+   "no_copy": 0,
+   "options": "User",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "reason",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Reason",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "points",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Points",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "reference_doctype",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Reference Doctype",
+   "length": 0,
+   "no_copy": 0,
+   "options": "DocType",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "reference_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Reference Name",
+   "length": 0,
+   "no_copy": 0,
+   "options": "",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2018-09-12 13:29:05.140511",
+ "modified_by": "Administrator",
+ "module": "Social",
+ "name": "Energy Point Log",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
+   "write": 1
+  }
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "user",
+ "track_changes": 0,
+ "track_seen": 0,
+ "track_views": 0
+}
\ No newline at end of file
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
new file mode 100644
index 0000000000..5d5b9e06ac
--- /dev/null
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe.utils import cint
+
+ENERGY_POINT_VALUES = {
+	'issue_closed': 2,
+	'instant_reply_on_issue': 2,
+	'feedback_point_multiplier': 2,
+	'github_pull_request_merge': 2,
+	'github_pull_request_review_submit': 2,
+	'github_issue_open': 1,
+	'github_issue_close': 2,
+}
+
+class EnergyPointLog(Document):
+	def after_insert(self):
+		update_user_energy_points(self.points, self.user)
+
+def update_log(doc, state):
+	if frappe.flags.in_patch: return
+	doc_action = doc.get('_action')
+	if not doc_action: return
+
+	if doc.is_new() and doc_action =="save":
+		event_type = "Create"
+	else:
+		event_type = get_event_type(doc_action)
+
+	point_rule = frappe.get_all('Energy Point Rule', filters={
+		'reference_doctype': doc.get('doctype'),
+		'event_type': event_type
+	}, fields=['point', 'rule_name'], limit=1)
+
+	if point_rule:
+		point_rule = point_rule[0]
+		print(point_rule)
+		if frappe.safe_eval(point_rule.condition or True, None, {'doc': doc}):
+			create_energy_point_log(
+				point_rule.point,
+				"Action {0} on {1}".format(point_rule.rule_name, doc.name),
+				doc.doctype,
+				doc.name
+			)
+
+def get_event_type(state):
+	return state.capitalize()
+
+def create_energy_point_log(points, reason, reference_doctype, reference_name, user=None):
+	print('===================in=========', user, points)
+	if not user:
+		user = frappe.session.user
+
+	if user == 'admin@example.com':
+		user = 'Administrator'
+	frappe.get_doc({
+		'doctype': 'Energy Point Log',
+		'points': points,
+		'user': user,
+		'reason': reason,
+		'reference_doctype': reference_doctype,
+		'reference_name': reference_name
+	}).insert(ignore_permissions=True)
+
+def update_user_energy_points(point, user=None):
+	point = cint(point)
+	if not point: return
+	# TODO: find alternative
+	if user == 'admin@erpnext.com': user = 'Administrator'
+	if not user: user = frappe.session.user
+	previous_point = frappe.db.get_value('User', user, 'energy_point')
+	new_point = cint(previous_point) + point
+	frappe.db.set_value('User', user, 'energy_point', new_point)
+
+	print('================= {} gained {} points ==================='.format(user, point))
\ No newline at end of file
diff --git a/frappe/social/doctype/energy_point_rule/__init__.py b/frappe/social/doctype/energy_point_rule/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.js b/frappe/social/doctype/energy_point_rule/energy_point_rule.js
new file mode 100644
index 0000000000..b315dc75ae
--- /dev/null
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Energy Point Rule', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.json b/frappe/social/doctype/energy_point_rule/energy_point_rule.json
new file mode 100644
index 0000000000..11a57ab2e7
--- /dev/null
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.json
@@ -0,0 +1,226 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "autoname": "field:rule_name",
+ "beta": 0,
+ "creation": "2018-06-20 10:08:36.275253",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "rule_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Rule Name",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 1
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "reference_doctype",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Reference Doctype",
+   "length": 0,
+   "no_copy": 0,
+   "options": "DocType",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "event_type",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Event Type",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Submit\nDelete\nCreate",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "If the condition is satisfied user will be rewarded with the points\n",
+   "fieldname": "condition",
+   "fieldtype": "Code",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Condition",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "point",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Point",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2018-09-12 13:30:24.368369",
+ "modified_by": "Administrator",
+ "module": "Social",
+ "name": "Energy Point Rule",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0,
+ "track_views": 0
+}
\ No newline at end of file
diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
new file mode 100644
index 0000000000..975fe16505
--- /dev/null
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class EnergyPointRule(Document):
+	pass
diff --git a/frappe/social/doctype/post/post.json b/frappe/social/doctype/post/post.json
index 827c23ca98..af70ce0793 100644
--- a/frappe/social/doctype/post/post.json
+++ b/frappe/social/doctype/post/post.json
@@ -1,343 +1,343 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2018-09-25 11:39:04.533626", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "allow_copy": 0,
+ "allow_events_in_timeline": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2018-09-25 11:39:04.533626",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "content", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Content", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "content",
+   "fieldtype": "Text Editor",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Content",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "comments", 
-   "fieldtype": "Table", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "comments", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Post Comment", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "comments",
+   "fieldtype": "Table",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "comments",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Post Comment",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "liked_by", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Liked By", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "liked_by",
+   "fieldtype": "Small Text",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Liked By",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "is_pinned", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Is Pinned", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 2, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "is_pinned",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Is Pinned",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 2,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "is_globally_pinned", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Is Globally Pinned", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 1, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "is_globally_pinned",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Is Globally Pinned",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 1,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2019-03-11 16:32:20.638805", 
- "modified_by": "Administrator", 
- "module": "Social", 
- "name": "Post", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2019-03-11 16:32:20.638805",
+ "modified_by": "Administrator",
+ "module": "Social",
+ "name": "Post",
+ "name_case": "",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "All", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 1,
+   "export": 1,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "All",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 1, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "All", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 1,
+   "export": 1,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "All",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 1, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 1, 
-   "import": 0, 
-   "permlevel": 2, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 1,
+   "export": 1,
+   "if_owner": 1,
+   "import": 0,
+   "permlevel": 2,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 2, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "All", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 1,
+   "export": 1,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 2,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "All",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 1, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "All", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "if_owner": 1,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "All",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
    "write": 1
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0, 
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0,
  "track_views": 1
 }
\ No newline at end of file
diff --git a/frappe/social/doctype/post/post.py b/frappe/social/doctype/post/post.py
index d0885cc0ee..9c7c1db1d4 100644
--- a/frappe/social/doctype/post/post.py
+++ b/frappe/social/doctype/post/post.py
@@ -102,4 +102,4 @@ def set_seen(post_name):
 		'reference_doctype': 'Post',
 		'reference_name': post_name,
 		'viewed_by': frappe.session.user
-	}).insert(ignore_permissions=True)
\ No newline at end of file
+	}).insert(ignore_permissions=True)
diff --git a/frappe/social/doctype/user_badge/__init__.py b/frappe/social/doctype/user_badge/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/social/doctype/user_badge/user_badge.json b/frappe/social/doctype/user_badge/user_badge.json
new file mode 100644
index 0000000000..57fddc29be
--- /dev/null
+++ b/frappe/social/doctype/user_badge/user_badge.json
@@ -0,0 +1,108 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2018-09-07 12:33:29.975737",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "badge",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Badge",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Badge",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "badge_description",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Badge Description",
+   "length": 0,
+   "no_copy": 0,
+   "options": "badge.description",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "max_attachments": 0,
+ "modified": "2018-09-12 13:29:31.372604",
+ "modified_by": "Administrator",
+ "module": "Social",
+ "name": "User Badge",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0,
+ "track_views": 0
+}
\ No newline at end of file
diff --git a/frappe/social/doctype/user_badge/user_badge.py b/frappe/social/doctype/user_badge/user_badge.py
new file mode 100644
index 0000000000..03fe73fc35
--- /dev/null
+++ b/frappe/social/doctype/user_badge/user_badge.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class UserBadge(Document):
+	pass
diff --git a/frappe/utils/user.py b/frappe/utils/user.py
index cd8cb35146..d37f34d400 100755
--- a/frappe/utils/user.py
+++ b/frappe/utils/user.py
@@ -197,7 +197,7 @@ class UserPermissions:
 
 	def load_user(self):
 		d = frappe.db.sql("""select email, first_name, last_name, creation,
-			email_signature, user_type, language, background_image, background_style,
+			email_signature, user_type, language, background_style,
 			mute_sounds, send_me_a_copy from tabUser where name = %s""", (self.name,), as_dict=1)[0]
 
 		if not self.can_read:

From 34021669431e27d028139dfa212cf7dc93bd5cea Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 19 Mar 2019 14:17:06 +0530
Subject: [PATCH 002/256] chore: Rename update_log method

- Add a field which was accidently removed
---
 frappe/hooks.py                                   |  2 +-
 .../doctype/energy_point_log/energy_point_log.py  | 15 +++++----------
 frappe/utils/user.py                              |  2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/frappe/hooks.py b/frappe/hooks.py
index 0ef32601b4..1939e7f0df 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -130,7 +130,7 @@ doc_events = {
 		],
 		"on_change": [
 			"frappe.core.doctype.feedback_trigger.feedback_trigger.trigger_feedback_request",
-			"frappe.social.doctype.energy_point_log.energy_point_log.update_log"
+			"frappe.social.doctype.energy_point_log.energy_point_log.process_for_energy_points"
 		]
 	},
 	"Email Group Member": {
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index 5d5b9e06ac..07e2ed26cd 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -21,30 +21,25 @@ class EnergyPointLog(Document):
 	def after_insert(self):
 		update_user_energy_points(self.points, self.user)
 
-def update_log(doc, state):
+def process_for_energy_points(doc, state):
 	if frappe.flags.in_patch: return
 	doc_action = doc.get('_action')
 	if not doc_action: return
 
-	if doc.is_new() and doc_action =="save":
-		event_type = "Create"
-	else:
-		event_type = get_event_type(doc_action)
-
 	point_rule = frappe.get_all('Energy Point Rule', filters={
 		'reference_doctype': doc.get('doctype'),
-		'event_type': event_type
-	}, fields=['point', 'rule_name'], limit=1)
+	}, fields=['points', 'rule_name'], limit=1)
 
 	if point_rule:
 		point_rule = point_rule[0]
 		print(point_rule)
 		if frappe.safe_eval(point_rule.condition or True, None, {'doc': doc}):
 			create_energy_point_log(
-				point_rule.point,
+				point_rule.points,
 				"Action {0} on {1}".format(point_rule.rule_name, doc.name),
 				doc.doctype,
-				doc.name
+				doc.name,
+				doc.get(point_rule.user_field)
 			)
 
 def get_event_type(state):
diff --git a/frappe/utils/user.py b/frappe/utils/user.py
index d37f34d400..ab05ef62f2 100755
--- a/frappe/utils/user.py
+++ b/frappe/utils/user.py
@@ -197,7 +197,7 @@ class UserPermissions:
 
 	def load_user(self):
 		d = frappe.db.sql("""select email, first_name, last_name, creation,
-			email_signature, user_type, language, background_style,
+			email_signature, user_type, language, background_style, background_image,
 			mute_sounds, send_me_a_copy from tabUser where name = %s""", (self.name,), as_dict=1)[0]
 
 		if not self.can_read:

From 7279d8bc59a88f5e792b4546b58fa84ce98a8027 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 19 Mar 2019 14:19:20 +0530
Subject: [PATCH 003/256] refactor: Energy Point Log and Energy Point Rule
 doctype

- Rename point -> points
- Rearrange fields
---
 .../energy_point_log/energy_point_log.json    |  99 ++++++++++++++--
 .../energy_point_rule/energy_point_rule.json  | 110 ++++++++++++------
 2 files changed, 161 insertions(+), 48 deletions(-)

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.json b/frappe/social/doctype/energy_point_log/energy_point_log.json
index 934d49f169..d62b4cb94d 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.json
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0,
+ "allow_events_in_timeline": 0,
  "allow_guest_to_view": 0,
  "allow_import": 0,
  "allow_rename": 0,
@@ -19,6 +20,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "user",
    "fieldtype": "Link",
    "hidden": 0,
@@ -52,8 +54,9 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fieldname": "reason",
-   "fieldtype": "Data",
+   "fetch_if_empty": 0,
+   "fieldname": "type",
+   "fieldtype": "Select",
    "hidden": 0,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
@@ -61,14 +64,15 @@
    "in_global_search": 0,
    "in_list_view": 0,
    "in_standard_filter": 0,
-   "label": "Reason",
+   "label": "Type",
    "length": 0,
    "no_copy": 0,
+   "options": "Auto\nAppreciation\nCriticism\nReview",
    "permlevel": 0,
    "precision": "",
    "print_hide": 0,
    "print_hide_if_no_value": 0,
-   "read_only": 1,
+   "read_only": 0,
    "remember_last_selected_value": 0,
    "report_hide": 0,
    "reqd": 0,
@@ -84,23 +88,25 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fieldname": "points",
-   "fieldtype": "Int",
+   "fetch_if_empty": 0,
+   "fieldname": "rule",
+   "fieldtype": "Link",
    "hidden": 0,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_filter": 0,
    "in_global_search": 0,
-   "in_list_view": 1,
+   "in_list_view": 0,
    "in_standard_filter": 0,
-   "label": "Points",
+   "label": "Rule",
    "length": 0,
    "no_copy": 0,
+   "options": "Energy Point Log",
    "permlevel": 0,
    "precision": "",
    "print_hide": 0,
    "print_hide_if_no_value": 0,
-   "read_only": 1,
+   "read_only": 0,
    "remember_last_selected_value": 0,
    "report_hide": 0,
    "reqd": 0,
@@ -116,6 +122,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "reference_doctype",
    "fieldtype": "Link",
    "hidden": 0,
@@ -149,6 +156,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "reference_name",
    "fieldtype": "Data",
    "hidden": 0,
@@ -174,6 +182,72 @@
    "set_only_once": 0,
    "translatable": 0,
    "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "points",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Points",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "reason",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Reason",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   }
  ],
  "has_web_view": 0,
@@ -181,12 +255,13 @@
  "hide_toolbar": 0,
  "idx": 0,
  "image_view": 0,
- "in_create": 0,
+ "in_create": 1,
  "is_submittable": 0,
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2018-09-12 13:29:05.140511",
+ "menu_index": 0,
+ "modified": "2019-03-19 13:18:50.623717",
  "modified_by": "Administrator",
  "module": "Social",
  "name": "Energy Point Log",
@@ -214,7 +289,7 @@
   }
  ],
  "quick_entry": 0,
- "read_only": 0,
+ "read_only": 1,
  "read_only_onload": 0,
  "show_name_in_global_search": 0,
  "sort_field": "modified",
diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.json b/frappe/social/doctype/energy_point_rule/energy_point_rule.json
index 11a57ab2e7..0cbbfe1ee9 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.json
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0,
+ "allow_events_in_timeline": 0,
  "allow_guest_to_view": 0,
  "allow_import": 0,
  "allow_rename": 0,
@@ -20,6 +21,40 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "enabled",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Enabled",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "rule_name",
    "fieldtype": "Data",
    "hidden": 0,
@@ -52,6 +87,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "reference_doctype",
    "fieldtype": "Link",
    "hidden": 0,
@@ -78,39 +114,6 @@
    "translatable": 0,
    "unique": 0
   },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "event_type",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Event Type",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Submit\nDelete\nCreate",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
   {
    "allow_bulk_edit": 0,
    "allow_in_quick_entry": 0,
@@ -119,6 +122,7 @@
    "collapsible": 0,
    "columns": 0,
    "description": "If the condition is satisfied user will be rewarded with the points\n",
+   "fetch_if_empty": 0,
    "fieldname": "condition",
    "fieldtype": "Code",
    "hidden": 0,
@@ -151,7 +155,8 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fieldname": "point",
+   "fetch_if_empty": 0,
+   "fieldname": "points",
    "fieldtype": "Int",
    "hidden": 0,
    "ignore_user_permissions": 0,
@@ -160,7 +165,40 @@
    "in_global_search": 0,
    "in_list_view": 0,
    "in_standard_filter": 0,
-   "label": "Point",
+   "label": "Points",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "user_field",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "User Field",
    "length": 0,
    "no_copy": 0,
    "permlevel": 0,
@@ -187,7 +225,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2018-09-12 13:30:24.368369",
+ "modified": "2019-03-19 13:06:12.668991",
  "modified_by": "Administrator",
  "module": "Social",
  "name": "Energy Point Rule",

From 5109edf00f5f3b3637b572880394626f67a6cd96 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 19 Mar 2019 14:20:18 +0530
Subject: [PATCH 004/256] feat: Add Energy Point Settings

---
 .../doctype/energy_point_settings/__init__.py |   0
 .../energy_point_settings.js                  |   8 ++
 .../energy_point_settings.json                | 130 ++++++++++++++++++
 .../energy_point_settings.py                  |  10 ++
 .../social/doctype/review_level/__init__.py   |   0
 .../doctype/review_level/review_level.js      |   8 ++
 .../doctype/review_level/review_level.json    | 129 +++++++++++++++++
 .../doctype/review_level/review_level.py      |  10 ++
 8 files changed, 295 insertions(+)
 create mode 100644 frappe/social/doctype/energy_point_settings/__init__.py
 create mode 100644 frappe/social/doctype/energy_point_settings/energy_point_settings.js
 create mode 100644 frappe/social/doctype/energy_point_settings/energy_point_settings.json
 create mode 100644 frappe/social/doctype/energy_point_settings/energy_point_settings.py
 create mode 100644 frappe/social/doctype/review_level/__init__.py
 create mode 100644 frappe/social/doctype/review_level/review_level.js
 create mode 100644 frappe/social/doctype/review_level/review_level.json
 create mode 100644 frappe/social/doctype/review_level/review_level.py

diff --git a/frappe/social/doctype/energy_point_settings/__init__.py b/frappe/social/doctype/energy_point_settings/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/social/doctype/energy_point_settings/energy_point_settings.js b/frappe/social/doctype/energy_point_settings/energy_point_settings.js
new file mode 100644
index 0000000000..26b53aa400
--- /dev/null
+++ b/frappe/social/doctype/energy_point_settings/energy_point_settings.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2019, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Energy Point Settings', {
+	// refresh: function(frm) {
+
+	// }
+});
diff --git a/frappe/social/doctype/energy_point_settings/energy_point_settings.json b/frappe/social/doctype/energy_point_settings/energy_point_settings.json
new file mode 100644
index 0000000000..e0cd11a7a9
--- /dev/null
+++ b/frappe/social/doctype/energy_point_settings/energy_point_settings.json
@@ -0,0 +1,130 @@
+{
+ "allow_copy": 0,
+ "allow_events_in_timeline": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2019-03-19 13:17:51.710241",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "enabled",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Enabled",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "review_levels",
+   "fieldtype": "Table",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Review Levels",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Review Level",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 1,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2019-03-19 13:18:27.332132",
+ "modified_by": "Administrator",
+ "module": "Social",
+ "name": "Energy Point Settings",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 0,
+   "role": "System Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "ASC",
+ "track_changes": 1,
+ "track_seen": 0,
+ "track_views": 0
+}
\ No newline at end of file
diff --git a/frappe/social/doctype/energy_point_settings/energy_point_settings.py b/frappe/social/doctype/energy_point_settings/energy_point_settings.py
new file mode 100644
index 0000000000..5ad3727914
--- /dev/null
+++ b/frappe/social/doctype/energy_point_settings/energy_point_settings.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class EnergyPointSettings(Document):
+	pass
diff --git a/frappe/social/doctype/review_level/__init__.py b/frappe/social/doctype/review_level/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/social/doctype/review_level/review_level.js b/frappe/social/doctype/review_level/review_level.js
new file mode 100644
index 0000000000..53c00a2f8a
--- /dev/null
+++ b/frappe/social/doctype/review_level/review_level.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2019, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Review Levels', {
+	// refresh: function(frm) {
+
+	// }
+});
diff --git a/frappe/social/doctype/review_level/review_level.json b/frappe/social/doctype/review_level/review_level.json
new file mode 100644
index 0000000000..ac15a8c53a
--- /dev/null
+++ b/frappe/social/doctype/review_level/review_level.json
@@ -0,0 +1,129 @@
+{
+ "allow_copy": 0,
+ "allow_events_in_timeline": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2019-03-19 13:16:12.762352",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "level_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Level Name",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "review_points",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Review Points",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2019-03-19 13:16:12.762352",
+ "modified_by": "Administrator",
+ "module": "Social",
+ "name": "Review Levels",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "ASC",
+ "track_changes": 1,
+ "track_seen": 0,
+ "track_views": 0
+}
\ No newline at end of file
diff --git a/frappe/social/doctype/review_level/review_level.py b/frappe/social/doctype/review_level/review_level.py
new file mode 100644
index 0000000000..9db9ea2a59
--- /dev/null
+++ b/frappe/social/doctype/review_level/review_level.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class ReviewLevels(Document):
+	pass

From ac9bae372de97b86c117d769a2fe6f31f346df94 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 19 Mar 2019 16:09:29 +0530
Subject: [PATCH 005/256] fix: Rename review levels -> review levels

---
 frappe/social/doctype/review_level/review_level.js   | 2 +-
 frappe/social/doctype/review_level/review_level.json | 2 +-
 frappe/social/doctype/review_level/review_level.py   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/social/doctype/review_level/review_level.js b/frappe/social/doctype/review_level/review_level.js
index 53c00a2f8a..a2f2ff4d56 100644
--- a/frappe/social/doctype/review_level/review_level.js
+++ b/frappe/social/doctype/review_level/review_level.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2019, Frappe Technologies and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Review Levels', {
+frappe.ui.form.on('Review Level', {
 	// refresh: function(frm) {
 
 	// }
diff --git a/frappe/social/doctype/review_level/review_level.json b/frappe/social/doctype/review_level/review_level.json
index ac15a8c53a..9725a52e35 100644
--- a/frappe/social/doctype/review_level/review_level.json
+++ b/frappe/social/doctype/review_level/review_level.json
@@ -93,7 +93,7 @@
  "modified": "2019-03-19 13:16:12.762352",
  "modified_by": "Administrator",
  "module": "Social",
- "name": "Review Levels",
+ "name": "Review Level",
  "name_case": "",
  "owner": "Administrator",
  "permissions": [
diff --git a/frappe/social/doctype/review_level/review_level.py b/frappe/social/doctype/review_level/review_level.py
index 9db9ea2a59..87720b63fc 100644
--- a/frappe/social/doctype/review_level/review_level.py
+++ b/frappe/social/doctype/review_level/review_level.py
@@ -6,5 +6,5 @@ from __future__ import unicode_literals
 # import frappe
 from frappe.model.document import Document
 
-class ReviewLevels(Document):
+class ReviewLevel(Document):
 	pass

From c6c502d297af21adb4c874d6cf9a5a28d308d35d Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 19 Mar 2019 16:30:23 +0530
Subject: [PATCH 006/256] fix: make energy point rule enabled bt default

---
 .../energy_point_rule/energy_point_rule.json  |  5 +--
 .../energy_point_settings.json                |  3 +-
 .../doctype/review_level/review_level.json    | 32 ++++---------------
 3 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.json b/frappe/social/doctype/energy_point_rule/energy_point_rule.json
index 0cbbfe1ee9..9fc6221705 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.json
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.json
@@ -21,6 +21,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "default": "1",
    "fetch_if_empty": 0,
    "fieldname": "enabled",
    "fieldtype": "Check",
@@ -225,7 +226,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-03-19 13:06:12.668991",
+ "modified": "2019-03-19 16:16:37.205403",
  "modified_by": "Administrator",
  "module": "Social",
  "name": "Energy Point Rule",
@@ -252,7 +253,7 @@
    "write": 1
   }
  ],
- "quick_entry": 1,
+ "quick_entry": 0,
  "read_only": 0,
  "read_only_onload": 0,
  "show_name_in_global_search": 0,
diff --git a/frappe/social/doctype/energy_point_settings/energy_point_settings.json b/frappe/social/doctype/energy_point_settings/energy_point_settings.json
index e0cd11a7a9..2cf1fb6793 100644
--- a/frappe/social/doctype/energy_point_settings/energy_point_settings.json
+++ b/frappe/social/doctype/energy_point_settings/energy_point_settings.json
@@ -20,6 +20,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "default": "1",
    "fetch_if_empty": 0,
    "fieldname": "enabled",
    "fieldtype": "Check",
@@ -91,7 +92,7 @@
  "issingle": 1,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-03-19 13:18:27.332132",
+ "modified": "2019-03-19 16:29:17.466781",
  "modified_by": "Administrator",
  "module": "Social",
  "name": "Energy Point Settings",
diff --git a/frappe/social/doctype/review_level/review_level.json b/frappe/social/doctype/review_level/review_level.json
index 9725a52e35..94eb5bffdd 100644
--- a/frappe/social/doctype/review_level/review_level.json
+++ b/frappe/social/doctype/review_level/review_level.json
@@ -28,7 +28,7 @@
    "ignore_xss_filter": 0,
    "in_filter": 0,
    "in_global_search": 0,
-   "in_list_view": 0,
+   "in_list_view": 1,
    "in_standard_filter": 0,
    "label": "Level Name",
    "length": 0,
@@ -55,13 +55,13 @@
    "columns": 0,
    "fetch_if_empty": 0,
    "fieldname": "review_points",
-   "fieldtype": "Data",
+   "fieldtype": "Int",
    "hidden": 0,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_filter": 0,
    "in_global_search": 0,
-   "in_list_view": 0,
+   "in_list_view": 1,
    "in_standard_filter": 0,
    "label": "Review Points",
    "length": 0,
@@ -88,35 +88,15 @@
  "in_create": 0,
  "is_submittable": 0,
  "issingle": 0,
- "istable": 0,
+ "istable": 1,
  "max_attachments": 0,
- "modified": "2019-03-19 13:16:12.762352",
+ "modified": "2019-03-19 16:28:42.170502",
  "modified_by": "Administrator",
  "module": "Social",
  "name": "Review Level",
  "name_case": "",
  "owner": "Administrator",
- "permissions": [
-  {
-   "amend": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
-   "write": 1
-  }
- ],
+ "permissions": [],
  "quick_entry": 1,
  "read_only": 0,
  "read_only_onload": 0,

From ce69ec7f76678dd9ab55f128a2652b07da6c796a Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 20 Mar 2019 08:41:24 +0530
Subject: [PATCH 007/256] fix: Make energy point log fields readonly

---
 .../energy_point_log/energy_point_log.json    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.json b/frappe/social/doctype/energy_point_log/energy_point_log.json
index d62b4cb94d..32e6938b0c 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.json
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.json
@@ -72,7 +72,7 @@
    "precision": "",
    "print_hide": 0,
    "print_hide_if_no_value": 0,
-   "read_only": 0,
+   "read_only": 1,
    "remember_last_selected_value": 0,
    "report_hide": 0,
    "reqd": 0,
@@ -101,12 +101,12 @@
    "label": "Rule",
    "length": 0,
    "no_copy": 0,
-   "options": "Energy Point Log",
+   "options": "Energy Point Rule",
    "permlevel": 0,
    "precision": "",
    "print_hide": 0,
    "print_hide_if_no_value": 0,
-   "read_only": 0,
+   "read_only": 1,
    "remember_last_selected_value": 0,
    "report_hide": 0,
    "reqd": 0,
@@ -261,7 +261,7 @@
  "istable": 0,
  "max_attachments": 0,
  "menu_index": 0,
- "modified": "2019-03-19 13:18:50.623717",
+ "modified": "2019-03-19 17:32:50.497762",
  "modified_by": "Administrator",
  "module": "Social",
  "name": "Energy Point Log",
@@ -271,21 +271,21 @@
   {
    "amend": 0,
    "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
+   "create": 0,
+   "delete": 0,
+   "email": 0,
+   "export": 0,
    "if_owner": 0,
    "import": 0,
    "permlevel": 0,
-   "print": 1,
+   "print": 0,
    "read": 1,
-   "report": 1,
+   "report": 0,
    "role": "System Manager",
    "set_user_permissions": 0,
-   "share": 1,
+   "share": 0,
    "submit": 0,
-   "write": 1
+   "write": 0
   }
  ],
  "quick_entry": 0,

From c11b5adea6489cbf30936af46de9bf4b43531782 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 20 Mar 2019 08:42:09 +0530
Subject: [PATCH 008/256] fix: process_energy_point code

---
 .../energy_point_log/energy_point_log.py      | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index 07e2ed26cd..102796027a 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -26,26 +26,23 @@ def process_for_energy_points(doc, state):
 	doc_action = doc.get('_action')
 	if not doc_action: return
 
-	point_rule = frappe.get_all('Energy Point Rule', filters={
+	point_rules = frappe.get_all('Energy Point Rule', filters={
 		'reference_doctype': doc.get('doctype'),
-	}, fields=['points', 'rule_name'], limit=1)
-
-	if point_rule:
-		point_rule = point_rule[0]
-		print(point_rule)
-		if frappe.safe_eval(point_rule.condition or True, None, {'doc': doc}):
+	}, fields=['name', 'points', 'rule_name', '`condition`', 'user_field'], debug=1)
+	print(point_rules)
+	for point_rule in point_rules:
+		print(point_rule.condition)
+		if frappe.safe_eval(point_rule.condition, None, {'doc': doc}):
 			create_energy_point_log(
-				point_rule.points,
-				"Action {0} on {1}".format(point_rule.rule_name, doc.name),
-				doc.doctype,
-				doc.name,
-				doc.get(point_rule.user_field)
+				points=point_rule.points,
+				reason=None,
+				reference_doctype=doc.doctype,
+				reference_name=doc.name,
+				user=doc.get(point_rule.user_field),
+				rule=point_rule.name
 			)
 
-def get_event_type(state):
-	return state.capitalize()
-
-def create_energy_point_log(points, reason, reference_doctype, reference_name, user=None):
+def create_energy_point_log(points, reason, reference_doctype, reference_name, user=None, rule=None):
 	print('===================in=========', user, points)
 	if not user:
 		user = frappe.session.user
@@ -56,6 +53,7 @@ def create_energy_point_log(points, reason, reference_doctype, reference_name, u
 		'doctype': 'Energy Point Log',
 		'points': points,
 		'user': user,
+		'rule': rule,
 		'reason': reason,
 		'reference_doctype': reference_doctype,
 		'reference_name': reference_name
@@ -67,8 +65,8 @@ def update_user_energy_points(point, user=None):
 	# TODO: find alternative
 	if user == 'admin@erpnext.com': user = 'Administrator'
 	if not user: user = frappe.session.user
-	previous_point = frappe.db.get_value('User', user, 'energy_point')
+	previous_point = frappe.db.get_value('User', user, 'energy_points')
 	new_point = cint(previous_point) + point
-	frappe.db.set_value('User', user, 'energy_point', new_point)
+	frappe.db.set_value('User', user, 'energy_points', new_point)
 
 	print('================= {} gained {} points ==================='.format(user, point))
\ No newline at end of file

From 1fb582cd3381a4f3174d2278cf52094f92053f3e Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 20 Mar 2019 10:02:59 +0530
Subject: [PATCH 009/256] test(energy_points): point based on rule applied

---
 .../energy_point_log/test_energy_point_log.py | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 frappe/social/doctype/energy_point_log/test_energy_point_log.py

diff --git a/frappe/social/doctype/energy_point_log/test_energy_point_log.py b/frappe/social/doctype/energy_point_log/test_energy_point_log.py
new file mode 100644
index 0000000000..e11f7ffa39
--- /dev/null
+++ b/frappe/social/doctype/energy_point_log/test_energy_point_log.py
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from .energy_point_log import create_energy_point_log
+
+class TestEnergyPointLog(unittest.TestCase):
+	def test_user_energy_point(self):
+		frappe.set_user('test@example.com')
+		todo_point_rule = create_energy_point_rule_for_todo()
+		energy_point_of_user = frappe.get_value('User', 'test@example.com', 'energy_points')
+
+		created_todo = create_a_todo()
+
+		created_todo.status = 'Closed'
+		created_todo.save()
+
+		points_after_closing_todo = frappe.get_value('User', 'test@example.com', 'energy_points')
+
+		self.assertEquals(points_after_closing_todo, energy_point_of_user + todo_point_rule.points)
+
+		created_todo.save()
+		points_after_double_save = frappe.get_value('User', 'test@example.com', 'energy_points')
+
+		# point should not be awarded more than once for same doc
+		self.assertEquals(points_after_double_save, energy_point_of_user + todo_point_rule.points)
+
+
+def create_energy_point_rule_for_todo():
+	point_rule = frappe.db.get_all(
+		'Energy Point Rule',
+		{'name':'ToDo closed'},
+		['points', 'name'],
+		limit=1
+	)
+
+	if point_rule: return point_rule[0]
+
+	return frappe.get_doc({
+		'doctype': 'Energy Point Rule',
+		'rule_name': 'ToDo closed',
+		'points': 5,
+		'reference_doctype': 'ToDo',
+		'condition': 'doc.status == "Closed"',
+		'user_field': 'owner'
+	}).insert(ignore_permissions=1)
+
+def create_a_todo():
+	return frappe.get_doc({
+		'doctype': 'ToDo',
+		'description': 'Fix a bug',
+	})
\ No newline at end of file

From 815eab3fffa4d18587856a31a05c463a6bb9031d Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 20 Mar 2019 10:03:51 +0530
Subject: [PATCH 010/256] fix: Avoid duplicate point allocation

---
 .../doctype/energy_point_log/energy_point_log.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index 102796027a..22f76d9fb8 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -47,8 +47,17 @@ def create_energy_point_log(points, reason, reference_doctype, reference_name, u
 	if not user:
 		user = frappe.session.user
 
-	if user == 'admin@example.com':
-		user = 'Administrator'
+	if user in ['admin@example.com', 'Administrator', 'Guest']: return
+
+	log_exists = frappe.db.exists('Energy Point Log', {
+		'user': user,
+		'rule': rule,
+		'reference_doctype': reference_doctype,
+		'reference_name': reference_name
+	})
+
+	if log_exists: return
+
 	frappe.get_doc({
 		'doctype': 'Energy Point Log',
 		'points': points,
@@ -62,9 +71,8 @@ def create_energy_point_log(points, reason, reference_doctype, reference_name, u
 def update_user_energy_points(point, user=None):
 	point = cint(point)
 	if not point: return
-	# TODO: find alternative
-	if user == 'admin@erpnext.com': user = 'Administrator'
 	if not user: user = frappe.session.user
+
 	previous_point = frappe.db.get_value('User', user, 'energy_points')
 	new_point = cint(previous_point) + point
 	frappe.db.set_value('User', user, 'energy_points', new_point)

From c9aa99537a1015e87ecab54aec55358e8df0fa26 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 20 Mar 2019 11:32:53 +0530
Subject: [PATCH 011/256] fix: Process for energy points only if setting is
 enabled

---
 frappe/boot.py                                               | 2 ++
 frappe/social/doctype/energy_point_log/energy_point_log.py   | 5 ++++-
 .../doctype/energy_point_settings/energy_point_settings.py   | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/frappe/boot.py b/frappe/boot.py
index 1e99b6bb30..f68402fdc2 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -17,6 +17,7 @@ from frappe.utils.change_log import get_versions
 from frappe.translate import get_lang_dict
 from frappe.email.inbox import get_email_accounts
 from frappe.core.doctype.feedback_trigger.feedback_trigger import get_enabled_feedback_trigger
+from frappe.social.doctype.energy_point_settings.energy_point_settings import is_energy_point_enabled
 
 def get_bootinfo():
 	"""build and return boot info"""
@@ -78,6 +79,7 @@ def get_bootinfo():
 	bootinfo.gsuite_enabled = get_gsuite_status()
 	bootinfo.success_action = get_success_action()
 	bootinfo.update(get_email_accounts(user=frappe.session.user))
+	bootinfo.energy_points_enabled = is_energy_point_enabled()
 
 	return bootinfo
 
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index 22f76d9fb8..fbab744fdb 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -6,6 +6,7 @@ from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
 from frappe.utils import cint
+from ..energy_point_settings.energy_point_settings import is_energy_point_enabled
 
 ENERGY_POINT_VALUES = {
 	'issue_closed': 2,
@@ -22,7 +23,9 @@ class EnergyPointLog(Document):
 		update_user_energy_points(self.points, self.user)
 
 def process_for_energy_points(doc, state):
-	if frappe.flags.in_patch: return
+	if (not is_energy_point_enabled()
+		or frappe.flags.in_patch): return
+
 	doc_action = doc.get('_action')
 	if not doc_action: return
 
diff --git a/frappe/social/doctype/energy_point_settings/energy_point_settings.py b/frappe/social/doctype/energy_point_settings/energy_point_settings.py
index 5ad3727914..5a367304ca 100644
--- a/frappe/social/doctype/energy_point_settings/energy_point_settings.py
+++ b/frappe/social/doctype/energy_point_settings/energy_point_settings.py
@@ -5,6 +5,10 @@
 from __future__ import unicode_literals
 # import frappe
 from frappe.model.document import Document
+import frappe
 
 class EnergyPointSettings(Document):
 	pass
+
+def is_energy_point_enabled():
+	return frappe.get_cached_value('Energy Point Settings', None, 'enabled')

From 85f2d50938a13c27b608f5bababf39afde5a97eb Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 20 Mar 2019 11:34:39 +0530
Subject: [PATCH 012/256] fix: show energy points UI only if enabled

---
 frappe/core/doctype/user/user.js               |  2 +-
 frappe/public/js/frappe/desk.js                | 13 +++++++++++++
 frappe/public/js/frappe/ui/toolbar/navbar.html |  2 --
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/frappe/core/doctype/user/user.js b/frappe/core/doctype/user/user.js
index d9f87a1db1..44fb1415b0 100644
--- a/frappe/core/doctype/user/user.js
+++ b/frappe/core/doctype/user/user.js
@@ -60,7 +60,7 @@ frappe.ui.form.on('User', {
 			frm.reload_doc();
 			return;
 		}
-		if (!frm.points) {
+		if (frappe.boot.energy_points_enabled && !frm.points ) {
 			frm.points = frm.sidebar.image_section.append(`
 				<ul class="list-unstyled sidebar-menu">
 					<li align="center" class="bold text-muted">
diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index 87538b287a..3204f8b4aa 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -45,6 +45,9 @@ frappe.Application = Class.extend({
 		this.make_nav_bar();
 		this.set_favicon();
 		this.setup_analytics();
+
+		this.show_energy_points();
+
 		frappe.ui.keys.setup();
 		this.set_rtl();
 
@@ -547,6 +550,16 @@ frappe.Application = Class.extend({
 				frappe.show_alert(message);
 			}
 		});
+	},
+
+	show_energy_points() {
+		if (frappe.boot.energy_points_enabled) {
+			$(".toolbar-user-fullname").append(`
+				<span class="ellipsis hidden-xs energy-points hidden-sm primary">
+					(${frappe.user_info().energy_points} pts)
+				</span>
+			`);
+		}
 	}
 });
 
diff --git a/frappe/public/js/frappe/ui/toolbar/navbar.html b/frappe/public/js/frappe/ui/toolbar/navbar.html
index 0f7df81088..953cf80372 100644
--- a/frappe/public/js/frappe/ui/toolbar/navbar.html
+++ b/frappe/public/js/frappe/ui/toolbar/navbar.html
@@ -22,8 +22,6 @@
 				{{ avatar }}
 				<span class="ellipsis toolbar-user-fullname hidden-xs hidden-sm">
 					{%= frappe.user.full_name() %}</span>
-				<span class="ellipsis toolbar-user-fullname hidden-xs hidden-sm primary">
-					({%= frappe.user_info().energy_points %} pts)</span>
 				<b class="caret hidden-xs hidden-sm"></b></a>
 				<ul class="dropdown-menu" id="toolbar-user" role="menu">
 					<li><a href="#Form/User/{%= encodeURIComponent(frappe.session.user) %}">

From 23a1ffe001ace077cd2f7d3952c3a332653c8a52 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 20 Mar 2019 11:35:57 +0530
Subject: [PATCH 013/256] fix: Fetch energy_points as well with user info

---
 frappe/auth.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/auth.py b/frappe/auth.py
index 37a79bd4a6..9a6d608092 100644
--- a/frappe/auth.py
+++ b/frappe/auth.py
@@ -140,7 +140,7 @@ class LoginManager:
 
 	def get_user_info(self, resume=False):
 		self.info = frappe.db.get_value("User", self.user,
-			["user_type", "first_name", "last_name", "user_image"], as_dict=1)
+			["user_type", "first_name", "last_name", "user_image", "energy_points"], as_dict=1)
 
 		self.user_type = self.info.user_type
 

From b20a435aa816dcc3e03fff6bab210cb35339e503 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 20 Mar 2019 17:04:48 +0530
Subject: [PATCH 014/256] feat: Init review points

- Show points in user list
- Realtime alert about gained points
- Avoid duplicate points
---
 frappe/public/js/frappe/desk.js               |  7 ++++++
 frappe/public/js/frappe/form/form_sidebar.js  | 24 +++++++++++++++++++
 .../public/js/frappe/social/pages/Profile.vue |  7 ++++++
 .../js/frappe/social/pages/UserList.vue       | 11 ++++++---
 .../energy_point_log/energy_point_log.py      |  7 +++---
 5 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index 3204f8b4aa..535c172ba9 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -46,6 +46,7 @@ frappe.Application = Class.extend({
 		this.set_favicon();
 		this.setup_analytics();
 
+		this.setup_energy_point_listeners();
 		this.show_energy_points();
 
 		frappe.ui.keys.setup();
@@ -552,6 +553,12 @@ frappe.Application = Class.extend({
 		});
 	},
 
+	setup_energy_point_listeners() {
+		frappe.realtime.on('points_gained', (message) => {
+			frappe.show_alert(message);
+		});
+	},
+
 	show_energy_points() {
 		if (frappe.boot.energy_points_enabled) {
 			$(".toolbar-user-fullname").append(`
diff --git a/frappe/public/js/frappe/form/form_sidebar.js b/frappe/public/js/frappe/form/form_sidebar.js
index 66a8aa5c12..7bc403c5e0 100644
--- a/frappe/public/js/frappe/form/form_sidebar.js
+++ b/frappe/public/js/frappe/form/form_sidebar.js
@@ -20,6 +20,8 @@ frappe.ui.form.Sidebar = Class.extend({
 		this.make_attachments();
 		this.make_shared();
 		this.make_viewers();
+		this.make_review();
+
 		this.make_tags();
 		this.make_like();
 		this.make_follow();
@@ -155,6 +157,7 @@ frappe.ui.form.Sidebar = Class.extend({
 
 	refresh_image: function() {
 	},
+
 	setup_ratings: function() {
 		var _ratings = this.frm.get_docinfo().rating || 0;
 
@@ -164,4 +167,25 @@ frappe.ui.form.Sidebar = Class.extend({
 			this.ratings.find(".rating-icons").html(rating_icons);
 		}
 	},
+	make_review: function() {
+		const button = this.sidebar.find(".form-attachments").append('<a>Give Points</a>');
+
+		const review_dialog = new frappe.ui.Dialog({
+			'title': __('Review'),
+			'fields': [{
+				fieldname: 'points',
+				fieldtype: 'Int',
+				label: __('Points')
+			}, {
+				fieldtype: 'Small Text',
+				fieldname: 'reason',
+				label: __('Reason')
+			}],
+			primary_action: function() { },
+			primary_action_label: __('Send Points')
+		});
+
+
+		button.click(() => review_dialog.show());
+	}
 });
diff --git a/frappe/public/js/frappe/social/pages/Profile.vue b/frappe/public/js/frappe/social/pages/Profile.vue
index 8b24e6deb8..e36441fe98 100644
--- a/frappe/public/js/frappe/social/pages/Profile.vue
+++ b/frappe/public/js/frappe/social/pages/Profile.vue
@@ -24,6 +24,13 @@
 						<span>Likes</span>
 						<span>({{ liked_posts_count }})</span>
 					</div>
+					<div
+						class="option"
+						:class="{'bold': show_list === 'badges'}"
+						@click="show_list = 'badges'">
+						<span>Badges</span>
+						<span>({{ user_posts_count }})</span>
+					</div>
 				</div>
 				<post-loader :post_list_filter="post_list_filter"></post-loader>
 			</div>
diff --git a/frappe/public/js/frappe/social/pages/UserList.vue b/frappe/public/js/frappe/social/pages/UserList.vue
index fd6c385067..55b1283857 100644
--- a/frappe/public/js/frappe/social/pages/UserList.vue
+++ b/frappe/public/js/frappe/social/pages/UserList.vue
@@ -15,8 +15,11 @@
 					<span v-html="get_avatar(user.name)"></span>
 					<div class="user-details">
 						{{ user.fullname }}
-						<div class="text-muted text-medium" :class="{'italic': !user.bio}">{{ frappe.ellipsis(user.bio, 100) || 'No Bio'}}</div>
+						<div class="text-muted text-medium" :class="{'italic': !user.bio}">
+							{{ frappe.ellipsis(user.bio, 100) || 'No Bio'}}
+						</div>
 					</div>
+					<span class="text-muted text-nowrap">{{user.energy_points}} pts</span>
 				</li>
 				<li class="text-muted" v-if="!filtered_users.length">{{__('No user found')}}</li>
 			</ul>
@@ -66,12 +69,14 @@ export default {
 	// similar to search bar height
 	margin-top: 75px;
 	.user-card {
+		border: 1px solid white;
 		&:hover {
-			border: 1px solid #d1d8dd;
+			border-color:#d1d8dd;
 		}
 		border-radius: 5px;
 		.user-details {
-			margin-left: 10px;
+			width: 100%;
+			margin: 0 10px;
 			.italic {
 				font-style: italic;
 			}
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index fbab744fdb..19b99393a6 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -59,7 +59,8 @@ def create_energy_point_log(points, reason, reference_doctype, reference_name, u
 		'reference_name': reference_name
 	})
 
-	if log_exists: return
+	if log_exists:
+		return
 
 	frappe.get_doc({
 		'doctype': 'Energy Point Log',
@@ -79,5 +80,5 @@ def update_user_energy_points(point, user=None):
 	previous_point = frappe.db.get_value('User', user, 'energy_points')
 	new_point = cint(previous_point) + point
 	frappe.db.set_value('User', user, 'energy_points', new_point)
-
-	print('================= {} gained {} points ==================='.format(user, point))
\ No newline at end of file
+	message='=== You gained </b>{}</b> points ==='.format(point)
+	frappe.publish_realtime('points_gained', message=message , user=user)
\ No newline at end of file

From fb5129e154c4760d33c05ea70685657c8dd52b32 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 21 Mar 2019 15:32:04 +0530
Subject: [PATCH 015/256] feat: Add multiplier field option

- Change user field datatype to select
---
 .../energy_point_rule/energy_point_rule.js    | 21 ++++++++++
 .../energy_point_rule/energy_point_rule.json  | 38 ++++++++++++++++++-
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.js b/frappe/social/doctype/energy_point_rule/energy_point_rule.js
index b315dc75ae..5e813694b2 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.js
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.js
@@ -3,6 +3,27 @@
 
 frappe.ui.form.on('Energy Point Rule', {
 	refresh: function(frm) {
+		frm.events.set_user_and_multiplier_field_options(frm);
+	},
+	reference_doctype(frm) {
+		frm.events.set_user_and_multiplier_field_options(frm);
+	},
+	set_user_and_multiplier_field_options(frm) {
+		const reference_doctype = frm.doc.reference_doctype;
+		if (!reference_doctype) return;
 
+		frappe.model.with_doctype(reference_doctype, () => {
+			const map_for_options = df => ({ label: df.label, value: df.fieldname });
+			const fields = frappe.meta.get_docfields(frm.doc.reference_doctype);
+			const user_fields = fields.filter(df => df.fieldtype === 'Link' && df.options === 'User')
+				.map(map_for_options)
+				.concat([{label: __('Owner'), value: 'owner'}]);
+
+			const multiplier_fields = fields.filter(df => df.fieldtype === 'Int')
+				.map(map_for_options);
+
+			frm.set_df_property('user_field', 'options', user_fields);
+			frm.set_df_property('multiplier_field', 'options', multiplier_fields);
+		});
 	}
 });
diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.json b/frappe/social/doctype/energy_point_rule/energy_point_rule.json
index 9fc6221705..0b9d7a4516 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.json
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.json
@@ -189,9 +189,10 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "description": "The user from this field will be rewarded points",
    "fetch_if_empty": 0,
    "fieldname": "user_field",
-   "fieldtype": "Data",
+   "fieldtype": "Select",
    "hidden": 0,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
@@ -214,6 +215,39 @@
    "set_only_once": 0,
    "translatable": 0,
    "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "multiplier_field",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Multiplier Field",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   }
  ],
  "has_web_view": 0,
@@ -226,7 +260,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-03-19 16:16:37.205403",
+ "modified": "2019-03-21 11:36:06.399428",
  "modified_by": "Administrator",
  "module": "Social",
  "name": "Energy Point Rule",

From 3ff4a4f8d7e7f17d9654bd21757347f3ca60bf55 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 21 Mar 2019 15:36:59 +0530
Subject: [PATCH 016/256] refactor: Move code to Energy Point Rule

- Remove unwanted code
- Cache energy point rules

Co-authored-by: Faris Ansari <netchamp.faris@gmail.com>
---
 frappe/hooks.py                               |  6 +-
 .../energy_point_log/energy_point_log.py      | 81 +++++--------------
 .../energy_point_rule/energy_point_rule.py    | 43 +++++++++-
 3 files changed, 63 insertions(+), 67 deletions(-)

diff --git a/frappe/hooks.py b/frappe/hooks.py
index 1939e7f0df..5984b216a5 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -117,7 +117,8 @@ doc_events = {
 			"frappe.desk.notifications.clear_doctype_notifications",
 			"frappe.core.doctype.activity_log.feed.update_feed",
 			"frappe.workflow.doctype.workflow_action.workflow_action.process_workflow_actions",
-			"frappe.automation.doctype.assignment_rule.assignment_rule.apply"
+			"frappe.automation.doctype.assignment_rule.assignment_rule.apply",
+			"frappe.social.doctype.energy_point_rule.energy_point_rule.process_energy_points"
 		],
 		"after_rename": "frappe.desk.notifications.clear_doctype_notifications",
 		"on_cancel": [
@@ -129,8 +130,7 @@ doc_events = {
 			"frappe.workflow.doctype.workflow_action.workflow_action.process_workflow_actions"
 		],
 		"on_change": [
-			"frappe.core.doctype.feedback_trigger.feedback_trigger.trigger_feedback_request",
-			"frappe.social.doctype.energy_point_log.energy_point_log.process_for_energy_points"
+			"frappe.core.doctype.feedback_trigger.feedback_trigger.trigger_feedback_request"
 		]
 	},
 	"Email Group Member": {
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index 19b99393a6..44cdcc773b 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -6,79 +6,34 @@ from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
 from frappe.utils import cint
-from ..energy_point_settings.energy_point_settings import is_energy_point_enabled
-
-ENERGY_POINT_VALUES = {
-	'issue_closed': 2,
-	'instant_reply_on_issue': 2,
-	'feedback_point_multiplier': 2,
-	'github_pull_request_merge': 2,
-	'github_pull_request_review_submit': 2,
-	'github_issue_open': 1,
-	'github_issue_close': 2,
-}
 
 class EnergyPointLog(Document):
 	def after_insert(self):
 		update_user_energy_points(self.points, self.user)
 
-def process_for_energy_points(doc, state):
-	if (not is_energy_point_enabled()
-		or frappe.flags.in_patch): return
-
-	doc_action = doc.get('_action')
-	if not doc_action: return
-
-	point_rules = frappe.get_all('Energy Point Rule', filters={
-		'reference_doctype': doc.get('doctype'),
-	}, fields=['name', 'points', 'rule_name', '`condition`', 'user_field'], debug=1)
-	print(point_rules)
-	for point_rule in point_rules:
-		print(point_rule.condition)
-		if frappe.safe_eval(point_rule.condition, None, {'doc': doc}):
-			create_energy_point_log(
-				points=point_rule.points,
-				reason=None,
-				reference_doctype=doc.doctype,
-				reference_name=doc.name,
-				user=doc.get(point_rule.user_field),
-				rule=point_rule.name
-			)
-
-def create_energy_point_log(points, reason, reference_doctype, reference_name, user=None, rule=None):
-	print('===================in=========', user, points)
-	if not user:
-		user = frappe.session.user
-
-	if user in ['admin@example.com', 'Administrator', 'Guest']: return
-
+def create_energy_point_log(ref_doctype, ref_name, doc):
+	doc = frappe._dict(doc)
 	log_exists = frappe.db.exists('Energy Point Log', {
-		'user': user,
-		'rule': rule,
-		'reference_doctype': reference_doctype,
-		'reference_name': reference_name
+		'user': doc.user,
+		'rule': doc.rule,
+		'reference_doctype': ref_doctype,
+		'reference_name': ref_name
 	})
-
 	if log_exists:
 		return
 
-	frappe.get_doc({
-		'doctype': 'Energy Point Log',
-		'points': points,
-		'user': user,
-		'rule': rule,
-		'reason': reason,
-		'reference_doctype': reference_doctype,
-		'reference_name': reference_name
-	}).insert(ignore_permissions=True)
+	_doc = frappe.new_doc('Energy Point Log')
+	_doc.reference_doctype = ref_doctype
+	_doc.reference_name = ref_name
+	_doc.update(doc)
+	_doc.insert(ignore_permissions=True)
+	return _doc
 
-def update_user_energy_points(point, user=None):
-	point = cint(point)
-	if not point: return
-	if not user: user = frappe.session.user
+def update_user_energy_points(points, user):
+	points = cint(points)
 
-	previous_point = frappe.db.get_value('User', user, 'energy_points')
-	new_point = cint(previous_point) + point
-	frappe.db.set_value('User', user, 'energy_points', new_point)
-	message='=== You gained </b>{}</b> points ==='.format(point)
+	previous_points = frappe.db.get_value('User', user, 'energy_points')
+	new_points = cint(previous_points) + points
+	frappe.db.set_value('User', user, 'energy_points', new_points)
+	message='=== You gained <b>{}</b> points ==='.format(points)
 	frappe.publish_realtime('points_gained', message=message , user=user)
\ No newline at end of file
diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
index 975fe16505..40fa4bb877 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
@@ -5,6 +5,47 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
+from frappe.utils import cint
+from frappe.social.doctype.energy_point_settings.energy_point_settings import is_energy_point_enabled
+from frappe.social.doctype.energy_point_log.energy_point_log import create_energy_point_log
 
 class EnergyPointRule(Document):
-	pass
+	def apply(self, doc):
+		if frappe.safe_eval(self.condition, None, {'doc': doc.as_dict()}):
+			multiplier = 1
+
+			if self.multiplier_field:
+				multiplier = doc.get(self.multiplier_field, 1)
+
+			points = self.points * multiplier
+			reference_doctype = doc.doctype
+			reference_name = doc.name
+			user = doc.get(self.user_field)
+			rule = self.name
+
+			create_energy_point_log(reference_doctype, reference_name, {
+				'points': points,
+				'user': user,
+				'rule': rule
+			})
+
+
+def process_energy_points(doc, state):
+	if not is_energy_point_enabled() or frappe.flags.in_patch or frappe.flags.in_install:
+		return
+
+	energy_point_doctypes = frappe.cache().get_value('energy_point_doctypes', get_energy_point_doctypes)
+
+	if doc.doctype in energy_point_doctypes:
+		rules = frappe.get_all('Energy Point Rule', filters={
+			'reference_doctype': doc.doctype,
+			'enabled': 1
+		})
+		for d in rules:
+			frappe.get_doc('Energy Point Rule', d.name).apply(doc)
+
+def get_energy_point_doctypes():
+	return [
+		d.reference_doctype for d in frappe.get_all('Energy Point Rule',
+			['reference_doctype'], {'enabled': 1})
+	]

From aee7c67f8b6b8873aaf8dc9856fd06ab53b851b9 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 21 Mar 2019 21:06:54 +0530
Subject: [PATCH 017/256] refactor: Move get_users_with_role to utils.user

---
 .../core/page/permission_manager/permission_manager.py |  9 ++-------
 frappe/utils/user.py                                   |  8 ++++++++
 .../doctype/workflow_action/workflow_action.py         | 10 +---------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/frappe/core/page/permission_manager/permission_manager.py b/frappe/core/page/permission_manager/permission_manager.py
index 56d292b89a..3321e04bc2 100644
--- a/frappe/core/page/permission_manager/permission_manager.py
+++ b/frappe/core/page/permission_manager/permission_manager.py
@@ -11,6 +11,7 @@ from frappe.core.doctype.doctype.doctype import (clear_permissions_cache,
 	validate_permissions_for_doctype)
 from frappe.permissions import (reset_perms, get_linked_doctypes, get_all_perms,
 	setup_custom_perms, add_permission, update_permission_property)
+from frappe.utils.user import get_users_with_role as _get_user_with_role
 
 not_allowed_in_permission_manager = ["DocType", "Patch Log", "Module Def", "Transaction Log"]
 
@@ -101,13 +102,7 @@ def reset(doctype):
 @frappe.whitelist()
 def get_users_with_role(role):
 	frappe.only_for("System Manager")
-
-	return [p[0] for p in frappe.db.sql("""select distinct tabUser.name
-		from `tabHas Role`, tabUser where
-			`tabHas Role`.role=%s
-			and tabUser.name != "Administrator"
-			and `tabHas Role`.parent = tabUser.name
-			and tabUser.enabled=1""", role)]
+	_get_user_with_role(role)
 
 @frappe.whitelist()
 def get_standard_permissions(doctype):
diff --git a/frappe/utils/user.py b/frappe/utils/user.py
index 0b2446b270..504ce181ea 100755
--- a/frappe/utils/user.py
+++ b/frappe/utils/user.py
@@ -378,3 +378,11 @@ def get_link_to_reset_password(user):
 	return {
 		'link': link
 	}
+
+def get_users_with_role(role):
+	return [p[0] for p in frappe.db.sql("""SELECT DISTINCT `tabUser`.`name`
+		FROM `tabHas Role`, `tabUser`
+		WHERE `tabHas Role`.`role`=%s
+		AND `tabUser`.`name`!='Administrator'
+		AND `tabHas Role`.`parent`=`tabUser`.`name`
+		AND `tabUser`.`enabled`=1""", role)]
\ No newline at end of file
diff --git a/frappe/workflow/doctype/workflow_action/workflow_action.py b/frappe/workflow/doctype/workflow_action/workflow_action.py
index e729519e9d..b1ce138487 100644
--- a/frappe/workflow/doctype/workflow_action/workflow_action.py
+++ b/frappe/workflow/doctype/workflow_action/workflow_action.py
@@ -12,6 +12,7 @@ from frappe import _
 from frappe.model.workflow import apply_workflow, get_workflow_name, \
 	has_approval_access, get_workflow_state_field, send_email_alert
 from frappe.desk.notifications import clear_doctype_notifications
+from frappe.utils.user import get_users_with_role
 
 class WorkflowAction(Document):
 	pass
@@ -217,15 +218,6 @@ def get_confirm_workflow_action_url(doc, action, user):
 
 	return get_url(confirm_action_method + "?" + get_signed_params(params))
 
-
-def get_users_with_role(role):
-	return [p[0] for p in frappe.db.sql("""SELECT DISTINCT `tabUser`.`name`
-		FROM `tabHas Role`, `tabUser`
-		WHERE `tabHas Role`.`role`=%s
-		AND `tabUser`.`name`!='Administrator'
-		AND `tabHas Role`.`parent`=`tabUser`.`name`
-		AND `tabUser`.`enabled`=1""", role)]
-
 def is_workflow_action_already_created(doc):
 	return frappe.db.exists({
 		'doctype': 'Workflow Action',

From 4c8c44f541de5961a348b47e56ca0848766bfab3 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 22 Mar 2019 08:06:57 +0530
Subject: [PATCH 018/256] fix: Remove update_user_energy_points function - Add
 create review points log - Remove unwanted hooks - Add get_energy_points
 function

---
 frappe/boot.py                                |  6 +++-
 frappe/hooks.py                               |  7 ++---
 .../energy_point_log/energy_point_log.py      | 31 +++++++++++++------
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/frappe/boot.py b/frappe/boot.py
index f68402fdc2..fd204f34b1 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -18,6 +18,7 @@ from frappe.translate import get_lang_dict
 from frappe.email.inbox import get_email_accounts
 from frappe.core.doctype.feedback_trigger.feedback_trigger import get_enabled_feedback_trigger
 from frappe.social.doctype.energy_point_settings.energy_point_settings import is_energy_point_enabled
+from frappe.social.doctype.energy_point_log.energy_point_log import get_energy_points
 
 def get_bootinfo():
 	"""build and return boot info"""
@@ -80,6 +81,9 @@ def get_bootinfo():
 	bootinfo.success_action = get_success_action()
 	bootinfo.update(get_email_accounts(user=frappe.session.user))
 	bootinfo.energy_points_enabled = is_energy_point_enabled()
+	bootinfo.energy_points = get_energy_points(frappe.session.user)
+
+	bootinfo.review_points = get_energy_points(frappe.session.user, 'Review')
 
 	return bootinfo
 
@@ -197,7 +201,7 @@ def load_translations(bootinfo):
 def get_fullnames():
 	"""map of user fullnames"""
 	ret = frappe.db.sql("""select `name`, full_name as fullname,
-		user_image as image, gender, email, username, bio, location, interest, banner_image, allowed_in_mentions, energy_points
+		user_image as image, gender, email, username, bio, location, interest, banner_image, allowed_in_mentions
 		from tabUser where enabled=1 and user_type!='Website User'""", as_dict=1)
 
 	d = {}
diff --git a/frappe/hooks.py b/frappe/hooks.py
index 5984b216a5..304db9546d 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -135,10 +135,7 @@ doc_events = {
 	},
 	"Email Group Member": {
 		"validate": "frappe.email.doctype.email_group.email_group.restrict_email_group"
-	},
-	"Energy Point Log": {
-		"after_insert": "frappe.social.doctype.energy_point_log.energy_point_log.update_user_energy_points"
-	},
+	}
 }
 
 scheduler_events = {
@@ -178,7 +175,7 @@ scheduler_events = {
 		"frappe.core.doctype.activity_log.activity_log.clear_authentication_logs",
 		"frappe.website.doctype.personal_data_deletion_request.personal_data_deletion_request.remove_unverified_record",
 		"frappe.desk.form.document_follow.send_daily_updates"
-
+		"frappe.social.doctype.energy_point_settings.energy_point_settings.allocate_review_points"
 	],
 	"daily_long": [
 		"frappe.integrations.doctype.dropbox_settings.dropbox_settings.take_backups_daily",
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index 44cdcc773b..d851a06fb1 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -9,9 +9,11 @@ from frappe.utils import cint
 
 class EnergyPointLog(Document):
 	def after_insert(self):
-		update_user_energy_points(self.points, self.user)
+		if self.type != 'Review':
+			message='=== You gained <b>{}</b> points ==='.format(self.points)
+			frappe.publish_realtime('points_gained', message=message , user=self.user)
 
-def create_energy_point_log(ref_doctype, ref_name, doc):
+def create_energy_points_log(ref_doctype, ref_name, doc):
 	doc = frappe._dict(doc)
 	log_exists = frappe.db.exists('Energy Point Log', {
 		'user': doc.user,
@@ -29,11 +31,22 @@ def create_energy_point_log(ref_doctype, ref_name, doc):
 	_doc.insert(ignore_permissions=True)
 	return _doc
 
-def update_user_energy_points(points, user):
-	points = cint(points)
+def create_review_points_log(user, points, reason=None):
+	return frappe.get_doc({
+		'doctype': 'Energy Point Log',
+		'points': points,
+		'type': 'Review',
+		'user': user,
+		'reason': reason
+	}).insert(ignore_permissions=True)
 
-	previous_points = frappe.db.get_value('User', user, 'energy_points')
-	new_points = cint(previous_points) + points
-	frappe.db.set_value('User', user, 'energy_points', new_points)
-	message='=== You gained <b>{}</b> points ==='.format(points)
-	frappe.publish_realtime('points_gained', message=message , user=user)
\ No newline at end of file
+def get_energy_points(user, points_type=None):
+	if not points_type:
+		points_type = ['NOT IN', ('Review')]
+
+	log = frappe.db.get_all('Energy Point Log', filters={
+		'user': user,
+		'type': points_type
+	}, fields=['SUM(`points`) as points'], group_by='user')
+
+	return log[0].points if log else 0
\ No newline at end of file

From d77fad8fbe21d43dd3dc2f9a5ef1c71eaad21ded Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 22 Mar 2019 08:08:55 +0530
Subject: [PATCH 019/256] refactor: Remove energy_points field from user
 doctype

- to decouple energy point feature.
---
 frappe/core/doctype/user/user.js              |  2 +-
 frappe/core/doctype/user/user.json            | 35 +------------------
 frappe/public/js/frappe/desk.js               |  2 +-
 .../js/frappe/social/pages/UserList.vue       |  2 +-
 4 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/frappe/core/doctype/user/user.js b/frappe/core/doctype/user/user.js
index 44fb1415b0..5456c86627 100644
--- a/frappe/core/doctype/user/user.js
+++ b/frappe/core/doctype/user/user.js
@@ -64,7 +64,7 @@ frappe.ui.form.on('User', {
 			frm.points = frm.sidebar.image_section.append(`
 				<ul class="list-unstyled sidebar-menu">
 					<li align="center" class="bold text-muted">
-						<span class="text-large">${frm.doc.energy_points}</span> points
+						<span class="text-large">${frappe.boot.energy_points}</span> points
 					</li>
 				</ul>
 			`);
diff --git a/frappe/core/doctype/user/user.json b/frappe/core/doctype/user/user.json
index c565aa562a..f161fd23a0 100644
--- a/frappe/core/doctype/user/user.json
+++ b/frappe/core/doctype/user/user.json
@@ -981,39 +981,6 @@
    "translatable": 0,
    "unique": 0
   },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "energy_points",
-   "fieldtype": "Int",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Energy Points",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
   {
    "allow_bulk_edit": 0,
    "allow_in_quick_entry": 0,
@@ -2545,7 +2512,7 @@
  "istable": 0,
  "max_attachments": 5,
  "menu_index": 0,
- "modified": "2019-03-19 10:52:33.592908",
+ "modified": "2019-03-21 16:55:34.747934",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "User",
diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index 535c172ba9..e444e335bf 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -563,7 +563,7 @@ frappe.Application = Class.extend({
 		if (frappe.boot.energy_points_enabled) {
 			$(".toolbar-user-fullname").append(`
 				<span class="ellipsis hidden-xs energy-points hidden-sm primary">
-					(${frappe.user_info().energy_points} pts)
+					(${frappe.boot.energy_points} pts)
 				</span>
 			`);
 		}
diff --git a/frappe/public/js/frappe/social/pages/UserList.vue b/frappe/public/js/frappe/social/pages/UserList.vue
index 55b1283857..5cdf1142e7 100644
--- a/frappe/public/js/frappe/social/pages/UserList.vue
+++ b/frappe/public/js/frappe/social/pages/UserList.vue
@@ -19,7 +19,7 @@
 							{{ frappe.ellipsis(user.bio, 100) || 'No Bio'}}
 						</div>
 					</div>
-					<span class="text-muted text-nowrap">{{user.energy_points}} pts</span>
+					<span class="text-muted text-nowrap">{{frappe.boot.energy_points}} pts</span>
 				</li>
 				<li class="text-muted" v-if="!filtered_users.length">{{__('No user found')}}</li>
 			</ul>

From 7c0030b978062a02dd00073351a04db690616815 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 22 Mar 2019 08:10:30 +0530
Subject: [PATCH 020/256] test: Add multiplier calculation test, update old
 test

- Test to check if energy point is not calculation if setting is disabled
---
 .../energy_point_log/test_energy_point_log.py | 70 ++++++++++++++++---
 1 file changed, 60 insertions(+), 10 deletions(-)

diff --git a/frappe/social/doctype/energy_point_log/test_energy_point_log.py b/frappe/social/doctype/energy_point_log/test_energy_point_log.py
index e11f7ffa39..465c2cd360 100644
--- a/frappe/social/doctype/energy_point_log/test_energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/test_energy_point_log.py
@@ -5,35 +5,81 @@ from __future__ import unicode_literals
 
 import frappe
 import unittest
-from .energy_point_log import create_energy_point_log
+from .energy_point_log import get_energy_points
+from frappe.utils.testutils import add_custom_field, clear_custom_fields
 
 class TestEnergyPointLog(unittest.TestCase):
+	def tearDown(self):
+		frappe.db.sql('DELETE FROM `tabEnergy Point Log`')
+		frappe.db.sql('DELETE FROM `tabEnergy Point Rule`')
+
 	def test_user_energy_point(self):
 		frappe.set_user('test@example.com')
 		todo_point_rule = create_energy_point_rule_for_todo()
-		energy_point_of_user = frappe.get_value('User', 'test@example.com', 'energy_points')
+		energy_point_of_user = get_energy_points('test@example.com')
 
 		created_todo = create_a_todo()
 
 		created_todo.status = 'Closed'
 		created_todo.save()
 
-		points_after_closing_todo = frappe.get_value('User', 'test@example.com', 'energy_points')
+		points_after_closing_todo = get_energy_points('test@example.com')
 
 		self.assertEquals(points_after_closing_todo, energy_point_of_user + todo_point_rule.points)
 
 		created_todo.save()
-		points_after_double_save = frappe.get_value('User', 'test@example.com', 'energy_points')
+		points_after_double_save = get_energy_points('test@example.com')
 
 		# point should not be awarded more than once for same doc
 		self.assertEquals(points_after_double_save, energy_point_of_user + todo_point_rule.points)
 
+	def test_points_based_on_multiplier_field(self):
+		frappe.set_user('test@example.com')
+		add_custom_field('ToDo', 'multiplier', 'Int')
+		multiplier_value = 2
 
-def create_energy_point_rule_for_todo():
+		todo_point_rule = create_energy_point_rule_for_todo('multiplier')
+		energy_point_of_user = get_energy_points('test@example.com')
+
+		created_todo = create_a_todo()
+		points_after_closing_todo = get_energy_points('test@example.com')
+		created_todo.status = 'Closed'
+		created_todo.multiplier = multiplier_value
+		created_todo.save()
+
+		points_after_closing_todo = get_energy_points('test@example.com')
+
+		self.assertEquals(points_after_closing_todo, energy_point_of_user + (todo_point_rule.points * multiplier_value))
+		clear_custom_fields('ToDo')
+
+	def test_disabled_energy_points(self):
+		settings = frappe.get_single('Energy Point Settings')
+		settings.enabled = 0
+		settings.save()
+
+		frappe.set_user('test@example.com')
+		create_energy_point_rule_for_todo()
+		energy_point_of_user = get_energy_points('test@example.com')
+
+		created_todo = create_a_todo()
+
+		created_todo.status = 'Closed'
+		created_todo.save()
+
+		points_after_closing_todo = get_energy_points('test@example.com')
+
+		# no change in points
+		self.assertEquals(points_after_closing_todo, energy_point_of_user)
+
+		settings.enabled = 1
+		settings.save()
+
+def create_energy_point_rule_for_todo(multiplier_field=None):
+	name = 'ToDo Closed'
 	point_rule = frappe.db.get_all(
 		'Energy Point Rule',
-		{'name':'ToDo closed'},
-		['points', 'name'],
+		{'name': name},
+		['*'],
 		limit=1
 	)
 
@@ -41,15 +87,19 @@ def create_energy_point_rule_for_todo():
 
 	return frappe.get_doc({
 		'doctype': 'Energy Point Rule',
-		'rule_name': 'ToDo closed',
+		'rule_name': name,
 		'points': 5,
 		'reference_doctype': 'ToDo',
 		'condition': 'doc.status == "Closed"',
-		'user_field': 'owner'
+		'user_field': 'owner',
+		'multiplier_field': multiplier_field
 	}).insert(ignore_permissions=1)
 
 def create_a_todo():
 	return frappe.get_doc({
 		'doctype': 'ToDo',
 		'description': 'Fix a bug',
-	})
\ No newline at end of file
+	}).insert()
+
+
+# test for multiplier

From dc1325ac55c05f732f200c87406eb891522d57eb Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 22 Mar 2019 10:02:01 +0530
Subject: [PATCH 021/256] feat: Auto review points allocation

---
 .../energy_point_settings.json                | 70 ++++++++++++++++++-
 .../energy_point_settings.py                  | 45 +++++++++++-
 .../doctype/review_level/review_level.json    | 42 +++++++++--
 3 files changed, 150 insertions(+), 7 deletions(-)

diff --git a/frappe/social/doctype/energy_point_settings/energy_point_settings.json b/frappe/social/doctype/energy_point_settings/energy_point_settings.json
index 2cf1fb6793..3fee8fb594 100644
--- a/frappe/social/doctype/energy_point_settings/energy_point_settings.json
+++ b/frappe/social/doctype/energy_point_settings/energy_point_settings.json
@@ -80,6 +80,74 @@
    "set_only_once": 0,
    "translatable": 0,
    "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "Weekly",
+   "fetch_if_empty": 0,
+   "fieldname": "point_allocation_periodicity",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Point Allocation Periodicity",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Daily\nWeekly\nMonthly",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "last_point_allocation_date",
+   "fieldtype": "Date",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Last Point Allocation Date",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   }
  ],
  "has_web_view": 0,
@@ -92,7 +160,7 @@
  "issingle": 1,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-03-19 16:29:17.466781",
+ "modified": "2019-03-21 15:47:30.230995",
  "modified_by": "Administrator",
  "module": "Social",
  "name": "Energy Point Settings",
diff --git a/frappe/social/doctype/energy_point_settings/energy_point_settings.py b/frappe/social/doctype/energy_point_settings/energy_point_settings.py
index 5a367304ca..e1d151cef4 100644
--- a/frappe/social/doctype/energy_point_settings/energy_point_settings.py
+++ b/frappe/social/doctype/energy_point_settings/energy_point_settings.py
@@ -3,12 +3,53 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-# import frappe
-from frappe.model.document import Document
 import frappe
+from frappe.model.document import Document
+from frappe.social.doctype.energy_point_log.energy_point_log import create_review_points_log
+from frappe.utils import add_to_date, today
 
 class EnergyPointSettings(Document):
 	pass
 
 def is_energy_point_enabled():
 	return frappe.get_cached_value('Energy Point Settings', None, 'enabled')
+
+def allocate_review_points():
+	settings = frappe.get_single('Energy Point Settings')
+
+	if not can_allocate_today(settings.last_point_allocation_date,
+		settings.point_allocation_periodicity):
+		return
+
+	for level in settings.review_levels:
+		create_review_points(level)
+
+	settings.last_point_allocation_date = today()
+	settings.save(ignore_permissions=True)
+
+def create_review_points(level):
+	users = get_users_with_role(level.role)
+	for user in users:
+		create_review_points_log(user, level.review_points)
+
+def can_allocate_today(last_date, periodicity):
+	if not last_date:
+		return True
+		days_to_add = {
+			'Daily': 1,
+			'Weekly': 7,
+			'Monthly': 30
+		}.get(periodicity, 1)
+
+		next_allocation_date = add_to_date(last_date, days=days_to_add)
+
+		return next_allocation_date <= today()
+
+
+def get_users_with_role(role):
+	return [p[0] for p in frappe.db.sql("""SELECT DISTINCT `tabUser`.`name`
+		FROM `tabHas Role`, `tabUser`
+		WHERE `tabHas Role`.`role`=%s
+		AND `tabUser`.`name`!='Administrator'
+		AND `tabHas Role`.`parent`=`tabUser`.`name`
+		AND `tabUser`.`enabled`=1""", role)]
\ No newline at end of file
diff --git a/frappe/social/doctype/review_level/review_level.json b/frappe/social/doctype/review_level/review_level.json
index 94eb5bffdd..4450467dc5 100644
--- a/frappe/social/doctype/review_level/review_level.json
+++ b/frappe/social/doctype/review_level/review_level.json
@@ -40,11 +40,45 @@
    "read_only": 0,
    "remember_last_selected_value": 0,
    "report_hide": 0,
-   "reqd": 0,
+   "reqd": 1,
    "search_index": 0,
    "set_only_once": 0,
    "translatable": 0,
-   "unique": 0
+   "unique": 1
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "role",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Role",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Role",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 1
   },
   {
    "allow_bulk_edit": 0,
@@ -73,7 +107,7 @@
    "read_only": 0,
    "remember_last_selected_value": 0,
    "report_hide": 0,
-   "reqd": 0,
+   "reqd": 1,
    "search_index": 0,
    "set_only_once": 0,
    "translatable": 0,
@@ -90,7 +124,7 @@
  "issingle": 0,
  "istable": 1,
  "max_attachments": 0,
- "modified": "2019-03-19 16:28:42.170502",
+ "modified": "2019-03-21 15:42:51.431424",
  "modified_by": "Administrator",
  "module": "Social",
  "name": "Review Level",

From 63288628ca70e6262b6efa0a190ee2377809e4bc Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 22 Mar 2019 10:03:06 +0530
Subject: [PATCH 022/256] feat: Inti ability to give review points

---
 frappe/public/js/frappe/form/form_sidebar.js  | 21 +++++++++--
 .../energy_point_log/energy_point_log.py      | 36 +++++++++++++++++--
 .../energy_point_rule/energy_point_rule.py    |  4 +--
 3 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/frappe/public/js/frappe/form/form_sidebar.js b/frappe/public/js/frappe/form/form_sidebar.js
index 7bc403c5e0..e8854ae100 100644
--- a/frappe/public/js/frappe/form/form_sidebar.js
+++ b/frappe/public/js/frappe/form/form_sidebar.js
@@ -175,13 +175,30 @@ frappe.ui.form.Sidebar = Class.extend({
 			'fields': [{
 				fieldname: 'points',
 				fieldtype: 'Int',
-				label: __('Points')
+				label: __('Points'),
+				description: __(`Currently you have ${frappe.boot.review_points} review points`)
 			}, {
 				fieldtype: 'Small Text',
 				fieldname: 'reason',
 				label: __('Reason')
 			}],
-			primary_action: function() { },
+			primary_action: (values) => {
+				if (values.points >= frappe.boot.review_points) {
+					return frappe.msgprint(__('You do not have enough points'));
+				}
+				// Add energy point log -- need api for that
+				frappe.xcall('frappe.social.doctype.energy_point_log.energy_point_log.give_points', {
+					doc: {
+						doctype: this.frm.doc.doctype,
+						name: this.frm.doc.name,
+					},
+					to_user: this.frm.doc.owner,
+					points: values.points,
+					reason: values.reason
+				}).then(() => review_dialog.hide());
+				// deduct review points from the user
+				// Alert
+			},
 			primary_action_label: __('Send Points')
 		});
 
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index d851a06fb1..f6d538ea3b 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -4,12 +4,14 @@
 
 from __future__ import unicode_literals
 import frappe
+from frappe import _
+import json
 from frappe.model.document import Document
 from frappe.utils import cint
 
 class EnergyPointLog(Document):
 	def after_insert(self):
-		if self.type != 'Review':
+		if self.type == 'Auto':
 			message='=== You gained <b>{}</b> points ==='.format(self.points)
 			frappe.publish_realtime('points_gained', message=message , user=self.user)
 
@@ -49,4 +51,34 @@ def get_energy_points(user, points_type=None):
 		'type': points_type
 	}, fields=['SUM(`points`) as points'], group_by='user')
 
-	return log[0].points if log else 0
\ No newline at end of file
+	return log[0].points if log else 0
+
+@frappe.whitelist()
+def give_points(doc, points, to_user, reason):
+	current_review_points = get_energy_points(frappe.session.user, 'Review')
+	print(doc)
+	doc = frappe._dict(json.loads(doc))
+	points = cint(points)
+	if current_review_points < abs(points):
+		frappe.msgprint(_('You do not have enough review points'))
+		return
+
+	# deduct review points from reviewer
+	create_review_points_log(
+		user=frappe.session.user,
+		points=-abs(points),
+		reason=reason
+	)
+
+	create_energy_points_log(doc.doctype, doc.name, {
+		'type': 'Appreciation',
+		'reason': reason,
+		'points': points,
+		'user': to_user
+	})
+	message = _('{} appreciated your work on {} with {} points'.format(
+		frappe.session.user,
+		doc.name,
+		points
+	))
+	frappe.publish_realtime('points_gained', message=message , user=to_user)
\ No newline at end of file
diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
index 40fa4bb877..ca84ab4e86 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
@@ -7,7 +7,7 @@ import frappe
 from frappe.model.document import Document
 from frappe.utils import cint
 from frappe.social.doctype.energy_point_settings.energy_point_settings import is_energy_point_enabled
-from frappe.social.doctype.energy_point_log.energy_point_log import create_energy_point_log
+from frappe.social.doctype.energy_point_log.energy_point_log import create_energy_points_log
 
 class EnergyPointRule(Document):
 	def apply(self, doc):
@@ -23,7 +23,7 @@ class EnergyPointRule(Document):
 			user = doc.get(self.user_field)
 			rule = self.name
 
-			create_energy_point_log(reference_doctype, reference_name, {
+			create_energy_points_log(reference_doctype, reference_name, {
 				'points': points,
 				'user': user,
 				'rule': rule

From ae1db4613c1f9c273b6cb7c5c7b6914ec2b4b4fe Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 25 Mar 2019 11:04:43 +0530
Subject: [PATCH 023/256] feat: Add more data to energy point history page

---
 .../energy_point_history/energy_point_history.js    | 13 +++++--------
 .../energy_point_history/energy_point_history.json  |  5 +++--
 .../energy_point_transactions.html                  |  5 +++--
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/frappe/core/page/energy_point_history/energy_point_history.js b/frappe/core/page/energy_point_history/energy_point_history.js
index cb53cef9e4..e3c98c54d5 100644
--- a/frappe/core/page/energy_point_history/energy_point_history.js
+++ b/frappe/core/page/energy_point_history/energy_point_history.js
@@ -1,19 +1,16 @@
 frappe.pages['energy-point-history'].on_page_load = function(wrapper) {
 	const page = frappe.ui.make_app_page({
 		parent: wrapper,
-		title: 'Transaction',
+		title: 'Energy Point History',
 		single_column: true,
 		btn_primary: console.log
 
 	});
-	console.log(page);
 	frappe.db.get_list('Energy Point Log', {
-		filters: { user: frappe.session.user },
-		fields: ['point', 'reason']
-	})
-	.then((data) => {
-		console.log(data);
+		filters: { user: frappe.session.user, type: ['not in', 'Review'] },
+		fields: ['points', 'reason', 'rule', 'reference_doctype', 'reference_name', 'type']
+	}).then((data) => {
 		$(frappe.render_template('energy_point_transactions', {data: data}))
 			.appendTo(page.body);
-	})
+	});
 }
\ No newline at end of file
diff --git a/frappe/core/page/energy_point_history/energy_point_history.json b/frappe/core/page/energy_point_history/energy_point_history.json
index 350feba8f4..ba9563f0cd 100644
--- a/frappe/core/page/energy_point_history/energy_point_history.json
+++ b/frappe/core/page/energy_point_history/energy_point_history.json
@@ -4,7 +4,7 @@
  "docstatus": 0,
  "doctype": "Page",
  "idx": 0,
- "modified": "2018-08-06 12:43:28.480030",
+ "modified": "2019-03-23 19:25:26.947734",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "energy-point-history",
@@ -14,5 +14,6 @@
  "script": null,
  "standard": "Yes",
  "style": null,
- "system_page": 1
+ "system_page": 1,
+ "title": "Energy Point History"
 }
\ No newline at end of file
diff --git a/frappe/core/page/energy_point_history/energy_point_transactions.html b/frappe/core/page/energy_point_history/energy_point_transactions.html
index 90466ce8b8..e3eee35ca0 100644
--- a/frappe/core/page/energy_point_history/energy_point_transactions.html
+++ b/frappe/core/page/energy_point_history/energy_point_transactions.html
@@ -2,8 +2,9 @@
     <ul class="list-group">
     {% for d in data %}
         <li class="list-item">
-            <span class="text-success mr-2">{{d.point}}</span>
-            <span class="text-muted">{{d.reason}}</span>
+            <span class="text-success mr-2">{{d.points}}</span>
+            <span class="text-muted">{{d.reason || d.rule}}</span>
+            <span class="text-muted">{{d.reference_doctype}}:{{d.reference_name}}</span>
         </li>
     {% endfor %}
     </ul>

From c30af981e5bc67247c1ef19f79ad1132c8219b11 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 25 Mar 2019 11:07:06 +0530
Subject: [PATCH 024/256] feat: Abstract review feature to separate file

---
 frappe/public/build.json                      |   1 +
 frappe/public/js/frappe/form/form_sidebar.js  |  39 +-----
 frappe/public/js/frappe/form/review.js        | 120 ++++++++++++++++++
 frappe/public/less/sidebar.less               |  26 ++++
 .../energy_point_log/energy_point_log.py      |   7 +-
 .../energy_point_settings.py                  |   1 -
 6 files changed, 155 insertions(+), 39 deletions(-)
 create mode 100644 frappe/public/js/frappe/form/review.js

diff --git a/frappe/public/build.json b/frappe/public/build.json
index f2285fd4aa..43b6905f3c 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -286,6 +286,7 @@
 		"public/js/frappe/form/form_sidebar.js",
 		"public/js/frappe/form/user_image.js",
 		"public/js/frappe/form/share.js",
+		"public/js/frappe/form/review.js",
 		"public/js/frappe/form/form_viewers.js",
 		"public/js/frappe/form/footer/attachment.html",
 		"public/js/frappe/form/footer/form_footer.html",
diff --git a/frappe/public/js/frappe/form/form_sidebar.js b/frappe/public/js/frappe/form/form_sidebar.js
index e8854ae100..877f63f9af 100644
--- a/frappe/public/js/frappe/form/form_sidebar.js
+++ b/frappe/public/js/frappe/form/form_sidebar.js
@@ -167,42 +167,11 @@ frappe.ui.form.Sidebar = Class.extend({
 			this.ratings.find(".rating-icons").html(rating_icons);
 		}
 	},
+
 	make_review: function() {
-		const button = this.sidebar.find(".form-attachments").append('<a>Give Points</a>');
-
-		const review_dialog = new frappe.ui.Dialog({
-			'title': __('Review'),
-			'fields': [{
-				fieldname: 'points',
-				fieldtype: 'Int',
-				label: __('Points'),
-				description: __(`Currently you have ${frappe.boot.review_points} review points`)
-			}, {
-				fieldtype: 'Small Text',
-				fieldname: 'reason',
-				label: __('Reason')
-			}],
-			primary_action: (values) => {
-				if (values.points >= frappe.boot.review_points) {
-					return frappe.msgprint(__('You do not have enough points'));
-				}
-				// Add energy point log -- need api for that
-				frappe.xcall('frappe.social.doctype.energy_point_log.energy_point_log.give_points', {
-					doc: {
-						doctype: this.frm.doc.doctype,
-						name: this.frm.doc.name,
-					},
-					to_user: this.frm.doc.owner,
-					points: values.points,
-					reason: values.reason
-				}).then(() => review_dialog.hide());
-				// deduct review points from the user
-				// Alert
-			},
-			primary_action_label: __('Send Points')
+		this.frm.reviews = new frappe.ui.form.Review({
+			parent: this.sidebar.find(".form-attachments"),
+			frm: this.frm
 		});
-
-
-		button.click(() => review_dialog.show());
 	}
 });
diff --git a/frappe/public/js/frappe/form/review.js b/frappe/public/js/frappe/form/review.js
new file mode 100644
index 0000000000..f4324f5cae
--- /dev/null
+++ b/frappe/public/js/frappe/form/review.js
@@ -0,0 +1,120 @@
+// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
+// MIT License. See license.txt
+
+frappe.provide("frappe.ui.form");
+
+frappe.ui.form.Review = class Review {
+	constructor({parent, frm}) {
+		this.parent = parent;
+		this.frm = frm;
+		this.make_review_container();
+		this.add_review_button();
+	}
+	make_review_container() {
+		this.$wrapper = this.parent.append(`
+			<ul class="list-unstyled sidebar-menu">
+				<li class="divider"></li>
+				<li class="h6 shared-with-label">${__('Reviews')}</li>
+				<li class="review-list"></li>
+			</ul>
+		`);
+	}
+	add_review_button() {
+		this.review_list_wrapper = this.$wrapper.find('.review-list');
+
+		Object.keys(frappe.boot.user_info).forEach((user) => {
+			this.review_list_wrapper.append(`
+				<span class="review-pill">
+					${frappe.avatar(user)}
+					<span class="text-muted">
+						${Math.floor(Math.random() * 100) + 1}
+					</span>
+				</span>
+			`);
+		});
+
+		this.review_list_wrapper.append(`
+			<span class="avatar avatar-small avatar-empty share-doc-btn cursor-pointer" title="${__("Review")}">
+				<i class="octicon octicon-plus text-muted" style="position: relative; left: 4.5px;"></i>
+			</span>
+		`);
+
+		this.review_list_wrapper.find('.share-doc-btn').click(() => this.show());
+
+	}
+	get_involved_users() {
+		const user_fields = this.frm.meta.fields
+			.filter(d => d.fieldtype === 'Link' && d.options === 'User')
+			.map(d => d.fieldname);
+
+		user_fields.push('owner');
+		let involved_users = user_fields.map(field => this.frm.doc[field]);
+
+		const docinfo = this.frm.get_docinfo();
+
+		involved_users.concat(docinfo.communications.map(d => d.sender && d.delivery_status==='sent'));
+		involved_users.concat(docinfo.comments.map(d => d.owner));
+		involved_users.concat(docinfo.versions.map(d => d.owner));
+		involved_users.concat(docinfo.assignments.map(d => d.owner));
+
+		involved_users = [...new Set(involved_users)];
+		return involved_users.filter(Boolean);
+	}
+	show() {
+		const review_dialog = new frappe.ui.Dialog({
+			'title': __('Review'),
+			'fields': [{
+				fieldname: 'to_user',
+				fieldtype: 'Select',
+				label: __('To User'),
+				options: this.get_involved_users(),
+				default: this.frm.doc.owner
+			}, {
+				fieldname: 'action',
+				fieldtype: 'Select',
+				label: __('Action'),
+				options: [{
+					'label': __('Appreciate'),
+					'value': 'Appreciation'
+				}, {
+					'label': __('Criticize'),
+					'value': 'Criticism'
+				}],
+				default: 'Appreciation'
+			}, {
+				fieldname: 'points',
+				fieldtype: 'Int',
+				label: __('Points'),
+				reqd: 1,
+				description: __(`Currently you have ${frappe.boot.review_points} review points`)
+			}, {
+				fieldtype: 'Small Text',
+				fieldname: 'reason',
+				reqd: 1,
+				label: __('Reason')
+			}],
+			primary_action: (values) => {
+				if (values.points >= frappe.boot.review_points) {
+					return frappe.msgprint(__('You do not have enough points'));
+				}
+				// Add energy point log -- need api for that
+				frappe.xcall('frappe.social.doctype.energy_point_log.energy_point_log.review', {
+					doc: {
+						doctype: this.frm.doc.doctype,
+						name: this.frm.doc.name,
+					},
+					to_user: values.to_user,
+					points: values.points,
+					reason: values.reason
+				}).then(() => {
+					review_dialog.hide();
+					review_dialog.clear();
+				});
+				// deduct review points from the user
+				// Alert
+			},
+			primary_action_label: __('Send')
+		});
+		review_dialog.show();
+	}
+};
diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less
index 879519c325..6ed1e49370 100644
--- a/frappe/public/less/sidebar.less
+++ b/frappe/public/less/sidebar.less
@@ -376,3 +376,29 @@ body[data-route^="Module"] .main-menu {
 .assignment-row {
 	margin-bottom: 5px;
 }
+
+.review-list {
+	display: flex;
+	flex-wrap: wrap;
+	.review-pill {
+		width: 50px;
+		border: 1px solid #d2d8dd;
+		border-radius: 4px;
+		display: flex;
+		margin-right: 5px;
+		margin-bottom: 10px;
+		.avatar {
+			padding: 0px;
+			margin: 0px;
+		}
+		.standard-image {
+			border-left: 0;
+		}
+		span:nth-child(2) {
+			flex-basis: 50%;
+			text-align: center;
+			align-self: center;
+			font-size: @text-small;
+		}
+	}
+}
\ No newline at end of file
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index f6d538ea3b..7ca75c91f4 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -54,9 +54,8 @@ def get_energy_points(user, points_type=None):
 	return log[0].points if log else 0
 
 @frappe.whitelist()
-def give_points(doc, points, to_user, reason):
+def review(doc, points, to_user, reason, review_type='Appreciation'):
 	current_review_points = get_energy_points(frappe.session.user, 'Review')
-	print(doc)
 	doc = frappe._dict(json.loads(doc))
 	points = cint(points)
 	if current_review_points < abs(points):
@@ -71,14 +70,16 @@ def give_points(doc, points, to_user, reason):
 	)
 
 	create_energy_points_log(doc.doctype, doc.name, {
-		'type': 'Appreciation',
+		'type': review_type,
 		'reason': reason,
 		'points': points,
 		'user': to_user
 	})
+
 	message = _('{} appreciated your work on {} with {} points'.format(
 		frappe.session.user,
 		doc.name,
 		points
 	))
+
 	frappe.publish_realtime('points_gained', message=message , user=to_user)
\ No newline at end of file
diff --git a/frappe/social/doctype/energy_point_settings/energy_point_settings.py b/frappe/social/doctype/energy_point_settings/energy_point_settings.py
index e1d151cef4..d343e9e32d 100644
--- a/frappe/social/doctype/energy_point_settings/energy_point_settings.py
+++ b/frappe/social/doctype/energy_point_settings/energy_point_settings.py
@@ -34,7 +34,6 @@ def create_review_points(level):
 
 def can_allocate_today(last_date, periodicity):
 	if not last_date:
-		return True
 		days_to_add = {
 			'Daily': 1,
 			'Weekly': 7,

From 7fee2c42f3981b56ad22e622dac9bd5478659da0 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 25 Mar 2019 11:09:07 +0530
Subject: [PATCH 025/256] fix(build): Disable spread transpilation

- https://github.com/bublejs/buble/issues/81
---
 rollup/config.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rollup/config.js b/rollup/config.js
index f645eae498..4ed9423a49 100644
--- a/rollup/config.js
+++ b/rollup/config.js
@@ -55,7 +55,9 @@ function get_rollup_options_for_js(output_file, input_files) {
 			objectAssign: 'Object.assign',
 			transforms: {
 				dangerousForOf: true,
-				classes: false
+				classes: false,
+				// https://github.com/bublejs/buble/issues/81
+				spreadRest: false
 			},
 			exclude: [path.resolve(bench_path, '**/*.css'), path.resolve(bench_path, '**/*.less')]
 		}),

From 7dc1fec27ca956355c3b630e8107538eeaafed2d Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Mon, 25 Mar 2019 11:43:08 +0530
Subject: [PATCH 026/256] feat(Naming Series): Option to Add field_value in
 Naming Series (#7027)

To use field_value in naming_series, just add field_name in curly braces instead of the old naming convention which was kinda confusing and not easily understandable.
eg: {field_name}.-.YYYY.-.MM.-.DD.-.####
---
 frappe/core/doctype/doctype/doctype.json | 3890 +++++++++++-----------
 frappe/model/document.py                 |    2 +-
 frappe/model/naming.py                   |   22 +-
 3 files changed, 1958 insertions(+), 1956 deletions(-)

diff --git a/frappe/core/doctype/doctype/doctype.json b/frappe/core/doctype/doctype/doctype.json
index 2d584eff5c..b6d3a83cf1 100644
--- a/frappe/core/doctype/doctype/doctype.json
+++ b/frappe/core/doctype/doctype/doctype.json
@@ -1,2078 +1,2078 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 1, 
- "autoname": "Prompt", 
- "beta": 0, 
- "creation": "2013-02-18 13:36:19", 
- "custom": 0, 
- "description": "DocType is a Table / Form in the application.", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 1,
+ "autoname": "Prompt",
+ "beta": 0,
+ "creation": "2013-02-18 13:36:19",
+ "custom": 0,
+ "description": "DocType is a Table / Form in the application.",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Document",
+ "editable_grid": 0,
+ "engine": "InnoDB",
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "sb0", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "sb0",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Section Break",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "module", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Module", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "module", 
-   "oldfieldtype": "Link", 
-   "options": "Module Def", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "module",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Module",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "module",
+   "oldfieldtype": "Link",
+   "options": "Module Def",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 1,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Child Tables are shown as a Grid in other DocTypes.", 
-   "fieldname": "istable", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Is Child Table", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "istable", 
-   "oldfieldtype": "Check", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "Child Tables are shown as a Grid in other DocTypes.",
+   "fieldname": "istable",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 1,
+   "label": "Is Child Table",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "istable",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:!doc.istable", 
-   "description": "Single Types have only one record no tables associated. Values are stored in tabSingles", 
-   "fieldname": "issingle", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Is Single", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "issingle", 
-   "oldfieldtype": "Check", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 1, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:!doc.istable",
+   "description": "Single Types have only one record no tables associated. Values are stored in tabSingles",
+   "fieldname": "issingle",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 1,
+   "label": "Is Single",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "issingle",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 1,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "1", 
-   "depends_on": "istable", 
-   "fieldname": "editable_grid", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Editable Grid", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "1",
+   "depends_on": "istable",
+   "fieldname": "editable_grid",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Editable Grid",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "cb01", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "cb01",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "1", 
-   "depends_on": "eval:!doc.istable && !doc.issingle", 
-   "fieldname": "quick_entry", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Quick Entry", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "1",
+   "depends_on": "eval:!doc.istable && !doc.issingle",
+   "fieldname": "quick_entry",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Quick Entry",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "1", 
-   "depends_on": "eval:!doc.istable", 
-   "fieldname": "track_changes", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Track Changes", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "1",
+   "depends_on": "eval:!doc.istable",
+   "fieldname": "track_changes",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Track Changes",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "custom", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Custom?", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "custom",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Custom?",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "beta", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Beta", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "beta",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Beta",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fieldname": "track_views", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Track Views", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "0",
+   "fieldname": "track_views",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Track Views",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "depends_on": "eval: doc.image_field", 
-   "fieldname": "image_view", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Image View", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "0",
+   "depends_on": "eval: doc.image_field",
+   "fieldname": "image_view",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Image View",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "app", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "App", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "app",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "App",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "fields_section_break", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Fields", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "fields_section_break",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Fields",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Section Break",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "fields", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Fields", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "fields", 
-   "oldfieldtype": "Table", 
-   "options": "DocField", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "fields",
+   "fieldtype": "Table",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Fields",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "fields",
+   "oldfieldtype": "Table",
+   "options": "DocField",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "sb1", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Naming", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "sb1",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Naming",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Naming Options:\n<ol><li><b>field:[fieldname]</b> - By Field</li><li><b>naming_series:</b> - By Naming Series (field called naming_series must be present</li><li><b>Prompt</b> - Prompt user for a name</li><li><b>[series]</b> - Series by prefix (separated by a dot); for example PRE.#####</li>\n<li><b>format:EXAMPLE-{MM}morewords{fieldname1}-{fieldname2}-{#####}</b> - Replace all braced words (fieldnames, date words (DD, MM, YY), series) with their value. Outside braces, any characters can be used.</li></ol>", 
-   "fieldname": "autoname", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Auto Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "autoname", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "Naming Options:\n<ol><li><b>field:[fieldname]</b> - By Field</li><li><b>naming_series:</b> - By Naming Series (field called naming_series must be present)</li><li><b>Prompt</b> - Prompt user for a name</li><li><b>[series]</b> - Series by prefix (separated by a dot); for example PRE.#####</li>\n<li><b>format:EXAMPLE-{MM}morewords{fieldname1}-{fieldname2}-{#####}</b> - Replace all braced words (fieldnames, date words (DD, MM, YY), series) with their value. Outside braces, any characters can be used.</li></ol>",
+   "fieldname": "autoname",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Auto Name",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "autoname",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "name_case", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Name Case", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "name_case", 
-   "oldfieldtype": "Select", 
-   "options": "\nTitle Case\nUPPER CASE", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "name_case",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Name Case",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "name_case",
+   "oldfieldtype": "Select",
+   "options": "\nTitle Case\nUPPER CASE",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "column_break_15", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "fieldname": "column_break_15",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "description", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "description", 
-   "oldfieldtype": "Text", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "description",
+   "fieldtype": "Small Text",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Description",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "description",
+   "oldfieldtype": "Text",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "view_settings", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "View Settings", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "view_settings",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "View Settings",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:!doc.istable", 
-   "description": "", 
-   "fieldname": "title_field", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Title Field", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:!doc.istable",
+   "description": "",
+   "fieldname": "title_field",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Title Field",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:!doc.istable", 
-   "fieldname": "search_fields", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Search Fields", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "search_fields", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:!doc.istable",
+   "fieldname": "search_fields",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Search Fields",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "search_fields",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "image_field", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Image Field (Must of type \"Attach Image\")", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "",
+   "fieldname": "image_field",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Image Field (Must of type \"Attach Image\")",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:!doc.istable", 
-   "description": "Comments and Communications will be associated with this linked document", 
-   "fieldname": "timeline_field", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Timeline Field", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:!doc.istable",
+   "description": "Comments and Communications will be associated with this linked document",
+   "fieldname": "timeline_field",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Timeline Field",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "allow_events_in_timeline", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Allow events in timeline", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "allow_events_in_timeline",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Allow events in timeline",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_29", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_29",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "document_type", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Show in Module Section", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "document_type", 
-   "oldfieldtype": "Select", 
-   "options": "\nDocument\nSetup\nSystem\nOther", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "",
+   "fieldname": "document_type",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Show in Module Section",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "document_type",
+   "oldfieldtype": "Select",
+   "options": "\nDocument\nSetup\nSystem\nOther",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "restrict_to_domain", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Restrict To Domain", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Domain", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "restrict_to_domain",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Restrict To Domain",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Domain",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "icon", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Icon", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "icon",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Icon",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "color", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Color", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "color",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Color",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "track_seen", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Track Seen", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "track_seen",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Track Seen",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "read_only_onload", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Show Print First", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "read_only_onload", 
-   "oldfieldtype": "Check", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "read_only_onload",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Show Print First",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "read_only_onload",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "hide_heading", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Hide Heading", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "hide_heading", 
-   "oldfieldtype": "Check", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "hide_heading",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Hide Heading",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "hide_heading",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "hide_toolbar", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Hide Toolbar", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "hide_toolbar", 
-   "oldfieldtype": "Check", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "hide_toolbar",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Hide Toolbar",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "hide_toolbar",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "allow_copy", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Hide Copy", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "allow_copy", 
-   "oldfieldtype": "Check", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "allow_copy",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Hide Copy",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "allow_copy",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "show_name_in_global_search", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Make \"name\" searchable in Global Search", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "show_name_in_global_search",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Make \"name\" searchable in Global Search",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:!doc.istable", 
-   "fieldname": "sb2", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Permission Rules", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:!doc.istable",
+   "fieldname": "sb2",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Permission Rules",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "permissions", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Permissions", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "permissions", 
-   "oldfieldtype": "Table", 
-   "options": "DocPerm", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "fieldname": "permissions",
+   "fieldtype": "Table",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Permissions",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "permissions",
+   "oldfieldtype": "Table",
+   "options": "DocPerm",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:!doc.istable", 
-   "fieldname": "sb3", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:!doc.istable",
+   "fieldname": "sb3",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "cb30", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Permissions Settings", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "cb30",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Permissions Settings",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "is_submittable", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Is Submittable", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "is_submittable",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Is Submittable",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "allow_import", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Allow Import (via Data Import Tool)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "",
+   "fieldname": "allow_import",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Allow Import (via Data Import Tool)",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "allow_rename", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Allow Rename", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "allow_rename", 
-   "oldfieldtype": "Check", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "allow_rename",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Allow Rename",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "allow_rename",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "cb31", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Other Settings", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "cb31",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Other Settings",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "max_attachments", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Max Attachments", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "max_attachments", 
-   "oldfieldtype": "Int", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "max_attachments",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Max Attachments",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "max_attachments",
+   "oldfieldtype": "Int",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "default_print_format", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Default Print Format", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "default_print_format",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Default Print Format",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "list_view_settings", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "List View Settings", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "list_view_settings",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "List View Settings",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "modified", 
-   "depends_on": "eval:!doc.istable", 
-   "description": "", 
-   "fieldname": "sort_field", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Sort Field", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "modified",
+   "depends_on": "eval:!doc.istable",
+   "description": "",
+   "fieldname": "sort_field",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Sort Field",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "DESC", 
-   "depends_on": "eval:!doc.istable", 
-   "fieldname": "sort_order", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Sort Order", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "ASC\nDESC", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "DESC",
+   "depends_on": "eval:!doc.istable",
+   "fieldname": "sort_order",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Sort Order",
+   "length": 0,
+   "no_copy": 0,
+   "options": "ASC\nDESC",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_47", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_47",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "read_only", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "User Cannot Search", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "read_only", 
-   "oldfieldtype": "Check", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "read_only",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "User Cannot Search",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "read_only",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "in_create", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "User Cannot Create", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "in_create", 
-   "oldfieldtype": "Check", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "in_create",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "User Cannot Create",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "in_create",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "web_view", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Web View", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "web_view",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Web View",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fieldname": "has_web_view", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Has Web View", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "0",
+   "fieldname": "has_web_view",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Has Web View",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "depends_on": "has_web_view", 
-   "fieldname": "allow_guest_to_view", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Allow Guest to View", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "0",
+   "depends_on": "has_web_view",
+   "fieldname": "allow_guest_to_view",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Allow Guest to View",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_53", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_53",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "has_web_view", 
-   "fieldname": "route", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Route", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "has_web_view",
+   "fieldname": "route",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Route",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "depends_on": "has_web_view", 
-   "fieldname": "is_published_field", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Is Published Field", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "",
+   "depends_on": "has_web_view",
+   "fieldname": "is_published_field",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Is Published Field",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "advanced", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Advanced", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "columns": 0,
+   "fieldname": "advanced",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Advanced",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "InnoDB", 
-   "depends_on": "eval:!doc.issingle", 
-   "fieldname": "engine", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Database Engine", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "InnoDB\nMyISAM", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "InnoDB",
+   "depends_on": "eval:!doc.issingle",
+   "fieldname": "engine",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Database Engine",
+   "length": 0,
+   "no_copy": 0,
+   "options": "InnoDB\nMyISAM",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-bolt", 
- "idx": 6, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-09-24 13:57:58.777786", 
- "modified_by": "chdecultot@dokos.io", 
- "module": "Core", 
- "name": "DocType", 
- "owner": "Administrator", 
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "icon": "fa fa-bolt",
+ "idx": 6,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2018-09-24 13:57:58.777786",
+ "modified_by": "chdecultot@dokos.io",
+ "module": "Core",
+ "name": "DocType",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "set_user_permissions": 0,
+   "share": 0,
+   "submit": 0,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Administrator", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Administrator",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
    "write": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "search_fields": "module", 
- "show_name_in_global_search": 1, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0, 
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "search_fields": "module",
+ "show_name_in_global_search": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0,
  "track_views": 0
 }
\ No newline at end of file
diff --git a/frappe/model/document.py b/frappe/model/document.py
index 7e52137942..1d14079866 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -213,12 +213,12 @@ class Document(BaseDocument):
 		self.set_docstatus()
 		self.check_if_latest()
 		self.run_method("before_insert")
+		self._validate_links()
 		self.set_new_name()
 		self.set_parent_in_children()
 		self.validate_higher_perm_levels()
 
 		self.flags.in_insert = True
-		self._validate_links()
 		self.run_before_save_methods()
 		self._validate()
 		self.set_docstatus()
diff --git a/frappe/model/naming.py b/frappe/model/naming.py
index f5b00085fd..648e3689f3 100644
--- a/frappe/model/naming.py
+++ b/frappe/model/naming.py
@@ -88,21 +88,21 @@ def set_name_by_naming_series(doc):
 
 def make_autoname(key='', doctype='', doc=''):
 	"""
-   Creates an autoname from the given key:
+	Creates an autoname from the given key:
 
-   **Autoname rules:**
+	**Autoname rules:**
 
-         * The key is separated by '.'
-         * '####' represents a series. The string before this part becomes the prefix:
-            Example: ABC.#### creates a series ABC0001, ABC0002 etc
-         * 'MM' represents the current month
-         * 'YY' and 'YYYY' represent the current year
+		 * The key is separated by '.'
+		 * '####' represents a series. The string before this part becomes the prefix:
+			Example: ABC.#### creates a series ABC0001, ABC0002 etc
+		 * 'MM' represents the current month
+		 * 'YY' and 'YYYY' represent the current year
 
 
    *Example:*
 
-         * DE/./.YY./.MM./.##### will create a series like
-           DE/09/01/0001 where 09 is the year, 01 is the month and 0001 is the series
+		 * DE/./.YY./.MM./.##### will create a series like
+		   DE/09/01/0001 where 09 is the year, 01 is the month and 0001 is the series
 	"""
 	if key == "hash":
 		return frappe.generate_hash(doctype, 10)
@@ -121,7 +121,6 @@ def parse_naming_series(parts, doctype='', doc=''):
 	n = ''
 	if isinstance(parts, string_types):
 		parts = parts.split('.')
-
 	series_set = False
 	today = now_datetime()
 	for e in parts:
@@ -141,6 +140,9 @@ def parse_naming_series(parts, doctype='', doc=''):
 			part = today.strftime('%Y')
 		elif e == 'FY':
 			part = frappe.defaults.get_user_default("fiscal_year")
+		elif e.startswith('{') and doc:
+			e = e.replace('{', '').replace('}', '')
+			part = doc.get(e)
 		elif doc and doc.get(e):
 			part = doc.get(e)
 		else:

From 762813a076dfcf6a8251ceae7443ae35357f7cdd Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Tue, 8 Jan 2019 23:05:45 +0530
Subject: [PATCH 027/256] feat(dashboard): Create Dashboard page

---
 frappe/core/page/dashboard/__init__.py    |  0
 frappe/core/page/dashboard/dashboard.js   | 29 +++++++++++++++++++++++
 frappe/core/page/dashboard/dashboard.json | 19 +++++++++++++++
 frappe/core/page/dashboard/dashboard.py   | 10 ++++++++
 4 files changed, 58 insertions(+)
 create mode 100644 frappe/core/page/dashboard/__init__.py
 create mode 100644 frappe/core/page/dashboard/dashboard.js
 create mode 100644 frappe/core/page/dashboard/dashboard.json
 create mode 100644 frappe/core/page/dashboard/dashboard.py

diff --git a/frappe/core/page/dashboard/__init__.py b/frappe/core/page/dashboard/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
new file mode 100644
index 0000000000..d22584b9ba
--- /dev/null
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -0,0 +1,29 @@
+frappe.pages['dashboard'].on_page_load = function(wrapper) {
+	var page = frappe.ui.make_app_page({
+		parent: wrapper,
+		title: 'Dashboard',
+		single_column: true
+	});
+
+	$(`<div class="dashboard page-main-content">
+		<div class="dashboard-graph"></div>
+	</div>`).appendTo(this.page.main);
+
+	frappe.call({
+		method: "frappe.core.page.dashboard.dashboard.get_data",
+		args: {
+			dashboard_name: "erpnext.accounts.dashboard.get",
+		},
+		callback: function(message) {
+			const data = message.message
+			var chart_args = {
+				data: {
+					datasets: data.datasets,
+					labels: data.labels,
+				},
+				type: 'line',
+			}
+			new Chart('.dashboard-graph', chart_args)
+		}
+	})
+}
\ No newline at end of file
diff --git a/frappe/core/page/dashboard/dashboard.json b/frappe/core/page/dashboard/dashboard.json
new file mode 100644
index 0000000000..891dcb26f8
--- /dev/null
+++ b/frappe/core/page/dashboard/dashboard.json
@@ -0,0 +1,19 @@
+{
+ "content": null,
+ "creation": "2019-01-08 19:19:48.073410",
+ "docstatus": 0,
+ "doctype": "Page",
+ "idx": 0,
+ "modified": "2019-01-08 19:19:48.073410",
+ "modified_by": "Administrator",
+ "module": "Core",
+ "name": "dashboard",
+ "owner": "Administrator",
+ "page_name": "Dashboard",
+ "roles": [],
+ "script": null,
+ "standard": "Yes",
+ "style": null,
+ "system_page": 0,
+ "title": "Dashboard"
+}
\ No newline at end of file
diff --git a/frappe/core/page/dashboard/dashboard.py b/frappe/core/page/dashboard/dashboard.py
new file mode 100644
index 0000000000..f954dee751
--- /dev/null
+++ b/frappe/core/page/dashboard/dashboard.py
@@ -0,0 +1,10 @@
+# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
+# MIT License. See license.txt
+from __future__ import unicode_literals
+import frappe
+
+
+@frappe.whitelist()
+def get_data(dashboard_name):
+    results = frappe.get_attr(dashboard_name)()
+    return results

From 8840a179991caafcbd9a70bd853ad1b057dce063 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 9 Jan 2019 11:19:08 +0530
Subject: [PATCH 028/256] feat(dashboard): Add timespan filter

---
 frappe/core/page/dashboard/dashboard.js | 59 +++++++++++++++++--------
 frappe/core/page/dashboard/dashboard.py |  6 ++-
 2 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index d22584b9ba..859f0b52c6 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -1,29 +1,50 @@
 frappe.pages['dashboard'].on_page_load = function(wrapper) {
+	var me = this
 	var page = frappe.ui.make_app_page({
 		parent: wrapper,
 		title: 'Dashboard',
 		single_column: true
-	});
+	})
 
 	$(`<div class="dashboard page-main-content">
-		<div class="dashboard-graph"></div>
-	</div>`).appendTo(this.page.main);
+		<div id="dashboard-graph"></div>
+	</div>`).appendTo(this.page.main)
 
-	frappe.call({
-		method: "frappe.core.page.dashboard.dashboard.get_data",
-		args: {
-			dashboard_name: "erpnext.accounts.dashboard.get",
-		},
-		callback: function(message) {
-			const data = message.message
-			var chart_args = {
-				data: {
-					datasets: data.datasets,
-					labels: data.labels,
-				},
-				type: 'line',
+	this.timespans = ["Last Week", "Last Month", "Last Quarter", "Last Year"];
+	this.filters = {
+		timespan: "Week",
+	}
+	this.timespan_select = this.page.add_select(__("Timespan"),
+		this.timespans.map(d => {
+			return {"label": __(d), value: d }
+		})
+	)
+
+	this.timespan_select.on("change", function() {
+		me.filters.timespan = this.value
+		me.create_chart()
+	});
+
+	this.create_chart = function() {
+		frappe.call({
+			method: "frappe.core.page.dashboard.dashboard.get_data",
+			args: {
+				dashboard_name: "erpnext.accounts.dashboard.get",
+				filters: this.filters,
+			},
+			callback: function(message) {
+				const data = message.message
+				var chart_args = {
+					data: {
+						datasets: data.datasets,
+						labels: data.labels,
+					},
+					type: 'line',
+				}
+				new Chart('#dashboard-graph', chart_args)
 			}
-			new Chart('.dashboard-graph', chart_args)
-		}
-	})
+		})
+	}
+
+	this.create_chart()
 }
\ No newline at end of file
diff --git a/frappe/core/page/dashboard/dashboard.py b/frappe/core/page/dashboard/dashboard.py
index f954dee751..a3f26bb7df 100644
--- a/frappe/core/page/dashboard/dashboard.py
+++ b/frappe/core/page/dashboard/dashboard.py
@@ -1,10 +1,12 @@
 # Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
 from __future__ import unicode_literals
+import json
 import frappe
 
 
 @frappe.whitelist()
-def get_data(dashboard_name):
-    results = frappe.get_attr(dashboard_name)()
+def get_data(dashboard_name, filters=None):
+    filters = json.loads(filters)
+    results = frappe.get_attr(dashboard_name)(filters=frappe._dict(filters))
     return results

From 4f247a0ed551576a027f04a435ad9e306c734abe Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 9 Jan 2019 12:51:24 +0530
Subject: [PATCH 029/256] feat(dashboard): Add Time Grain filter

---
 frappe/core/page/dashboard/dashboard.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 859f0b52c6..e8917514eb 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -11,20 +11,33 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) {
 	</div>`).appendTo(this.page.main)
 
 	this.timespans = ["Last Week", "Last Month", "Last Quarter", "Last Year"];
+	this.timegrains = ["Daily", "Weekly", "Monthly", "Quarterly"];
 	this.filters = {
-		timespan: "Week",
+		timespan: "Last Week",
+		timegrain: "Daily",
 	}
-	this.timespan_select = this.page.add_select(__("Timespan"),
+	this.timespan_select = this.page.add_select(__("Time Span"),
 		this.timespans.map(d => {
 			return {"label": __(d), value: d }
 		})
 	)
 
+	this.timegrain_select = this.page.add_select(__("Time Grain"),
+		this.timegrains.map(d => {
+			return {"label": __(d), value: d }
+		})
+	)
+
 	this.timespan_select.on("change", function() {
 		me.filters.timespan = this.value
 		me.create_chart()
 	});
 
+	this.timegrain_select.on("change", function() {
+		me.filters.timegrain = this.value
+		me.create_chart()
+	});
+
 	this.create_chart = function() {
 		frappe.call({
 			method: "frappe.core.page.dashboard.dashboard.get_data",

From 94c474072921061c57355c010ffbcb3cd6feefd4 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 10 Jan 2019 12:22:32 +0530
Subject: [PATCH 030/256] feat(dashbard): Set account from filters

---
 frappe/core/page/dashboard/dashboard.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index e8917514eb..76f43118fc 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -15,7 +15,22 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) {
 	this.filters = {
 		timespan: "Last Week",
 		timegrain: "Daily",
+		account: "Cash - GTPL",
 	}
+
+	this.account_select = this.page.add_field({
+		fieldname: "account",
+		label: __("Account"),
+		fieldtype: "Link",
+		options: "Account",
+		get_query: {
+			doctype: "Account",
+			filters: {
+				company: "Gadget Technologies Pvt. Ltd.",
+			}
+		}
+	}).$wrapper.find("input")
+
 	this.timespan_select = this.page.add_select(__("Time Span"),
 		this.timespans.map(d => {
 			return {"label": __(d), value: d }
@@ -27,6 +42,10 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) {
 			return {"label": __(d), value: d }
 		})
 	)
+	this.account_select.on("change", function() {
+		me.filters.account = this.value
+		me.create_chart()
+	});
 
 	this.timespan_select.on("change", function() {
 		me.filters.timespan = this.value

From 6d404c881e6e1ffc1fb665237cce58ddf8a24e32 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 10 Jan 2019 12:49:58 +0530
Subject: [PATCH 031/256] feat(dashboard): Create chart DocType

---
 frappe/core/doctype/chart/__init__.py   |   0
 frappe/core/doctype/chart/chart.js      |   8 +
 frappe/core/doctype/chart/chart.json    | 193 ++++++++++++++++++++++++
 frappe/core/doctype/chart/chart.py      |  10 ++
 frappe/core/doctype/chart/test_chart.py |  10 ++
 5 files changed, 221 insertions(+)
 create mode 100644 frappe/core/doctype/chart/__init__.py
 create mode 100644 frappe/core/doctype/chart/chart.js
 create mode 100644 frappe/core/doctype/chart/chart.json
 create mode 100644 frappe/core/doctype/chart/chart.py
 create mode 100644 frappe/core/doctype/chart/test_chart.py

diff --git a/frappe/core/doctype/chart/__init__.py b/frappe/core/doctype/chart/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/core/doctype/chart/chart.js b/frappe/core/doctype/chart/chart.js
new file mode 100644
index 0000000000..70d191d079
--- /dev/null
+++ b/frappe/core/doctype/chart/chart.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2019, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Chart', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/frappe/core/doctype/chart/chart.json b/frappe/core/doctype/chart/chart.json
new file mode 100644
index 0000000000..267e6ad671
--- /dev/null
+++ b/frappe/core/doctype/chart/chart.json
@@ -0,0 +1,193 @@
+{
+ "allow_copy": 0,
+ "allow_events_in_timeline": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2019-01-10 12:28:06.282875",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "chart_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Chart Name",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "chart_path",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Chart Path",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "chart_type",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Chart Type",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Line\nBar",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "chart_filters_json",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Filters JSON",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2019-01-10 12:47:50.709263",
+ "modified_by": "Administrator",
+ "module": "Core",
+ "name": "Chart",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
+   "write": 1
+  }
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "chart_name",
+ "track_changes": 1,
+ "track_seen": 0,
+ "track_views": 0
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/chart/chart.py b/frappe/core/doctype/chart/chart.py
new file mode 100644
index 0000000000..28ba6ba42b
--- /dev/null
+++ b/frappe/core/doctype/chart/chart.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class Chart(Document):
+	pass
diff --git a/frappe/core/doctype/chart/test_chart.py b/frappe/core/doctype/chart/test_chart.py
new file mode 100644
index 0000000000..773e956f7b
--- /dev/null
+++ b/frappe/core/doctype/chart/test_chart.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestChart(unittest.TestCase):
+	pass

From 529536da219869676686a4f9facdd9e2b03dd552 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 10 Jan 2019 12:57:43 +0530
Subject: [PATCH 032/256] feat(dashboard): Create Dashboard DocType

---
 frappe/core/doctype/dashboard/__init__.py     |   0
 frappe/core/doctype/dashboard/dashboard.js    |   8 ++
 frappe/core/doctype/dashboard/dashboard.json  | 129 ++++++++++++++++++
 frappe/core/doctype/dashboard/dashboard.py    |  10 ++
 .../core/doctype/dashboard/test_dashboard.py  |  10 ++
 5 files changed, 157 insertions(+)
 create mode 100644 frappe/core/doctype/dashboard/__init__.py
 create mode 100644 frappe/core/doctype/dashboard/dashboard.js
 create mode 100644 frappe/core/doctype/dashboard/dashboard.json
 create mode 100644 frappe/core/doctype/dashboard/dashboard.py
 create mode 100644 frappe/core/doctype/dashboard/test_dashboard.py

diff --git a/frappe/core/doctype/dashboard/__init__.py b/frappe/core/doctype/dashboard/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/core/doctype/dashboard/dashboard.js b/frappe/core/doctype/dashboard/dashboard.js
new file mode 100644
index 0000000000..2757332f42
--- /dev/null
+++ b/frappe/core/doctype/dashboard/dashboard.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2019, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Dashboard', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/frappe/core/doctype/dashboard/dashboard.json b/frappe/core/doctype/dashboard/dashboard.json
new file mode 100644
index 0000000000..8a81fd7c87
--- /dev/null
+++ b/frappe/core/doctype/dashboard/dashboard.json
@@ -0,0 +1,129 @@
+{
+ "allow_copy": 0,
+ "allow_events_in_timeline": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2019-01-10 12:54:40.938705",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "dashboard_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Dashboard Name",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "charts",
+   "fieldtype": "Table",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Charts",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Chart",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2019-01-10 12:54:40.938705",
+ "modified_by": "Administrator",
+ "module": "Core",
+ "name": "Dashboard",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
+   "write": 1
+  }
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "dashboard_name",
+ "track_changes": 1,
+ "track_seen": 0,
+ "track_views": 0
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/dashboard/dashboard.py b/frappe/core/doctype/dashboard/dashboard.py
new file mode 100644
index 0000000000..acaeb5dc67
--- /dev/null
+++ b/frappe/core/doctype/dashboard/dashboard.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class Dashboard(Document):
+	pass
diff --git a/frappe/core/doctype/dashboard/test_dashboard.py b/frappe/core/doctype/dashboard/test_dashboard.py
new file mode 100644
index 0000000000..ac56d00642
--- /dev/null
+++ b/frappe/core/doctype/dashboard/test_dashboard.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestDashboard(unittest.TestCase):
+	pass

From 12dc6c8bb6ae07918598d5e84c50ac138be60ccd Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Tue, 15 Jan 2019 12:00:41 +0530
Subject: [PATCH 033/256] fix(dashboard): Use valid chart type in chart options

---
 frappe/core/doctype/chart/chart.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/core/doctype/chart/chart.json b/frappe/core/doctype/chart/chart.json
index 267e6ad671..74614ee097 100644
--- a/frappe/core/doctype/chart/chart.json
+++ b/frappe/core/doctype/chart/chart.json
@@ -96,7 +96,7 @@
    "label": "Chart Type",
    "length": 0,
    "no_copy": 0,
-   "options": "Line\nBar",
+   "options": "line\nbar",
    "permlevel": 0,
    "precision": "",
    "print_hide": 0,
@@ -153,7 +153,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-01-10 12:47:50.709263",
+ "modified": "2019-01-10 17:25:00.980022",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Chart",

From 23ab8e64296d0ac244ab25cc8375bcf9176cd61b Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Tue, 15 Jan 2019 12:02:04 +0530
Subject: [PATCH 034/256] fix(dashboard): Do not render single chart by default

---
 frappe/core/page/dashboard/dashboard.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 76f43118fc..0c485175fa 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -77,6 +77,4 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) {
 			}
 		})
 	}
-
-	this.create_chart()
 }
\ No newline at end of file

From 5e85c129c3ccd3461e572c7316652d2357273771 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Tue, 15 Jan 2019 12:05:28 +0530
Subject: [PATCH 035/256] feat(dashboard): Render multiple charts from charts
 table

---
 frappe/core/page/dashboard/dashboard.js | 27 +++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 0c485175fa..1168f4e22a 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -6,8 +6,23 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) {
 		single_column: true
 	})
 
+	this.route = frappe.get_route()
+	this.dashboard_name = this.route.slice(-1)[0]
+	this.dashboard_doc = null
+	frappe.model.with_doc('Dashboard', this.dashboard_name).then((doc) => {
+		this.dashboard_doc = doc
+		this.charts = this.dashboard_doc.charts
+
+		this.charts.map((chart) => {
+			var id = `dashboard-chart-${chart.name}`
+			var chart_wrapper = $(`<div id="${id}" class="col-sm-6"></div>`).appendTo($("#dashboard-graph"))
+			this.create_chart(`#${id}`, chart, JSON.parse(chart.chart_filters_json))
+		})
+
+	})
+
 	$(`<div class="dashboard page-main-content">
-		<div id="dashboard-graph"></div>
+		<div id="dashboard-graph" class="row"></div>
 	</div>`).appendTo(this.page.main)
 
 	this.timespans = ["Last Week", "Last Month", "Last Quarter", "Last Year"];
@@ -57,12 +72,12 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) {
 		me.create_chart()
 	});
 
-	this.create_chart = function() {
+	this.create_chart = function(wrapper, chart, filters) {
 		frappe.call({
 			method: "frappe.core.page.dashboard.dashboard.get_data",
 			args: {
-				dashboard_name: "erpnext.accounts.dashboard.get",
-				filters: this.filters,
+				dashboard_name: chart.chart_path,
+				filters: filters,
 			},
 			callback: function(message) {
 				const data = message.message
@@ -71,9 +86,9 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) {
 						datasets: data.datasets,
 						labels: data.labels,
 					},
-					type: 'line',
+					type: chart.chart_type,
 				}
-				new Chart('#dashboard-graph', chart_args)
+				new Chart(wrapper, chart_args)
 			}
 		})
 	}

From 0ad14c04d91a6597f7c87b3a9593ed6da26b7882 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Tue, 15 Jan 2019 12:09:27 +0530
Subject: [PATCH 036/256] fix(dashboard): Change naming for Dashboard DocType

---
 frappe/core/doctype/dashboard/dashboard.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frappe/core/doctype/dashboard/dashboard.json b/frappe/core/doctype/dashboard/dashboard.json
index 8a81fd7c87..27ddd19a0f 100644
--- a/frappe/core/doctype/dashboard/dashboard.json
+++ b/frappe/core/doctype/dashboard/dashboard.json
@@ -4,6 +4,7 @@
  "allow_guest_to_view": 0,
  "allow_import": 0,
  "allow_rename": 0,
+ "autoname": "field:dashboard_name",
  "beta": 0,
  "creation": "2019-01-10 12:54:40.938705",
  "custom": 0,
@@ -43,7 +44,7 @@
    "search_index": 0,
    "set_only_once": 0,
    "translatable": 0,
-   "unique": 0
+   "unique": 1
   },
   {
    "allow_bulk_edit": 0,
@@ -89,7 +90,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-01-10 12:54:40.938705",
+ "modified": "2019-01-15 12:06:10.126944",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Dashboard",

From 7b7c7b1dc91a5db5598368cb3451c5d5a3eff26b Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Tue, 15 Jan 2019 12:14:43 +0530
Subject: [PATCH 037/256] feat(dashboard): Set dashboard name as page title

---
 frappe/core/page/dashboard/dashboard.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 1168f4e22a..9d71c8830f 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -1,14 +1,16 @@
 frappe.pages['dashboard'].on_page_load = function(wrapper) {
 	var me = this
-	var page = frappe.ui.make_app_page({
-		parent: wrapper,
-		title: 'Dashboard',
-		single_column: true
-	})
 
 	this.route = frappe.get_route()
 	this.dashboard_name = this.route.slice(-1)[0]
 	this.dashboard_doc = null
+
+	var page = frappe.ui.make_app_page({
+		parent: wrapper,
+		title: this.dashboard_name,
+		single_column: true
+	})
+
 	frappe.model.with_doc('Dashboard', this.dashboard_name).then((doc) => {
 		this.dashboard_doc = doc
 		this.charts = this.dashboard_doc.charts

From f82a991949a6b8cce01f6796798208d83e08912b Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Tue, 15 Jan 2019 12:35:08 +0530
Subject: [PATCH 038/256] feat(dashboard): Add Show Dashboard button

---
 frappe/core/doctype/dashboard/dashboard.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/core/doctype/dashboard/dashboard.js b/frappe/core/doctype/dashboard/dashboard.js
index 2757332f42..1e4e73e482 100644
--- a/frappe/core/doctype/dashboard/dashboard.js
+++ b/frappe/core/doctype/dashboard/dashboard.js
@@ -3,6 +3,6 @@
 
 frappe.ui.form.on('Dashboard', {
 	refresh: function(frm) {
-
+		frm.add_custom_button("Show Dashboard", () => frappe.set_route('dashboard', frm.doc.name))
 	}
 });

From aa3a0a89dd8406bfc2add0dfbd4e5a06f4986785 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Tue, 15 Jan 2019 12:35:45 +0530
Subject: [PATCH 039/256] feat(dashboard): Translate Show Dashboard button
 label

---
 frappe/core/doctype/dashboard/dashboard.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/core/doctype/dashboard/dashboard.js b/frappe/core/doctype/dashboard/dashboard.js
index 1e4e73e482..9bcd8cf981 100644
--- a/frappe/core/doctype/dashboard/dashboard.js
+++ b/frappe/core/doctype/dashboard/dashboard.js
@@ -3,6 +3,6 @@
 
 frappe.ui.form.on('Dashboard', {
 	refresh: function(frm) {
-		frm.add_custom_button("Show Dashboard", () => frappe.set_route('dashboard', frm.doc.name))
+		frm.add_custom_button(__("Show Dashboard"), () => frappe.set_route('dashboard', frm.doc.name))
 	}
 });

From 82bb567ace99add58c20cc394a720246953fafa0 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Tue, 15 Jan 2019 12:47:05 +0530
Subject: [PATCH 040/256] fix(dashboard): Remove global filters

---
 frappe/core/page/dashboard/dashboard.js | 47 -------------------------
 1 file changed, 47 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 9d71c8830f..37cf8620b7 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -27,53 +27,6 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) {
 		<div id="dashboard-graph" class="row"></div>
 	</div>`).appendTo(this.page.main)
 
-	this.timespans = ["Last Week", "Last Month", "Last Quarter", "Last Year"];
-	this.timegrains = ["Daily", "Weekly", "Monthly", "Quarterly"];
-	this.filters = {
-		timespan: "Last Week",
-		timegrain: "Daily",
-		account: "Cash - GTPL",
-	}
-
-	this.account_select = this.page.add_field({
-		fieldname: "account",
-		label: __("Account"),
-		fieldtype: "Link",
-		options: "Account",
-		get_query: {
-			doctype: "Account",
-			filters: {
-				company: "Gadget Technologies Pvt. Ltd.",
-			}
-		}
-	}).$wrapper.find("input")
-
-	this.timespan_select = this.page.add_select(__("Time Span"),
-		this.timespans.map(d => {
-			return {"label": __(d), value: d }
-		})
-	)
-
-	this.timegrain_select = this.page.add_select(__("Time Grain"),
-		this.timegrains.map(d => {
-			return {"label": __(d), value: d }
-		})
-	)
-	this.account_select.on("change", function() {
-		me.filters.account = this.value
-		me.create_chart()
-	});
-
-	this.timespan_select.on("change", function() {
-		me.filters.timespan = this.value
-		me.create_chart()
-	});
-
-	this.timegrain_select.on("change", function() {
-		me.filters.timegrain = this.value
-		me.create_chart()
-	});
-
 	this.create_chart = function(wrapper, chart, filters) {
 		frappe.call({
 			method: "frappe.core.page.dashboard.dashboard.get_data",

From de24979f305ee748b1b57c35987259e32c5f4b8d Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Tue, 15 Jan 2019 13:12:55 +0530
Subject: [PATCH 041/256] feat(dashboard): Set chart_name as chart title

---
 frappe/core/page/dashboard/dashboard.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 37cf8620b7..586a2dbc19 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -37,6 +37,7 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) {
 			callback: function(message) {
 				const data = message.message
 				var chart_args = {
+					title: chart.chart_name,
 					data: {
 						datasets: data.datasets,
 						labels: data.labels,

From 9dd0dde020e5af4b81c73deedad4d98e99e3df6b Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Tue, 15 Jan 2019 13:13:31 +0530
Subject: [PATCH 042/256] rafactor(dashboard): Use capitalized names in chart
 type

---
 frappe/core/doctype/chart/chart.json    | 4 ++--
 frappe/core/page/dashboard/dashboard.js | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/frappe/core/doctype/chart/chart.json b/frappe/core/doctype/chart/chart.json
index 74614ee097..dc130dbcb9 100644
--- a/frappe/core/doctype/chart/chart.json
+++ b/frappe/core/doctype/chart/chart.json
@@ -96,7 +96,7 @@
    "label": "Chart Type",
    "length": 0,
    "no_copy": 0,
-   "options": "line\nbar",
+   "options": "Line\nBar",
    "permlevel": 0,
    "precision": "",
    "print_hide": 0,
@@ -153,7 +153,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-01-10 17:25:00.980022",
+ "modified": "2019-01-15 13:06:10.149493",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Chart",
diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 586a2dbc19..76abb95e4d 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -35,6 +35,10 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) {
 				filters: filters,
 			},
 			callback: function(message) {
+				const chart_type_map = {
+					"Line": "line",
+					"Bar": "bar",
+				}
 				const data = message.message
 				var chart_args = {
 					title: chart.chart_name,
@@ -42,7 +46,7 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) {
 						datasets: data.datasets,
 						labels: data.labels,
 					},
-					type: chart.chart_type,
+					type: chart_type_map[chart.chart_type],
 				}
 				new Chart(wrapper, chart_args)
 			}

From 95b501030f79dff8dd673db9f6cfb2e3e214dc3a Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Tue, 15 Jan 2019 14:32:00 +0530
Subject: [PATCH 043/256] fix(dashboard): Change fieldtype Chart Filters to
 Code

---
 frappe/core/doctype/chart/chart.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/core/doctype/chart/chart.json b/frappe/core/doctype/chart/chart.json
index dc130dbcb9..d3fbe031f5 100644
--- a/frappe/core/doctype/chart/chart.json
+++ b/frappe/core/doctype/chart/chart.json
@@ -118,7 +118,7 @@
    "collapsible": 0,
    "columns": 0,
    "fieldname": "chart_filters_json",
-   "fieldtype": "Data",
+   "fieldtype": "Code",
    "hidden": 0,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
@@ -153,7 +153,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-01-15 13:06:10.149493",
+ "modified": "2019-01-15 14:23:32.211219",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Chart",

From 59ca8942314e76e21919a560567224e8ca73ab4d Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Tue, 15 Jan 2019 14:50:31 +0530
Subject: [PATCH 044/256] feat(dashboard): Configurable chart width

---
 frappe/core/doctype/chart/chart.json    | 35 ++++++++++++++++++++++++-
 frappe/core/page/dashboard/dashboard.js | 10 ++++++-
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/frappe/core/doctype/chart/chart.json b/frappe/core/doctype/chart/chart.json
index d3fbe031f5..7b6751e116 100644
--- a/frappe/core/doctype/chart/chart.json
+++ b/frappe/core/doctype/chart/chart.json
@@ -141,6 +141,39 @@
    "set_only_once": 0,
    "translatable": 0,
    "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "chart_width",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Chart Width",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Half\nFull",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   }
  ],
  "has_web_view": 0,
@@ -153,7 +186,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-01-15 14:23:32.211219",
+ "modified": "2019-01-15 14:46:06.870884",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Chart",
diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 76abb95e4d..a0965fc794 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -17,7 +17,15 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) {
 
 		this.charts.map((chart) => {
 			var id = `dashboard-chart-${chart.name}`
-			var chart_wrapper = $(`<div id="${id}" class="col-sm-6"></div>`).appendTo($("#dashboard-graph"))
+
+			const column_width_map = {
+				"Half": "6",
+				"Full": "12",
+			}
+			var columns = column_width_map[chart.chart_width]
+			var chart_wrapper = $(`<div class="col-sm-${columns}"><div id="${id}"></div></div>`)
+			chart_wrapper.appendTo($("#dashboard-graph"))
+
 			this.create_chart(`#${id}`, chart, JSON.parse(chart.chart_filters_json))
 		})
 

From 241d13743fd4d86da2d5cec2d140a0b7e509b734 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 16 Jan 2019 13:39:55 +0530
Subject: [PATCH 045/256] refactor(dashboard): Move DocTypes to Desk module

- Rename Chart to Dashboard Chart
---
 .../doctype/chart => desk/doctype/dashboard}/__init__.py    | 0
 frappe/{core => desk}/doctype/dashboard/dashboard.js        | 0
 frappe/{core => desk}/doctype/dashboard/dashboard.json      | 6 +++---
 frappe/{core => desk}/doctype/dashboard/dashboard.py        | 0
 frappe/{core => desk}/doctype/dashboard/test_dashboard.py   | 0
 .../dashboard => desk/doctype/dashboard_chart}/__init__.py  | 0
 .../doctype/dashboard_chart/dashboard_chart.js}             | 2 +-
 .../doctype/dashboard_chart/dashboard_chart.json}           | 6 +++---
 .../doctype/dashboard_chart/dashboard_chart.py}             | 2 +-
 .../doctype/dashboard_chart/test_dashboard_chart.py}        | 2 +-
 10 files changed, 9 insertions(+), 9 deletions(-)
 rename frappe/{core/doctype/chart => desk/doctype/dashboard}/__init__.py (100%)
 rename frappe/{core => desk}/doctype/dashboard/dashboard.js (100%)
 rename frappe/{core => desk}/doctype/dashboard/dashboard.json (96%)
 rename frappe/{core => desk}/doctype/dashboard/dashboard.py (100%)
 rename frappe/{core => desk}/doctype/dashboard/test_dashboard.py (100%)
 rename frappe/{core/doctype/dashboard => desk/doctype/dashboard_chart}/__init__.py (100%)
 rename frappe/{core/doctype/chart/chart.js => desk/doctype/dashboard_chart/dashboard_chart.js} (78%)
 rename frappe/{core/doctype/chart/chart.json => desk/doctype/dashboard_chart/dashboard_chart.json} (98%)
 rename frappe/{core/doctype/chart/chart.py => desk/doctype/dashboard_chart/dashboard_chart.py} (88%)
 rename frappe/{core/doctype/chart/test_chart.py => desk/doctype/dashboard_chart/test_dashboard_chart.py} (79%)

diff --git a/frappe/core/doctype/chart/__init__.py b/frappe/desk/doctype/dashboard/__init__.py
similarity index 100%
rename from frappe/core/doctype/chart/__init__.py
rename to frappe/desk/doctype/dashboard/__init__.py
diff --git a/frappe/core/doctype/dashboard/dashboard.js b/frappe/desk/doctype/dashboard/dashboard.js
similarity index 100%
rename from frappe/core/doctype/dashboard/dashboard.js
rename to frappe/desk/doctype/dashboard/dashboard.js
diff --git a/frappe/core/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json
similarity index 96%
rename from frappe/core/doctype/dashboard/dashboard.json
rename to frappe/desk/doctype/dashboard/dashboard.json
index 27ddd19a0f..e7f2d73784 100644
--- a/frappe/core/doctype/dashboard/dashboard.json
+++ b/frappe/desk/doctype/dashboard/dashboard.json
@@ -65,7 +65,7 @@
    "label": "Charts",
    "length": 0,
    "no_copy": 0,
-   "options": "Chart",
+   "options": "Dashboard Chart",
    "permlevel": 0,
    "precision": "",
    "print_hide": 0,
@@ -90,9 +90,9 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-01-15 12:06:10.126944",
+ "modified": "2019-01-16 13:35:14.516114",
  "modified_by": "Administrator",
- "module": "Core",
+ "module": "Desk",
  "name": "Dashboard",
  "name_case": "",
  "owner": "Administrator",
diff --git a/frappe/core/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py
similarity index 100%
rename from frappe/core/doctype/dashboard/dashboard.py
rename to frappe/desk/doctype/dashboard/dashboard.py
diff --git a/frappe/core/doctype/dashboard/test_dashboard.py b/frappe/desk/doctype/dashboard/test_dashboard.py
similarity index 100%
rename from frappe/core/doctype/dashboard/test_dashboard.py
rename to frappe/desk/doctype/dashboard/test_dashboard.py
diff --git a/frappe/core/doctype/dashboard/__init__.py b/frappe/desk/doctype/dashboard_chart/__init__.py
similarity index 100%
rename from frappe/core/doctype/dashboard/__init__.py
rename to frappe/desk/doctype/dashboard_chart/__init__.py
diff --git a/frappe/core/doctype/chart/chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
similarity index 78%
rename from frappe/core/doctype/chart/chart.js
rename to frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 70d191d079..ff84a0a976 100644
--- a/frappe/core/doctype/chart/chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2019, Frappe Technologies and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Chart', {
+frappe.ui.form.on('Dashboard Chart', {
 	refresh: function(frm) {
 
 	}
diff --git a/frappe/core/doctype/chart/chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
similarity index 98%
rename from frappe/core/doctype/chart/chart.json
rename to frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index 7b6751e116..8e267759e7 100644
--- a/frappe/core/doctype/chart/chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -186,10 +186,10 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-01-15 14:46:06.870884",
+ "modified": "2019-01-16 13:34:58.802451",
  "modified_by": "Administrator",
- "module": "Core",
- "name": "Chart",
+ "module": "Desk",
+ "name": "Dashboard Chart",
  "name_case": "",
  "owner": "Administrator",
  "permissions": [
diff --git a/frappe/core/doctype/chart/chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
similarity index 88%
rename from frappe/core/doctype/chart/chart.py
rename to frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 28ba6ba42b..99c6f9717f 100644
--- a/frappe/core/doctype/chart/chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -6,5 +6,5 @@ from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
 
-class Chart(Document):
+class DashboardChart(Document):
 	pass
diff --git a/frappe/core/doctype/chart/test_chart.py b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
similarity index 79%
rename from frappe/core/doctype/chart/test_chart.py
rename to frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
index 773e956f7b..a9aa0b2263 100644
--- a/frappe/core/doctype/chart/test_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
@@ -6,5 +6,5 @@ from __future__ import unicode_literals
 import frappe
 import unittest
 
-class TestChart(unittest.TestCase):
+class TestDashboardChart(unittest.TestCase):
 	pass

From 8028fef1961bb0df4aedd31053877ef75d70b176 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 16 Jan 2019 14:19:31 +0530
Subject: [PATCH 046/256] refactor(dashboard): Refactor into Class

---
 frappe/core/page/dashboard/dashboard.js | 128 +++++++++++++++---------
 1 file changed, 78 insertions(+), 50 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index a0965fc794..9d2f1e5822 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -1,63 +1,91 @@
 frappe.pages['dashboard'].on_page_load = function(wrapper) {
-	var me = this
 
-	this.route = frappe.get_route()
-	this.dashboard_name = this.route.slice(-1)[0]
-	this.dashboard_doc = null
 
-	var page = frappe.ui.make_app_page({
+	let page = frappe.ui.make_app_page({
 		parent: wrapper,
-		title: this.dashboard_name,
+		title: __("Dashboard"),
 		single_column: true
 	})
 
-	frappe.model.with_doc('Dashboard', this.dashboard_name).then((doc) => {
-		this.dashboard_doc = doc
-		this.charts = this.dashboard_doc.charts
-
-		this.charts.map((chart) => {
-			var id = `dashboard-chart-${chart.name}`
-
-			const column_width_map = {
-				"Half": "6",
-				"Full": "12",
-			}
-			var columns = column_width_map[chart.chart_width]
-			var chart_wrapper = $(`<div class="col-sm-${columns}"><div id="${id}"></div></div>`)
-			chart_wrapper.appendTo($("#dashboard-graph"))
-
-			this.create_chart(`#${id}`, chart, JSON.parse(chart.chart_filters_json))
-		})
-
+	frappe.dashboard = new Dashboard(wrapper)
+	$(wrapper).bind('show', function() {
+		frappe.dashboard.show()
 	})
 
-	$(`<div class="dashboard page-main-content">
-		<div id="dashboard-graph" class="row"></div>
-	</div>`).appendTo(this.page.main)
+}
 
-	this.create_chart = function(wrapper, chart, filters) {
-		frappe.call({
-			method: "frappe.core.page.dashboard.dashboard.get_data",
-			args: {
-				dashboard_name: chart.chart_path,
-				filters: filters,
-			},
-			callback: function(message) {
-				const chart_type_map = {
-					"Line": "line",
-					"Bar": "bar",
-				}
-				const data = message.message
-				var chart_args = {
-					title: chart.chart_name,
-					data: {
-						datasets: data.datasets,
-						labels: data.labels,
-					},
-					type: chart_type_map[chart.chart_type],
-				}
-				new Chart(wrapper, chart_args)
-			}
+class Dashboard {
+	constructor(wrapper) {
+		this.wrapper = $(wrapper)
+		$(`<div class="dashboard">
+			<div class="dashboard-graph" class="row"></div>
+		</div>`).appendTo(this.wrapper.find(".page-content").empty())
+		this.container = this.wrapper.find(".dashboard-graph")
+		this.page = wrapper.page
+	}
+
+	show() {
+		this.route = frappe.get_route()
+		const current_dashboard_name = this.route.slice(-1)[0]
+
+		if(this.dashboard_name !== current_dashboard_name) {
+			this.dashboard_name = current_dashboard_name
+			this.page.set_title(this.dashboard_name)
+			this.refresh()
+		}
+	}
+
+	refresh() {
+		this.get_dashboard_doc().then((doc) => {
+			this.dashboard_doc = doc
+			this.charts = this.dashboard_doc.charts
+
+			this.charts.map((chart) => {
+				this.fetch_and_render_chart(chart);
+			})
 		})
 	}
+
+	fetch_and_render_chart(chart) {
+		this.fetch_chart(chart).then((data) => this.render_chart(chart, data))
+	}
+
+	get_dashboard_doc() {
+		return frappe.model.with_doc('Dashboard', this.dashboard_name)
+	}
+
+	fetch_chart(chart) {
+		return frappe.xcall(
+			"frappe.core.page.dashboard.dashboard.get_data",
+			{
+				dashboard_name: chart.chart_path,
+				filters: JSON.parse(chart.chart_filters_json),
+			}
+		)
+	}
+
+	render_chart(chart, data) {
+		const column_width_map = {
+			"Half": "6",
+			"Full": "12",
+		};
+		let columns = column_width_map[chart.chart_width];
+		let chart_container = $(`<div class="col-sm-${columns}"><div class="chart-wrapper"></div></div>`);
+		chart_container.appendTo(this.container);
+
+
+		const chart_type_map = {
+			"Line": "line",
+			"Bar": "bar",
+		};
+		let chart_args = {
+			title: chart.chart_name,
+			data: {
+				datasets: data.datasets,
+				labels: data.labels,
+			},
+			type: chart_type_map[chart.chart_type],
+		};
+		new Chart(chart_container.find(".chart-wrapper")[0], chart_args);
+	}
 }
\ No newline at end of file

From 750540f625033ee3f53ad8d21938d8d82bc7fb1e Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 16 Jan 2019 14:35:10 +0530
Subject: [PATCH 047/256] refactor(dashboard): Refactor field names

---
 .../dashboard_chart/dashboard_chart.json      | 48 +++++++++++++++----
 1 file changed, 40 insertions(+), 8 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index 8e267759e7..13f089d904 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -52,7 +52,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fieldname": "chart_path",
+   "fieldname": "method_path",
    "fieldtype": "Data",
    "hidden": 0,
    "ignore_user_permissions": 0,
@@ -61,7 +61,7 @@
    "in_global_search": 0,
    "in_list_view": 1,
    "in_standard_filter": 0,
-   "label": "Chart Path",
+   "label": "Method Path",
    "length": 0,
    "no_copy": 0,
    "permlevel": 0,
@@ -84,7 +84,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fieldname": "chart_type",
+   "fieldname": "type",
    "fieldtype": "Select",
    "hidden": 0,
    "ignore_user_permissions": 0,
@@ -93,7 +93,7 @@
    "in_global_search": 0,
    "in_list_view": 0,
    "in_standard_filter": 0,
-   "label": "Chart Type",
+   "label": "Type",
    "length": 0,
    "no_copy": 0,
    "options": "Line\nBar",
@@ -117,7 +117,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fieldname": "chart_filters_json",
+   "fieldname": "filters_json",
    "fieldtype": "Code",
    "hidden": 0,
    "ignore_user_permissions": 0,
@@ -149,7 +149,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fieldname": "chart_width",
+   "fieldname": "width",
    "fieldtype": "Select",
    "hidden": 0,
    "ignore_user_permissions": 0,
@@ -158,7 +158,7 @@
    "in_global_search": 0,
    "in_list_view": 0,
    "in_standard_filter": 0,
-   "label": "Chart Width",
+   "label": "Width",
    "length": 0,
    "no_copy": 0,
    "options": "Half\nFull",
@@ -174,6 +174,38 @@
    "set_only_once": 0,
    "translatable": 0,
    "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "color",
+   "fieldtype": "Color",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Color",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   }
  ],
  "has_web_view": 0,
@@ -186,7 +218,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-01-16 13:34:58.802451",
+ "modified": "2019-01-16 14:33:08.565174",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",

From 8f929e1390e0b1d18afa691510b43f0f0444bfb6 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 16 Jan 2019 14:35:28 +0530
Subject: [PATCH 048/256] feat(dashboard): Add color and styling

---
 frappe/core/page/dashboard/dashboard.css | 6 ++++++
 frappe/core/page/dashboard/dashboard.js  | 9 +++++----
 2 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 frappe/core/page/dashboard/dashboard.css

diff --git a/frappe/core/page/dashboard/dashboard.css b/frappe/core/page/dashboard/dashboard.css
new file mode 100644
index 0000000000..4bf25592f6
--- /dev/null
+++ b/frappe/core/page/dashboard/dashboard.css
@@ -0,0 +1,6 @@
+.chart-container {
+    border: 1px solid #d1d8dd;
+    border-radius: 4px;
+    margin: 15px 0;
+    padding: 15px;
+}
\ No newline at end of file
diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 9d2f1e5822..58c14ce350 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -58,8 +58,8 @@ class Dashboard {
 		return frappe.xcall(
 			"frappe.core.page.dashboard.dashboard.get_data",
 			{
-				dashboard_name: chart.chart_path,
-				filters: JSON.parse(chart.chart_filters_json),
+				dashboard_name: chart.method_path,
+				filters: JSON.parse(chart.filters_json),
 			}
 		)
 	}
@@ -69,7 +69,7 @@ class Dashboard {
 			"Half": "6",
 			"Full": "12",
 		};
-		let columns = column_width_map[chart.chart_width];
+		let columns = column_width_map[chart.width];
 		let chart_container = $(`<div class="col-sm-${columns}"><div class="chart-wrapper"></div></div>`);
 		chart_container.appendTo(this.container);
 
@@ -84,7 +84,8 @@ class Dashboard {
 				datasets: data.datasets,
 				labels: data.labels,
 			},
-			type: chart_type_map[chart.chart_type],
+			type: chart_type_map[chart.type],
+			colors: [chart.color || "light-blue"],
 		};
 		new Chart(chart_container.find(".chart-wrapper")[0], chart_args);
 	}

From 21ae89e721123043564495c19366d75776bb2618 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 16 Jan 2019 15:54:41 +0530
Subject: [PATCH 049/256] feat(code-editor): Add JSON language for Code Editor

---
 frappe/public/js/frappe/form/controls/code.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/controls/code.js b/frappe/public/js/frappe/form/controls/code.js
index 9d6f705523..4e4a79201e 100644
--- a/frappe/public/js/frappe/form/controls/code.js
+++ b/frappe/public/js/frappe/form/controls/code.js
@@ -32,7 +32,8 @@ frappe.ui.form.ControlCode = frappe.ui.form.ControlText.extend({
 			'HTML': 'ace/mode/html',
 			'CSS': 'ace/mode/css',
 			'Markdown': 'ace/mode/markdown',
-			'SCSS': 'ace/mode/scss'
+			'SCSS': 'ace/mode/scss',
+			'JSON': 'ace/mode/json'
 		};
 		const language = this.df.options;
 

From cc0ea4f5ef6d2d88abaa5a44e646f1a16d9d8490 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 16 Jan 2019 15:55:16 +0530
Subject: [PATCH 050/256] feat(dashboard): Add dropdown menu to set filters

---
 frappe/core/page/dashboard/dashboard.css      | 10 +++++
 frappe/core/page/dashboard/dashboard.js       | 39 ++++++++++++++++++-
 .../dashboard_chart/dashboard_chart.json      | 36 ++++++++++++++++-
 3 files changed, 83 insertions(+), 2 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.css b/frappe/core/page/dashboard/dashboard.css
index 4bf25592f6..66a7e8aa36 100644
--- a/frappe/core/page/dashboard/dashboard.css
+++ b/frappe/core/page/dashboard/dashboard.css
@@ -3,4 +3,14 @@
     border-radius: 4px;
     margin: 15px 0;
     padding: 15px;
+}
+
+.chart-actions {
+    position: absolute;
+    right: 30px;
+    top: 30px;
+}
+
+.chart-column-container {
+    position: relative;
 }
\ No newline at end of file
diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 58c14ce350..264498d30a 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -65,12 +65,49 @@ class Dashboard {
 	}
 
 	render_chart(chart, data) {
+		chart.filter_fields = JSON.parse(chart.filter_fields || '[]')
+		chart.filters_json = JSON.parse(chart.filters_json || '{}')
+
 		const column_width_map = {
 			"Half": "6",
 			"Full": "12",
 		};
 		let columns = column_width_map[chart.width];
-		let chart_container = $(`<div class="col-sm-${columns}"><div class="chart-wrapper"></div></div>`);
+		let actions = [
+			{
+				label: __("More"),
+				action: "more",
+				handler() {
+					const d = new frappe.ui.Dialog({
+						title: __('Set Filters'),
+						fields: chart.filter_fields
+					})
+					d.set_values(chart.filters_json)
+					d.show();
+				}
+			}
+		]
+
+		let chart_action = $(`<div class="chart-actions btn-group dropdown pull-right">
+			<a class="dropdown-toggle" data-toggle="dropdown"
+				aria-haspopup="true" aria-expanded="false"> <button class="btn btn-default btn-xs"><span class="caret"></span></button>
+			</a>
+			<ul class="dropdown-menu" style="max-height: 300px; overflow-y: auto;">
+				${actions.map(action => `<li><a data-action="${action.action}">${action.label}</a></li>`).join('')}
+			</ul>
+		</div>
+		`);
+
+		chart_action.find("a[data-action]").each((i, o) => {
+			const action = o.dataset.action
+			$(o).click(actions.find(a => a.action === action))
+		})
+
+
+		let chart_container = $(`<div class="col-sm-${columns} chart-column-container">
+			<div class="chart-wrapper"></div>
+		</div>`);
+		chart_action.prependTo(chart_container)
 		chart_container.appendTo(this.container);
 
 
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index 13f089d904..b6ac598854 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -129,6 +129,7 @@
    "label": "Filters JSON",
    "length": 0,
    "no_copy": 0,
+   "options": "JSON",
    "permlevel": 0,
    "precision": "",
    "print_hide": 0,
@@ -206,6 +207,39 @@
    "set_only_once": 0,
    "translatable": 0,
    "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "filter_fields",
+   "fieldtype": "Code",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Filter Fields",
+   "length": 0,
+   "no_copy": 0,
+   "options": "JSON",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   }
  ],
  "has_web_view": 0,
@@ -218,7 +252,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-01-16 14:33:08.565174",
+ "modified": "2019-01-16 15:22:10.760396",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",

From 499ddf53927c1ce3d386c443a6b927cbaf5cb467 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 16 Jan 2019 16:20:00 +0530
Subject: [PATCH 051/256] refactor(dashboard): Rename More to Set Filters

---
 frappe/core/page/dashboard/dashboard.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 264498d30a..e4f7b9c08e 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -75,8 +75,8 @@ class Dashboard {
 		let columns = column_width_map[chart.width];
 		let actions = [
 			{
-				label: __("More"),
-				action: "more",
+				label: __("Set Filters"),
+				action: "set-filters",
 				handler() {
 					const d = new frappe.ui.Dialog({
 						title: __('Set Filters'),

From f7f1aca59edf8a556abd64cf050cbfd74f67d58c Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 16 Jan 2019 16:20:34 +0530
Subject: [PATCH 052/256] feat(dashboard): Add Refresh Chart button

---
 frappe/core/page/dashboard/dashboard.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index e4f7b9c08e..fe1a679969 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -85,6 +85,12 @@ class Dashboard {
 					d.set_values(chart.filters_json)
 					d.show();
 				}
+			},
+			{
+				label: __("Refresh Chart"),
+				action: "refresh-chart",
+				handler() {
+				}
 			}
 		]
 

From 05da0a491602e7d57f45cb8810430e735f823e60 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 16 Jan 2019 17:37:26 +0530
Subject: [PATCH 053/256] feat(dashboard): Cache results for Chart

---
 frappe/core/page/dashboard/dashboard.css      |  7 ++++
 frappe/core/page/dashboard/dashboard.js       | 22 +++++++-----
 frappe/core/page/dashboard/dashboard.py       | 26 ++++++++++++--
 .../dashboard_chart/dashboard_chart.json      | 34 ++++++++++++++++++-
 4 files changed, 76 insertions(+), 13 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.css b/frappe/core/page/dashboard/dashboard.css
index 66a7e8aa36..e998997f67 100644
--- a/frappe/core/page/dashboard/dashboard.css
+++ b/frappe/core/page/dashboard/dashboard.css
@@ -13,4 +13,11 @@
 
 .chart-column-container {
     position: relative;
+}
+
+.last-synced-text {
+    position: absolute;
+    top: 34px;
+    right: 60px;
+    font-size: 10px;
 }
\ No newline at end of file
diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index fe1a679969..5f53c41eea 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -33,6 +33,7 @@ class Dashboard {
 			this.page.set_title(this.dashboard_name)
 			this.refresh()
 		}
+		this.charts = {}
 	}
 
 	refresh() {
@@ -42,6 +43,8 @@ class Dashboard {
 
 			this.charts.map((chart) => {
 				this.fetch_and_render_chart(chart);
+				chart.filters_json = JSON.parse(chart.filters_json || '{}')
+				chart.filter_fields = JSON.parse(chart.filter_fields || '[]')
 			})
 		})
 	}
@@ -54,25 +57,23 @@ class Dashboard {
 		return frappe.model.with_doc('Dashboard', this.dashboard_name)
 	}
 
-	fetch_chart(chart) {
+	fetch_chart(chart, refresh=false) {
 		return frappe.xcall(
 			"frappe.core.page.dashboard.dashboard.get_data",
 			{
-				dashboard_name: chart.method_path,
-				filters: JSON.parse(chart.filters_json),
+				chart_name: chart.name,
+				refresh: refresh,
 			}
 		)
 	}
 
 	render_chart(chart, data) {
-		chart.filter_fields = JSON.parse(chart.filter_fields || '[]')
-		chart.filters_json = JSON.parse(chart.filters_json || '{}')
-
 		const column_width_map = {
 			"Half": "6",
 			"Full": "12",
 		};
 		let columns = column_width_map[chart.width];
+		var me = this
 		let actions = [
 			{
 				label: __("Set Filters"),
@@ -87,13 +88,15 @@ class Dashboard {
 				}
 			},
 			{
-				label: __("Refresh Chart"),
-				action: "refresh-chart",
+				label: __("Force Refresh"),
+				action: "force-refresh",
 				handler() {
+					me.fetch_chart(chart, true).then(data => {console.log(data);me.charts[chart.name].update(data)})
 				}
 			}
 		]
 
+		let last_synced_text = $(`<span class="text-muted last-synced-text">${__("Last synced {0}", [comment_when(chart.last_synced_on)])}</span>`)
 		let chart_action = $(`<div class="chart-actions btn-group dropdown pull-right">
 			<a class="dropdown-toggle" data-toggle="dropdown"
 				aria-haspopup="true" aria-expanded="false"> <button class="btn btn-default btn-xs"><span class="caret"></span></button>
@@ -114,6 +117,7 @@ class Dashboard {
 			<div class="chart-wrapper"></div>
 		</div>`);
 		chart_action.prependTo(chart_container)
+		last_synced_text.prependTo(chart_container)
 		chart_container.appendTo(this.container);
 
 
@@ -130,6 +134,6 @@ class Dashboard {
 			type: chart_type_map[chart.type],
 			colors: [chart.color || "light-blue"],
 		};
-		new Chart(chart_container.find(".chart-wrapper")[0], chart_args);
+		this.charts[chart.name] = new Chart(chart_container.find(".chart-wrapper")[0], chart_args);
 	}
 }
\ No newline at end of file
diff --git a/frappe/core/page/dashboard/dashboard.py b/frappe/core/page/dashboard/dashboard.py
index a3f26bb7df..a4d08de40c 100644
--- a/frappe/core/page/dashboard/dashboard.py
+++ b/frappe/core/page/dashboard/dashboard.py
@@ -6,7 +6,27 @@ import frappe
 
 
 @frappe.whitelist()
-def get_data(dashboard_name, filters=None):
-    filters = json.loads(filters)
-    results = frappe.get_attr(dashboard_name)(filters=frappe._dict(filters))
+def get_data(chart_name, refresh=False):
+    chart = frappe.get_doc("Dashboard Chart", chart_name)
+    filters = json.loads(chart.filters_json)
+    cache_key = json.dumps({
+        "name": chart.method_path,
+        "filters": filters
+    }, default=str)
+
+    if refresh == "true":
+        results = generate_and_cache_results(chart, filters, cache_key)
+    else:
+        cached_results = frappe.cache().get_value(cache_key)
+        if cached_results:
+            results = json.loads(frappe.safe_decode(cached_results))
+        else:
+            results = generate_and_cache_results(chart, filters, cache_key)
+    return results
+
+
+def generate_and_cache_results(chart, filters, cache_key):
+    results = frappe.get_attr(chart.method_path)(filters=frappe._dict(filters))
+    frappe.cache().set_value(cache_key, json.dumps(results, default=str))
+    frappe.db.set_value("Dashboard Chart", chart.name, "last_synced_on", frappe.utils.now())
     return results
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index b6ac598854..14c719f9d7 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -240,6 +240,38 @@
    "set_only_once": 0,
    "translatable": 0,
    "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "last_synced_on",
+   "fieldtype": "Datetime",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Last Synced On",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   }
  ],
  "has_web_view": 0,
@@ -252,7 +284,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-01-16 15:22:10.760396",
+ "modified": "2019-01-16 17:05:48.904556",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",

From dbd653e7948ac0fa0514e77482533a8cb115074e Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 16 Jan 2019 17:38:00 +0530
Subject: [PATCH 054/256] feat(dashboard): Convert indentation to tabs

---
 frappe/core/page/dashboard/dashboard.js |  4 ++-
 frappe/core/page/dashboard/dashboard.py | 38 ++++++++++++-------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 5f53c41eea..5e96c974c0 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -91,7 +91,9 @@ class Dashboard {
 				label: __("Force Refresh"),
 				action: "force-refresh",
 				handler() {
-					me.fetch_chart(chart, true).then(data => {console.log(data);me.charts[chart.name].update(data)})
+					me.fetch_chart(chart, true).then(data => {
+						me.charts[chart.name].update(data)
+					})
 				}
 			}
 		]
diff --git a/frappe/core/page/dashboard/dashboard.py b/frappe/core/page/dashboard/dashboard.py
index a4d08de40c..e88d990788 100644
--- a/frappe/core/page/dashboard/dashboard.py
+++ b/frappe/core/page/dashboard/dashboard.py
@@ -7,26 +7,26 @@ import frappe
 
 @frappe.whitelist()
 def get_data(chart_name, refresh=False):
-    chart = frappe.get_doc("Dashboard Chart", chart_name)
-    filters = json.loads(chart.filters_json)
-    cache_key = json.dumps({
-        "name": chart.method_path,
-        "filters": filters
-    }, default=str)
+	chart = frappe.get_doc("Dashboard Chart", chart_name)
+	filters = json.loads(chart.filters_json)
+	cache_key = json.dumps({
+		"name": chart.method_path,
+		"filters": filters
+	}, default=str)
 
-    if refresh == "true":
-        results = generate_and_cache_results(chart, filters, cache_key)
-    else:
-        cached_results = frappe.cache().get_value(cache_key)
-        if cached_results:
-            results = json.loads(frappe.safe_decode(cached_results))
-        else:
-            results = generate_and_cache_results(chart, filters, cache_key)
-    return results
+	if refresh == "true":
+		results = generate_and_cache_results(chart, filters, cache_key)
+	else:
+		cached_results = frappe.cache().get_value(cache_key)
+		if cached_results:
+			results = json.loads(frappe.safe_decode(cached_results))
+		else:
+			results = generate_and_cache_results(chart, filters, cache_key)
+	return results
 
 
 def generate_and_cache_results(chart, filters, cache_key):
-    results = frappe.get_attr(chart.method_path)(filters=frappe._dict(filters))
-    frappe.cache().set_value(cache_key, json.dumps(results, default=str))
-    frappe.db.set_value("Dashboard Chart", chart.name, "last_synced_on", frappe.utils.now())
-    return results
+	results = frappe.get_attr(chart.method_path)(filters=frappe._dict(filters))
+	frappe.cache().set_value(cache_key, json.dumps(results, default=str))
+	frappe.db.set_value("Dashboard Chart", chart.name, "last_synced_on", frappe.utils.now())
+	return results

From 0d55b112d08628d425b51e805673b76f46130fc9 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 16 Jan 2019 18:23:20 +0530
Subject: [PATCH 055/256] feat(dashboard): Update chart after changing filters

---
 frappe/core/page/dashboard/dashboard.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 5e96c974c0..4b8c631875 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -81,7 +81,19 @@ class Dashboard {
 				handler() {
 					const d = new frappe.ui.Dialog({
 						title: __('Set Filters'),
-						fields: chart.filter_fields
+						fields: chart.filter_fields,
+						primary_action: function() {
+							const values = this.get_values()
+							if (!Object.entries(chart.filters_json).map(e => values[e[0]] === e[1]).every(Boolean)) {
+								frappe.db.set_value("Dashboard Chart", chart.name, "filters_json", JSON.stringify(values)).then(() => {
+									me.fetch_chart(chart).then(data => {
+										me.charts[chart.name].update(data)
+									})
+								})
+							}
+							this.hide()
+						},
+						primary_action_label: __('Save Filters')
 					})
 					d.set_values(chart.filters_json)
 					d.show();

From 8fae43f4664aeafdb3a29449462476803759dc3e Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 16 Jan 2019 18:56:55 +0530
Subject: [PATCH 056/256] refactor(dashboard): Abstract away DashboardChart

---
 frappe/core/page/dashboard/dashboard.js | 180 +++++++++++++-----------
 1 file changed, 101 insertions(+), 79 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 4b8c631875..d8c9e2930f 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -41,113 +41,135 @@ class Dashboard {
 			this.dashboard_doc = doc
 			this.charts = this.dashboard_doc.charts
 
-			this.charts.map((chart) => {
-				this.fetch_and_render_chart(chart);
-				chart.filters_json = JSON.parse(chart.filters_json || '{}')
-				chart.filter_fields = JSON.parse(chart.filter_fields || '[]')
+			this.charts.map((chart_doc) => {
+				let chart_container = $("<div><div>")
+				chart_container.appendTo(this.container)
+
+				let dashboard_chart = new DashboardChart(chart_doc, chart_container)
+				dashboard_chart.show()
 			})
 		})
 	}
 
-	fetch_and_render_chart(chart) {
-		this.fetch_chart(chart).then((data) => this.render_chart(chart, data))
-	}
-
 	get_dashboard_doc() {
 		return frappe.model.with_doc('Dashboard', this.dashboard_name)
 	}
+}
 
-	fetch_chart(chart, refresh=false) {
+class DashboardChart {
+	constructor(chart_doc, chart_container) {
+		this.chart_doc = chart_doc
+		this.container = chart_container
+	}
+
+	show() {
+		this.filters = JSON.parse(this.chart_doc.filters_json || '{}')
+		this.filter_fields = JSON.parse(this.chart_doc.filter_fields || '[]')
+
+		this.prepare_container()
+
+		this.fetch().then((data) => {
+			this.data = data
+			this.render()
+		})
+	}
+
+	prepare_container() {
+		const column_width_map = {
+			"Half": "6",
+			"Full": "12",
+		}
+		let columns = column_width_map[this.chart_doc.width]
+		this.chart_container = $(`<div class="col-sm-${columns} chart-column-container">
+			<div class="chart-wrapper"></div>
+		</div>`)
+		this.chart_container.appendTo(this.container)
+	}
+
+	fetch(refresh=false) {
 		return frappe.xcall(
 			"frappe.core.page.dashboard.dashboard.get_data",
 			{
-				chart_name: chart.name,
+				chart_name: this.chart_doc.name,
 				refresh: refresh,
 			}
 		)
 	}
 
-	render_chart(chart, data) {
-		const column_width_map = {
-			"Half": "6",
-			"Full": "12",
-		};
-		let columns = column_width_map[chart.width];
-		var me = this
-		let actions = [
-			{
-				label: __("Set Filters"),
-				action: "set-filters",
-				handler() {
-					const d = new frappe.ui.Dialog({
-						title: __('Set Filters'),
-						fields: chart.filter_fields,
-						primary_action: function() {
-							const values = this.get_values()
-							if (!Object.entries(chart.filters_json).map(e => values[e[0]] === e[1]).every(Boolean)) {
-								frappe.db.set_value("Dashboard Chart", chart.name, "filters_json", JSON.stringify(values)).then(() => {
-									me.fetch_chart(chart).then(data => {
-										me.charts[chart.name].update(data)
-									})
-								})
-							}
-							this.hide()
-						},
-						primary_action_label: __('Save Filters')
-					})
-					d.set_values(chart.filters_json)
-					d.show();
-				}
-			},
-			{
-				label: __("Force Refresh"),
-				action: "force-refresh",
-				handler() {
-					me.fetch_chart(chart, true).then(data => {
-						me.charts[chart.name].update(data)
-					})
-				}
-			}
-		]
+	render() {
 
-		let last_synced_text = $(`<span class="text-muted last-synced-text">${__("Last synced {0}", [comment_when(chart.last_synced_on)])}</span>`)
-		let chart_action = $(`<div class="chart-actions btn-group dropdown pull-right">
-			<a class="dropdown-toggle" data-toggle="dropdown"
-				aria-haspopup="true" aria-expanded="false"> <button class="btn btn-default btn-xs"><span class="caret"></span></button>
-			</a>
-			<ul class="dropdown-menu" style="max-height: 300px; overflow-y: auto;">
-				${actions.map(action => `<li><a data-action="${action.action}">${action.label}</a></li>`).join('')}
-			</ul>
-		</div>
-		`);
+		// var me = this
+		// let actions = [
+		// 	{
+		// 		label: __("Set Filters"),
+		// 		action: "set-filters",
+		// 		handler() {
+		// 			const d = new frappe.ui.Dialog({
+		// 				title: __('Set Filters'),
+		// 				fields: chart.filter_fields,
+		// 				primary_action: function() {
+		// 					const values = this.get_values()
+		// 					if (!Object.entries(chart.filters_json).map(e => values[e[0]] === e[1]).every(Boolean)) {
+		// 						frappe.db.set_value("Dashboard Chart", chart.name, "filters_json", JSON.stringify(values)).then(() => {
+		// 							me.fetch_chart(chart).then(data => {
+		// 								me.charts[chart.name].update(data)
+		// 							})
+		// 						})
+		// 					}
+		// 					this.hide()
+		// 				},
+		// 				primary_action_label: __('Save Filters')
+		// 			})
+		// 			d.set_values(chart.filters_json)
+		// 			d.show();
+		// 		}
+		// 	},
+		// 	{
+		// 		label: __("Force Refresh"),
+		// 		action: "force-refresh",
+		// 		handler() {
+		// 			me.fetch_chart(chart, true).then(data => {
+		// 				me.charts[chart.name].update(data)
+		// 			})
+		// 		}
+		// 	}
+		// ]
 
-		chart_action.find("a[data-action]").each((i, o) => {
-			const action = o.dataset.action
-			$(o).click(actions.find(a => a.action === action))
-		})
+		// let last_synced_text = $(`<span class="text-muted last-synced-text">${__("Last synced {0}", [comment_when(chart.last_synced_on)])}</span>`)
+		// let chart_action = $(`<div class="chart-actions btn-group dropdown pull-right">
+		// 	<a class="dropdown-toggle" data-toggle="dropdown"
+		// 		aria-haspopup="true" aria-expanded="false"> <button class="btn btn-default btn-xs"><span class="caret"></span></button>
+		// 	</a>
+		// 	<ul class="dropdown-menu" style="max-height: 300px; overflow-y: auto;">
+		// 		${actions.map(action => `<li><a data-action="${action.action}">${action.label}</a></li>`).join('')}
+		// 	</ul>
+		// </div>
+		// `);
+
+		// chart_action.find("a[data-action]").each((i, o) => {
+		// 	const action = o.dataset.action
+		// 	$(o).click(actions.find(a => a.action === action))
+		// })
 
 
-		let chart_container = $(`<div class="col-sm-${columns} chart-column-container">
-			<div class="chart-wrapper"></div>
-		</div>`);
-		chart_action.prependTo(chart_container)
-		last_synced_text.prependTo(chart_container)
-		chart_container.appendTo(this.container);
 
+		// chart_action.prependTo(chart_container)
+		// last_synced_text.prependTo(chart_container)
 
 		const chart_type_map = {
 			"Line": "line",
 			"Bar": "bar",
-		};
+		}
 		let chart_args = {
-			title: chart.chart_name,
+			title: this.chart_doc.chart_name,
 			data: {
-				datasets: data.datasets,
-				labels: data.labels,
+				datasets: this.data.datasets,
+				labels: this.data.labels,
 			},
-			type: chart_type_map[chart.type],
-			colors: [chart.color || "light-blue"],
+			type: chart_type_map[this.chart_doc.type],
+			colors: [this.chart_doc.color || "light-blue"],
 		};
-		this.charts[chart.name] = new Chart(chart_container.find(".chart-wrapper")[0], chart_args);
+		this.chart = new Chart(this.chart_container.find(".chart-wrapper")[0], chart_args);
 	}
+
 }
\ No newline at end of file

From ba23476141ecc65721291739c6158795a0d4432a Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 16 Jan 2019 19:36:23 +0530
Subject: [PATCH 057/256] refactor(dashboard): Update last_synced_on on forced
 refresh

---
 frappe/core/page/dashboard/dashboard.js | 152 +++++++++++++-----------
 1 file changed, 85 insertions(+), 67 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index d8c9e2930f..b5b3448214 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -63,9 +63,7 @@ class DashboardChart {
 	}
 
 	show() {
-		this.filters = JSON.parse(this.chart_doc.filters_json || '{}')
-		this.filter_fields = JSON.parse(this.chart_doc.filter_fields || '[]')
-
+		this.prepare_chart_object()
 		this.prepare_container()
 
 		this.fetch().then((data) => {
@@ -84,6 +82,66 @@ class DashboardChart {
 			<div class="chart-wrapper"></div>
 		</div>`)
 		this.chart_container.appendTo(this.container)
+
+		let last_synced_text = $(`<span class="text-muted last-synced-text"></span>`)
+		last_synced_text.prependTo(this.chart_container)
+
+		let actions = [
+			{
+				label: __("Set Filters"),
+				action: "set-filters",
+				handler: () => {
+					const d = new frappe.ui.Dialog({
+						title: __('Set Filters'),
+						fields: this.filter_fields,
+						primary_action: () => {
+							const values = d.get_values()
+							if (!Object.entries(this.filters).map(e => values[e[0]] === e[1]).every(Boolean)) {
+								frappe.db.set_value("Dashboard Chart", this.chart_doc.name, "filters_json", JSON.stringify(values)).then(() => {
+									this.fetch().then(data => {
+										this.data = data
+										this.render()
+									})
+								})
+							}
+							d.hide()
+						},
+						primary_action_label: __('Save Filters')
+					})
+					d.set_values(this.filters)
+					d.show();
+				}
+			},
+			{
+				label: __("Force Refresh"),
+				action: "force-refresh",
+				handler: () => {
+					this.fetch(true).then(data => {
+						this.data = data
+						this.chart_doc.last_synced_on = new Date()
+						this.render()
+					})
+				}
+			}
+		]
+
+		this.chart_actions = $(`<div class="chart-actions btn-group dropdown pull-right">
+			<a class="dropdown-toggle" data-toggle="dropdown"
+				aria-haspopup="true" aria-expanded="false"> <button class="btn btn-default btn-xs"><span class="caret"></span></button>
+			</a>
+			<ul class="dropdown-menu" style="max-height: 300px; overflow-y: auto;">
+				${actions.map(action => `<li><a data-action="${action.action}">${action.label}</a></li>`).join('')}
+			</ul>
+		</div>
+		`);
+
+		this.chart_actions.find("a[data-action]").each((i, o) => {
+			const action = o.dataset.action
+			$(o).click(actions.find(a => a.action === action))
+		})
+
+		this.chart_actions.prependTo(this.chart_container)
+
 	}
 
 	fetch(refresh=false) {
@@ -97,79 +155,39 @@ class DashboardChart {
 	}
 
 	render() {
-
-		// var me = this
-		// let actions = [
-		// 	{
-		// 		label: __("Set Filters"),
-		// 		action: "set-filters",
-		// 		handler() {
-		// 			const d = new frappe.ui.Dialog({
-		// 				title: __('Set Filters'),
-		// 				fields: chart.filter_fields,
-		// 				primary_action: function() {
-		// 					const values = this.get_values()
-		// 					if (!Object.entries(chart.filters_json).map(e => values[e[0]] === e[1]).every(Boolean)) {
-		// 						frappe.db.set_value("Dashboard Chart", chart.name, "filters_json", JSON.stringify(values)).then(() => {
-		// 							me.fetch_chart(chart).then(data => {
-		// 								me.charts[chart.name].update(data)
-		// 							})
-		// 						})
-		// 					}
-		// 					this.hide()
-		// 				},
-		// 				primary_action_label: __('Save Filters')
-		// 			})
-		// 			d.set_values(chart.filters_json)
-		// 			d.show();
-		// 		}
-		// 	},
-		// 	{
-		// 		label: __("Force Refresh"),
-		// 		action: "force-refresh",
-		// 		handler() {
-		// 			me.fetch_chart(chart, true).then(data => {
-		// 				me.charts[chart.name].update(data)
-		// 			})
-		// 		}
-		// 	}
-		// ]
-
-		// let last_synced_text = $(`<span class="text-muted last-synced-text">${__("Last synced {0}", [comment_when(chart.last_synced_on)])}</span>`)
-		// let chart_action = $(`<div class="chart-actions btn-group dropdown pull-right">
-		// 	<a class="dropdown-toggle" data-toggle="dropdown"
-		// 		aria-haspopup="true" aria-expanded="false"> <button class="btn btn-default btn-xs"><span class="caret"></span></button>
-		// 	</a>
-		// 	<ul class="dropdown-menu" style="max-height: 300px; overflow-y: auto;">
-		// 		${actions.map(action => `<li><a data-action="${action.action}">${action.label}</a></li>`).join('')}
-		// 	</ul>
-		// </div>
-		// `);
-
-		// chart_action.find("a[data-action]").each((i, o) => {
-		// 	const action = o.dataset.action
-		// 	$(o).click(actions.find(a => a.action === action))
-		// })
-
-
-
-		// chart_action.prependTo(chart_container)
-		// last_synced_text.prependTo(chart_container)
-
+		this.update_last_synced()
 		const chart_type_map = {
 			"Line": "line",
 			"Bar": "bar",
 		}
 		let chart_args = {
 			title: this.chart_doc.chart_name,
-			data: {
-				datasets: this.data.datasets,
-				labels: this.data.labels,
-			},
+			data: this.data,
 			type: chart_type_map[this.chart_doc.type],
 			colors: [this.chart_doc.color || "light-blue"],
 		};
-		this.chart = new Chart(this.chart_container.find(".chart-wrapper")[0], chart_args);
+		if(!this.chart) {
+			this.chart = new Chart(this.chart_container.find(".chart-wrapper")[0], chart_args);
+		}
+		else {
+			this.chart.update(this.data)
+		}
 	}
 
+	update_last_synced() {
+		let last_synced_text = __("Last synced {0}", [comment_when(this.chart_doc.last_synced_on)])
+		this.container.find(".last-synced-text").html(last_synced_text)
+	}
+
+	update_chart_object() {
+		frappe.db.get_doc("Dashboard Chart", this.chart_doc.name).then(doc => {
+			this.chart_doc = doc
+			this.prepare_chart_object()
+		})
+	}
+
+	prepare_chart_object() {
+		this.filters = JSON.parse(this.chart_doc.filters_json || '{}')
+		this.filter_fields = JSON.parse(this.chart_doc.filter_fields || '[]')
+	}
 }
\ No newline at end of file

From 17d17f13621e152784fc20bda5b7575939ff92c8 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 16 Jan 2019 20:02:29 +0530
Subject: [PATCH 058/256] fix(dashboard): Add missing semicolons

---
 frappe/core/page/dashboard/dashboard.js | 120 ++++++++++++------------
 1 file changed, 60 insertions(+), 60 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index b5b3448214..906020880f 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -5,86 +5,86 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) {
 		parent: wrapper,
 		title: __("Dashboard"),
 		single_column: true
-	})
+	});
 
-	frappe.dashboard = new Dashboard(wrapper)
+	frappe.dashboard = new Dashboard(wrapper);
 	$(wrapper).bind('show', function() {
-		frappe.dashboard.show()
-	})
+		frappe.dashboard.show();
+	});
 
 }
 
 class Dashboard {
 	constructor(wrapper) {
-		this.wrapper = $(wrapper)
+		this.wrapper = $(wrapper);
 		$(`<div class="dashboard">
 			<div class="dashboard-graph" class="row"></div>
-		</div>`).appendTo(this.wrapper.find(".page-content").empty())
-		this.container = this.wrapper.find(".dashboard-graph")
-		this.page = wrapper.page
+		</div>`).appendTo(this.wrapper.find(".page-content").empty());
+		this.container = this.wrapper.find(".dashboard-graph");
+		this.page = wrapper.page;
 	}
 
 	show() {
-		this.route = frappe.get_route()
-		const current_dashboard_name = this.route.slice(-1)[0]
+		this.route = frappe.get_route();
+		const current_dashboard_name = this.route.slice(-1)[0];
 
 		if(this.dashboard_name !== current_dashboard_name) {
-			this.dashboard_name = current_dashboard_name
-			this.page.set_title(this.dashboard_name)
-			this.refresh()
+			this.dashboard_name = current_dashboard_name;
+			this.page.set_title(this.dashboard_name);
+			this.refresh();
 		}
-		this.charts = {}
+		this.charts = {};
 	}
 
 	refresh() {
 		this.get_dashboard_doc().then((doc) => {
-			this.dashboard_doc = doc
-			this.charts = this.dashboard_doc.charts
+			this.dashboard_doc = doc;
+			this.charts = this.dashboard_doc.charts;
 
 			this.charts.map((chart_doc) => {
-				let chart_container = $("<div><div>")
-				chart_container.appendTo(this.container)
+				let chart_container = $("<div><div>");
+				chart_container.appendTo(this.container);
 
-				let dashboard_chart = new DashboardChart(chart_doc, chart_container)
-				dashboard_chart.show()
-			})
+				let dashboard_chart = new DashboardChart(chart_doc, chart_container);
+				dashboard_chart.show();
+			});
 		})
 	}
 
 	get_dashboard_doc() {
-		return frappe.model.with_doc('Dashboard', this.dashboard_name)
+		return frappe.model.with_doc('Dashboard', this.dashboard_name);
 	}
 }
 
 class DashboardChart {
 	constructor(chart_doc, chart_container) {
-		this.chart_doc = chart_doc
-		this.container = chart_container
+		this.chart_doc = chart_doc;
+		this.container = chart_container;
 	}
 
 	show() {
-		this.prepare_chart_object()
-		this.prepare_container()
+		this.prepare_chart_object();
+		this.prepare_container();
 
 		this.fetch().then((data) => {
-			this.data = data
-			this.render()
-		})
+			this.data = data;
+			this.render();
+		});
 	}
 
 	prepare_container() {
 		const column_width_map = {
 			"Half": "6",
 			"Full": "12",
-		}
-		let columns = column_width_map[this.chart_doc.width]
+		};
+		let columns = column_width_map[this.chart_doc.width];
 		this.chart_container = $(`<div class="col-sm-${columns} chart-column-container">
 			<div class="chart-wrapper"></div>
-		</div>`)
-		this.chart_container.appendTo(this.container)
+		</div>`);
+		this.chart_container.appendTo(this.container);
 
-		let last_synced_text = $(`<span class="text-muted last-synced-text"></span>`)
-		last_synced_text.prependTo(this.chart_container)
+		let last_synced_text = $(`<span class="text-muted last-synced-text"></span>`);
+		last_synced_text.prependTo(this.chart_container);
 
 		let actions = [
 			{
@@ -95,20 +95,20 @@ class DashboardChart {
 						title: __('Set Filters'),
 						fields: this.filter_fields,
 						primary_action: () => {
-							const values = d.get_values()
+							const values = d.get_values();
 							if (!Object.entries(this.filters).map(e => values[e[0]] === e[1]).every(Boolean)) {
 								frappe.db.set_value("Dashboard Chart", this.chart_doc.name, "filters_json", JSON.stringify(values)).then(() => {
 									this.fetch().then(data => {
-										this.data = data
-										this.render()
+										this.data = data;
+										this.render();
 									})
-								})
+								});
 							}
-							d.hide()
+							d.hide();
 						},
-						primary_action_label: __('Save Filters')
+						primary_action_label: __('Save Filters');
 					})
-					d.set_values(this.filters)
+					d.set_values(this.filters);
 					d.show();
 				}
 			},
@@ -117,9 +117,9 @@ class DashboardChart {
 				action: "force-refresh",
 				handler: () => {
 					this.fetch(true).then(data => {
-						this.data = data
-						this.chart_doc.last_synced_on = new Date()
-						this.render()
+						this.data = data;
+						this.chart_doc.last_synced_on = new Date();
+						this.render();
 					})
 				}
 			}
@@ -136,11 +136,11 @@ class DashboardChart {
 		`);
 
 		this.chart_actions.find("a[data-action]").each((i, o) => {
-			const action = o.dataset.action
-			$(o).click(actions.find(a => a.action === action))
-		})
+			const action = o.dataset.action;
+			$(o).click(actions.find(a => a.action === action));
+		});
 
-		this.chart_actions.prependTo(this.chart_container)
+		this.chart_actions.prependTo(this.chart_container);
 
 	}
 
@@ -151,15 +151,15 @@ class DashboardChart {
 				chart_name: this.chart_doc.name,
 				refresh: refresh,
 			}
-		)
+		);
 	}
 
 	render() {
-		this.update_last_synced()
+		this.update_last_synced();
 		const chart_type_map = {
 			"Line": "line",
 			"Bar": "bar",
-		}
+		};
 		let chart_args = {
 			title: this.chart_doc.chart_name,
 			data: this.data,
@@ -170,24 +170,24 @@ class DashboardChart {
 			this.chart = new Chart(this.chart_container.find(".chart-wrapper")[0], chart_args);
 		}
 		else {
-			this.chart.update(this.data)
+			this.chart.update(this.data);
 		}
 	}
 
 	update_last_synced() {
-		let last_synced_text = __("Last synced {0}", [comment_when(this.chart_doc.last_synced_on)])
-		this.container.find(".last-synced-text").html(last_synced_text)
+		let last_synced_text = __("Last synced {0}", [comment_when(this.chart_doc.last_synced_on)]);
+		this.container.find(".last-synced-text").html(last_synced_text);
 	}
 
 	update_chart_object() {
 		frappe.db.get_doc("Dashboard Chart", this.chart_doc.name).then(doc => {
-			this.chart_doc = doc
-			this.prepare_chart_object()
-		})
+			this.chart_doc = doc;
+			this.prepare_chart_object();
+		});
 	}
 
 	prepare_chart_object() {
-		this.filters = JSON.parse(this.chart_doc.filters_json || '{}')
-		this.filter_fields = JSON.parse(this.chart_doc.filter_fields || '[]')
+		this.filters = JSON.parse(this.chart_doc.filters_json || '{}');
+		this.filter_fields = JSON.parse(this.chart_doc.filter_fields || '[]');
 	}
 }
\ No newline at end of file

From 277969ecfc1f2d58f7d964e33628c301bbe2476c Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 16 Jan 2019 20:06:00 +0530
Subject: [PATCH 059/256] fix(dashboard: Remove empty lines

---
 frappe/core/page/dashboard/dashboard.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 906020880f..71f5b0361a 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -1,7 +1,5 @@
 frappe.pages['dashboard'].on_page_load = function(wrapper) {
-
-
-	let page = frappe.ui.make_app_page({
+	frappe.ui.make_app_page({
 		parent: wrapper,
 		title: __("Dashboard"),
 		single_column: true
@@ -11,7 +9,6 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) {
 	$(wrapper).bind('show', function() {
 		frappe.dashboard.show();
 	});
-
 }
 
 class Dashboard {

From ea2019cecaf9245b94412411a4e24ae5e942374a Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 16 Jan 2019 20:51:50 +0530
Subject: [PATCH 060/256] refactor(dashboard): Make Dashboard Chart Form View
 pretty

---
 .../dashboard_chart/dashboard_chart.json      | 256 +++++++++++++++---
 1 file changed, 222 insertions(+), 34 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index 14c719f9d7..fa606abb88 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -45,6 +45,37 @@
    "translatable": 0,
    "unique": 0
   },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_2",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
   {
    "allow_bulk_edit": 0,
    "allow_in_quick_entry": 0,
@@ -77,6 +108,38 @@
    "translatable": 0,
    "unique": 0
   },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "chart_details_section",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Chart Details",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
   {
    "allow_bulk_edit": 0,
    "allow_in_quick_entry": 0,
@@ -110,39 +173,6 @@
    "translatable": 0,
    "unique": 0
   },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "filters_json",
-   "fieldtype": "Code",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Filters JSON",
-   "length": 0,
-   "no_copy": 0,
-   "options": "JSON",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
   {
    "allow_bulk_edit": 0,
    "allow_in_quick_entry": 0,
@@ -176,6 +206,37 @@
    "translatable": 0,
    "unique": 0
   },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_6",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
   {
    "allow_bulk_edit": 0,
    "allow_in_quick_entry": 0,
@@ -208,6 +269,69 @@
    "translatable": 0,
    "unique": 0
   },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "filter_details_section",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Filter Details",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_9",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
   {
    "allow_bulk_edit": 0,
    "allow_in_quick_entry": 0,
@@ -272,6 +396,70 @@
    "set_only_once": 0,
    "translatable": 0,
    "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_11",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "filters_json",
+   "fieldtype": "Code",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Filters JSON",
+   "length": 0,
+   "no_copy": 0,
+   "options": "JSON",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   }
  ],
  "has_web_view": 0,
@@ -284,7 +472,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-01-16 17:05:48.904556",
+ "modified": "2019-01-16 20:10:54.811477",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",

From 2b86047535ceba6b1107938a7845320f4734ae86 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 16 Jan 2019 20:53:23 +0530
Subject: [PATCH 061/256] fix(dashboard): Show currently set values in Dialog

---
 frappe/core/page/dashboard/dashboard.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 71f5b0361a..4f9c172bf7 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -62,8 +62,8 @@ class DashboardChart {
 	show() {
 		this.prepare_chart_object();
 		this.prepare_container();
-
 		this.fetch().then((data) => {
+			this.update_last_synced();
 			this.data = data;
 			this.render();
 		});
@@ -114,8 +114,8 @@ class DashboardChart {
 				action: "force-refresh",
 				handler: () => {
 					this.fetch(true).then(data => {
+						this.update_chart_object();
 						this.data = data;
-						this.chart_doc.last_synced_on = new Date();
 						this.render();
 					})
 				}
@@ -152,7 +152,6 @@ class DashboardChart {
 	}
 
 	render() {
-		this.update_last_synced();
 		const chart_type_map = {
 			"Line": "line",
 			"Bar": "bar",
@@ -180,6 +179,7 @@ class DashboardChart {
 		frappe.db.get_doc("Dashboard Chart", this.chart_doc.name).then(doc => {
 			this.chart_doc = doc;
 			this.prepare_chart_object();
+			this.update_last_synced();
 		});
 	}
 

From 4c436b97f9e6cad6b3fce315c8891d67c9bf869e Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 16 Jan 2019 20:53:58 +0530
Subject: [PATCH 062/256] feat(dashboard): Show Save Filters button after
 change in filters

---
 frappe/core/page/dashboard/dashboard.js | 35 +++++++++++++++----------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 4f9c172bf7..66d1b0ecf3 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -91,22 +91,29 @@ class DashboardChart {
 					const d = new frappe.ui.Dialog({
 						title: __('Set Filters'),
 						fields: this.filter_fields,
-						primary_action: () => {
-							const values = d.get_values();
-							if (!Object.entries(this.filters).map(e => values[e[0]] === e[1]).every(Boolean)) {
-								frappe.db.set_value("Dashboard Chart", this.chart_doc.name, "filters_json", JSON.stringify(values)).then(() => {
-									this.fetch().then(data => {
-										this.data = data;
-										this.render();
-									})
-								});
-							}
-							d.hide();
-						},
-						primary_action_label: __('Save Filters');
-					})
+					});
 					d.set_values(this.filters);
 					d.show();
+
+					const set_filters = () => {
+						const values = d.get_values();
+						if (!Object.entries(this.filters).map(e => values[e[0]] === e[1]).every(Boolean)) {
+							frappe.db.set_value("Dashboard Chart", this.chart_doc.name, "filters_json", JSON.stringify(values)).then(() => {
+								this.fetch().then(data => {
+									this.update_chart_object();
+									this.data = data;
+									this.render();
+								})
+							});
+						}
+						d.hide();
+					}
+
+					this.filter_fields.map(field => field.onchange = e => {
+						if(e) {
+							d.set_primary_action(__('Save Filters'), set_filters);
+						}
+					});
 				}
 			},
 			{

From f805a2f4bbbcd8d4ffa4ae712d356dc64c5f1baf Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 16 Jan 2019 21:52:10 +0530
Subject: [PATCH 063/256] style: Linting fixes

---
 frappe/core/page/dashboard/dashboard.js           | 15 +++++++--------
 frappe/desk/doctype/dashboard/dashboard.js        |  2 +-
 frappe/desk/doctype/dashboard/dashboard.py        |  1 -
 frappe/desk/doctype/dashboard/test_dashboard.py   |  1 -
 .../doctype/dashboard_chart/dashboard_chart.py    |  1 -
 .../dashboard_chart/test_dashboard_chart.py       |  1 -
 6 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 66d1b0ecf3..655bbe7444 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -9,7 +9,7 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) {
 	$(wrapper).bind('show', function() {
 		frappe.dashboard.show();
 	});
-}
+};
 
 class Dashboard {
 	constructor(wrapper) {
@@ -45,7 +45,7 @@ class Dashboard {
 				let dashboard_chart = new DashboardChart(chart_doc, chart_container);
 				dashboard_chart.show();
 			});
-		})
+		});
 	}
 
 	get_dashboard_doc() {
@@ -103,11 +103,11 @@ class DashboardChart {
 									this.update_chart_object();
 									this.data = data;
 									this.render();
-								})
+								});
 							});
 						}
 						d.hide();
-					}
+					};
 
 					this.filter_fields.map(field => field.onchange = e => {
 						if(e) {
@@ -124,10 +124,10 @@ class DashboardChart {
 						this.update_chart_object();
 						this.data = data;
 						this.render();
-					})
+					});
 				}
 			}
-		]
+		];
 
 		this.chart_actions = $(`<div class="chart-actions btn-group dropdown pull-right">
 			<a class="dropdown-toggle" data-toggle="dropdown"
@@ -171,8 +171,7 @@ class DashboardChart {
 		};
 		if(!this.chart) {
 			this.chart = new Chart(this.chart_container.find(".chart-wrapper")[0], chart_args);
-		}
-		else {
+		} else {
 			this.chart.update(this.data);
 		}
 	}
diff --git a/frappe/desk/doctype/dashboard/dashboard.js b/frappe/desk/doctype/dashboard/dashboard.js
index 9bcd8cf981..19ce8eb1fd 100644
--- a/frappe/desk/doctype/dashboard/dashboard.js
+++ b/frappe/desk/doctype/dashboard/dashboard.js
@@ -3,6 +3,6 @@
 
 frappe.ui.form.on('Dashboard', {
 	refresh: function(frm) {
-		frm.add_custom_button(__("Show Dashboard"), () => frappe.set_route('dashboard', frm.doc.name))
+		frm.add_custom_button(__("Show Dashboard"), () => frappe.set_route('dashboard', frm.doc.name));
 	}
 });
diff --git a/frappe/desk/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py
index acaeb5dc67..fae0585161 100644
--- a/frappe/desk/doctype/dashboard/dashboard.py
+++ b/frappe/desk/doctype/dashboard/dashboard.py
@@ -3,7 +3,6 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe
 from frappe.model.document import Document
 
 class Dashboard(Document):
diff --git a/frappe/desk/doctype/dashboard/test_dashboard.py b/frappe/desk/doctype/dashboard/test_dashboard.py
index ac56d00642..d5485d8f70 100644
--- a/frappe/desk/doctype/dashboard/test_dashboard.py
+++ b/frappe/desk/doctype/dashboard/test_dashboard.py
@@ -3,7 +3,6 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import frappe
 import unittest
 
 class TestDashboard(unittest.TestCase):
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 99c6f9717f..5ff00ac43b 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -3,7 +3,6 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe
 from frappe.model.document import Document
 
 class DashboardChart(Document):
diff --git a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
index a9aa0b2263..5c22f62276 100644
--- a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
@@ -3,7 +3,6 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import frappe
 import unittest
 
 class TestDashboardChart(unittest.TestCase):

From f41eb39b13784391c94dc266fb69afc5b48b388e Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 6 Feb 2019 09:37:13 +0530
Subject: [PATCH 064/256] feat(dashboard): Create Dashboard Chart Source
 doctype

---
 .../dashboard_chart_source/__init__.py        |   0
 .../dashboard_chart_source.js                 |   8 ++
 .../dashboard_chart_source.json               | 130 ++++++++++++++++++
 .../dashboard_chart_source.py                 |  17 +++
 .../test_dashboard_chart_source.py            |  10 ++
 5 files changed, 165 insertions(+)
 create mode 100644 frappe/desk/doctype/dashboard_chart_source/__init__.py
 create mode 100644 frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.js
 create mode 100644 frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.json
 create mode 100644 frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.py
 create mode 100644 frappe/desk/doctype/dashboard_chart_source/test_dashboard_chart_source.py

diff --git a/frappe/desk/doctype/dashboard_chart_source/__init__.py b/frappe/desk/doctype/dashboard_chart_source/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.js b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.js
new file mode 100644
index 0000000000..7218f2b86c
--- /dev/null
+++ b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2019, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Dashboard Chart Source', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.json b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.json
new file mode 100644
index 0000000000..a87b2bf9b9
--- /dev/null
+++ b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.json
@@ -0,0 +1,130 @@
+{
+ "allow_copy": 0,
+ "allow_events_in_timeline": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "autoname": "field:source_name",
+ "beta": 0,
+ "creation": "2019-02-06 07:55:29.579840",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "source_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Source Name",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 1
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "module",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Module",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Module Def",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2019-02-06 07:55:31.898604",
+ "modified_by": "Administrator",
+ "module": "Desk",
+ "name": "Dashboard Chart Source",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
+   "write": 1
+  }
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "",
+ "track_changes": 1,
+ "track_seen": 0,
+ "track_views": 0
+}
\ No newline at end of file
diff --git a/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.py b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.py
new file mode 100644
index 0000000000..048d2bc588
--- /dev/null
+++ b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe.modules.export_file import export_to_files
+
+
+class DashboardChartSource(Document):
+	def validate(self):
+		if frappe.session.user != "Administrator":
+			frappe.throw(_("Only Administrator allowed to create Dashboard Chart Sources"))
+
+	def on_update(self):
+		export_to_files(record_list=[[self.doctype, self.name]], record_module=self.module, create_init=True)
diff --git a/frappe/desk/doctype/dashboard_chart_source/test_dashboard_chart_source.py b/frappe/desk/doctype/dashboard_chart_source/test_dashboard_chart_source.py
new file mode 100644
index 0000000000..1247240ff1
--- /dev/null
+++ b/frappe/desk/doctype/dashboard_chart_source/test_dashboard_chart_source.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestDashboardChartSource(unittest.TestCase):
+	pass

From ab6e1a312cdc8f0bd4e82db4619ed95f402f70cb Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 6 Feb 2019 09:37:46 +0530
Subject: [PATCH 065/256] feat(dashboard): Show filters in a table

---
 .../dashboard_chart/dashboard_chart.js        | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index ff84a0a976..d902616147 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -2,6 +2,30 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Dashboard Chart', {
+	onload: function(frm) {
+		var wrapper = $(frm.fields_dict["filters_json"].wrapper).empty();
+		let filter_table = $(`<table class="table table-bordered">
+			<thead>
+				<tr>
+					<td>${ __("Filter") }</td>
+					<td>${ __("Value") }</td>
+				</tr>
+			</thead>
+			<tbody></tbody>
+		</table>`);
+
+		const filters = JSON.parse(frm.doc.filters_json);
+
+		Object.keys(filters).forEach(key => {
+			const filter_row = $(`<tr>
+				<td>${frappe.model.unscrub(key)}</td>
+				<td>${filters[key]}</td>
+			</tr>`);
+			filter_table.find('tbody').append(filter_row);
+		});
+
+		wrapper.append(filter_table);
+	},
 	refresh: function(frm) {
 
 	}

From 7ba50fa48edea9475014578bd14e35203f4d99bc Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 6 Feb 2019 09:39:18 +0530
Subject: [PATCH 066/256] refactor(dashboard): Fetch filter fields from .js
 file

---
 frappe/core/page/dashboard/dashboard.js       |  47 +++-
 frappe/core/page/dashboard/dashboard.py       |  19 ++
 .../dashboard_chart/dashboard_chart.json      | 222 +++++++-----------
 3 files changed, 134 insertions(+), 154 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 655bbe7444..cf082d8d27 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -1,3 +1,8 @@
+// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
+// MIT License. See license.txt
+
+frappe.provide("frappe.dashboard_chart_sources");
+
 frappe.pages['dashboard'].on_page_load = function(wrapper) {
 	frappe.ui.make_app_page({
 		parent: wrapper,
@@ -60,12 +65,14 @@ class DashboardChart {
 	}
 
 	show() {
-		this.prepare_chart_object();
-		this.prepare_container();
-		this.fetch().then((data) => {
-			this.update_last_synced();
-			this.data = data;
-			this.render();
+		this.get_settings().then(() => {
+			this.prepare_chart_object();
+			this.prepare_container();
+			this.fetch().then((data) => {
+				this.update_last_synced();
+				this.data = data;
+				this.render();
+			});
 		});
 	}
 
@@ -90,7 +97,7 @@ class DashboardChart {
 				handler: () => {
 					const d = new frappe.ui.Dialog({
 						title: __('Set Filters'),
-						fields: this.filter_fields,
+						fields: this.settings.filters,
 					});
 					d.set_values(this.filters);
 					d.show();
@@ -109,7 +116,7 @@ class DashboardChart {
 						d.hide();
 					};
 
-					this.filter_fields.map(field => field.onchange = e => {
+					this.settings.filters.map(field => field.onchange = e => {
 						if(e) {
 							d.set_primary_action(__('Save Filters'), set_filters);
 						}
@@ -150,10 +157,9 @@ class DashboardChart {
 
 	fetch(refresh=false) {
 		return frappe.xcall(
-			"frappe.core.page.dashboard.dashboard.get_data",
+			this.settings.method_path,
 			{
-				chart_name: this.chart_doc.name,
-				refresh: refresh,
+				filters: this.filters,
 			}
 		);
 	}
@@ -191,6 +197,23 @@ class DashboardChart {
 
 	prepare_chart_object() {
 		this.filters = JSON.parse(this.chart_doc.filters_json || '{}');
-		this.filter_fields = JSON.parse(this.chart_doc.filter_fields || '[]');
+	}
+
+	get_settings() {
+		if (frappe.dashboard_chart_sources && frappe.dashboard_chart_sources[this.chart_doc.source]) {
+			return this._load_script;
+		}
+		this._load_script = new Promise(resolve => frappe.call({
+			method: 'frappe.core.page.dashboard.dashboard.get_script',
+			args: {
+				source_name: this.chart_doc.source
+			},
+			callback: result => {
+				frappe.dom.eval(result.message.script || '');
+				this.settings = frappe.dashboard_chart_sources[this.chart_doc.source];
+				resolve();
+			}
+		}));
+		return this._load_script;
 	}
 }
\ No newline at end of file
diff --git a/frappe/core/page/dashboard/dashboard.py b/frappe/core/page/dashboard/dashboard.py
index e88d990788..3c3aae3800 100644
--- a/frappe/core/page/dashboard/dashboard.py
+++ b/frappe/core/page/dashboard/dashboard.py
@@ -2,7 +2,10 @@
 # MIT License. See license.txt
 from __future__ import unicode_literals
 import json
+import os
 import frappe
+from frappe.modules import get_module_path
+from frappe.model.utils import render_include
 
 
 @frappe.whitelist()
@@ -30,3 +33,19 @@ def generate_and_cache_results(chart, filters, cache_key):
 	frappe.cache().set_value(cache_key, json.dumps(results, default=str))
 	frappe.db.set_value("Dashboard Chart", chart.name, "last_synced_on", frappe.utils.now())
 	return results
+
+
+@frappe.whitelist()
+def get_script(source_name):
+	source = frappe.get_doc("Dashboard Chart Source", source_name)
+	module_path = get_module_path(source.module)
+	scrubbed_source_name = frappe.scrub(source_name)
+	script_path = os.path.join(module_path, "dashboard_chart_source", scrubbed_source_name, scrubbed_source_name + ".js")
+
+	if os.path.exists(script_path):
+		with open(script_path, "r") as f:
+			script = f.read()
+
+	return {
+		"script": render_include(script),
+	}
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index fa606abb88..9cb71f2a34 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -4,6 +4,7 @@
  "allow_guest_to_view": 0,
  "allow_import": 0,
  "allow_rename": 0,
+ "autoname": "field:chart_name",
  "beta": 0,
  "creation": "2019-01-10 12:28:06.282875",
  "custom": 0,
@@ -43,7 +44,7 @@
    "search_index": 0,
    "set_only_once": 0,
    "translatable": 0,
-   "unique": 0
+   "unique": 1
   },
   {
    "allow_bulk_edit": 0,
@@ -52,7 +53,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fieldname": "column_break_2",
+   "fieldname": "column_break_6",
    "fieldtype": "Column Break",
    "hidden": 0,
    "ignore_user_permissions": 0,
@@ -83,18 +84,19 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fieldname": "method_path",
-   "fieldtype": "Data",
+   "fieldname": "source",
+   "fieldtype": "Link",
    "hidden": 0,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_filter": 0,
    "in_global_search": 0,
-   "in_list_view": 1,
+   "in_list_view": 0,
    "in_standard_filter": 0,
-   "label": "Method Path",
+   "label": "Chart Source",
    "length": 0,
    "no_copy": 0,
+   "options": "Dashboard Chart Source",
    "permlevel": 0,
    "precision": "",
    "print_hide": 0,
@@ -115,7 +117,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fieldname": "chart_details_section",
+   "fieldname": "filters_section",
    "fieldtype": "Section Break",
    "hidden": 0,
    "ignore_user_permissions": 0,
@@ -124,7 +126,72 @@
    "in_global_search": 0,
    "in_list_view": 0,
    "in_standard_filter": 0,
-   "label": "Chart Details",
+   "label": "Filters",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "filters_json",
+   "fieldtype": "Code",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Filters JSON",
+   "length": 0,
+   "no_copy": 0,
+   "options": "JSON",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "chart_options_section",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Chart Options",
    "length": 0,
    "no_copy": 0,
    "permlevel": 0,
@@ -213,7 +280,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fieldname": "column_break_6",
+   "fieldname": "column_break_2",
    "fieldtype": "Column Break",
    "hidden": 0,
    "ignore_user_permissions": 0,
@@ -276,7 +343,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fieldname": "filter_details_section",
+   "fieldname": "section_break_10",
    "fieldtype": "Section Break",
    "hidden": 0,
    "ignore_user_permissions": 0,
@@ -285,7 +352,6 @@
    "in_global_search": 0,
    "in_list_view": 0,
    "in_standard_filter": 0,
-   "label": "Filter Details",
    "length": 0,
    "no_copy": 0,
    "permlevel": 0,
@@ -301,70 +367,6 @@
    "translatable": 0,
    "unique": 0
   },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_9",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "filter_fields",
-   "fieldtype": "Code",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Filter Fields",
-   "length": 0,
-   "no_copy": 0,
-   "options": "JSON",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
   {
    "allow_bulk_edit": 0,
    "allow_in_quick_entry": 0,
@@ -388,7 +390,7 @@
    "precision": "",
    "print_hide": 0,
    "print_hide_if_no_value": 0,
-   "read_only": 0,
+   "read_only": 1,
    "remember_last_selected_value": 0,
    "report_hide": 0,
    "reqd": 0,
@@ -396,70 +398,6 @@
    "set_only_once": 0,
    "translatable": 0,
    "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_11",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "filters_json",
-   "fieldtype": "Code",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Filters JSON",
-   "length": 0,
-   "no_copy": 0,
-   "options": "JSON",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
   }
  ],
  "has_web_view": 0,
@@ -472,7 +410,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-01-16 20:10:54.811477",
+ "modified": "2019-02-06 09:27:26.109148",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",
@@ -505,7 +443,7 @@
  "show_name_in_global_search": 0,
  "sort_field": "modified",
  "sort_order": "DESC",
- "title_field": "chart_name",
+ "title_field": "",
  "track_changes": 1,
  "track_seen": 0,
  "track_views": 0

From 310086c88f0dcba4b550b9f630c25c13f7cf3871 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 6 Feb 2019 09:40:08 +0530
Subject: [PATCH 067/256] feat(dashboard): Create Dashboard Chart Source docs
 from exported files

---
 frappe/model/sync.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/model/sync.py b/frappe/model/sync.py
index e59944bb1b..18bf827c5f 100644
--- a/frappe/model/sync.py
+++ b/frappe/model/sync.py
@@ -68,7 +68,7 @@ def get_doc_files(files, start_path, force=0, sync_everything = False, verbose=F
 	"""walk and sync all doctypes and pages"""
 
 	# load in sequence - warning for devs
-	document_types = ['doctype', 'page', 'report', 'print_format',
+	document_types = ['doctype', 'page', 'report', 'dashboard_chart_source', 'print_format',
 		'website_theme', 'web_form', 'notification', 'print_style',
 		 'data_migration_mapping', 'data_migration_plan']
 	for doctype in document_types:

From 60951d00f844c98d65830eaf83f13fbd5d8c7730 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 6 Feb 2019 10:15:01 +0530
Subject: [PATCH 068/256] feat(dashboard): New cache_source decorator for
 caching

---
 frappe/core/page/dashboard/dashboard.js |  2 ++
 frappe/core/page/dashboard/dashboard.py | 40 ++++++++++++-------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index cf082d8d27..2edfe578cf 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -159,7 +159,9 @@ class DashboardChart {
 		return frappe.xcall(
 			this.settings.method_path,
 			{
+				chart_name: this.chart_doc.name,
 				filters: this.filters,
+				refresh: refresh,
 			}
 		);
 	}
diff --git a/frappe/core/page/dashboard/dashboard.py b/frappe/core/page/dashboard/dashboard.py
index 3c3aae3800..a9717d41c4 100644
--- a/frappe/core/page/dashboard/dashboard.py
+++ b/frappe/core/page/dashboard/dashboard.py
@@ -8,30 +8,30 @@ from frappe.modules import get_module_path
 from frappe.model.utils import render_include
 
 
-@frappe.whitelist()
-def get_data(chart_name, refresh=False):
-	chart = frappe.get_doc("Dashboard Chart", chart_name)
-	filters = json.loads(chart.filters_json)
-	cache_key = json.dumps({
-		"name": chart.method_path,
-		"filters": filters
-	}, default=str)
-
-	if refresh == "true":
-		results = generate_and_cache_results(chart, filters, cache_key)
-	else:
-		cached_results = frappe.cache().get_value(cache_key)
-		if cached_results:
-			results = json.loads(frappe.safe_decode(cached_results))
+def cache_source(function):
+	def wrapper(*args, **kwargs):
+		filters = json.loads(kwargs.get("filters", "{}"))
+		chart_name = kwargs.get("chart_name")
+		cache_key = json.dumps({
+			"name": chart_name,
+			"filters": filters
+		}, default=str)
+		if kwargs.get("refresh") == "true":
+			results = generate_and_cache_results(chart_name, function, filters, cache_key)
 		else:
-			results = generate_and_cache_results(chart, filters, cache_key)
-	return results
+			cached_results = frappe.cache().get_value(cache_key)
+			if cached_results:
+				results = json.loads(frappe.safe_decode(cached_results))
+			else:
+				results = generate_and_cache_results(chart_name, function, filters, cache_key)
+		return results
+	return wrapper
 
 
-def generate_and_cache_results(chart, filters, cache_key):
-	results = frappe.get_attr(chart.method_path)(filters=frappe._dict(filters))
+def generate_and_cache_results(chart_name, function, filters, cache_key):
+	results = function(frappe._dict(filters))
 	frappe.cache().set_value(cache_key, json.dumps(results, default=str))
-	frappe.db.set_value("Dashboard Chart", chart.name, "last_synced_on", frappe.utils.now())
+	frappe.db.set_value("Dashboard Chart", chart_name, "last_synced_on", frappe.utils.now())
 	return results
 
 

From 138fc5c82bb332b34d91a063367e528ac1efffa8 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 6 Feb 2019 10:40:11 +0530
Subject: [PATCH 069/256] fix(dashboard): Fetch data with correct filters

---
 frappe/core/page/dashboard/dashboard.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 2edfe578cf..084460d9e4 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -68,7 +68,7 @@ class DashboardChart {
 		this.get_settings().then(() => {
 			this.prepare_chart_object();
 			this.prepare_container();
-			this.fetch().then((data) => {
+			this.fetch(this.filters).then((data) => {
 				this.update_last_synced();
 				this.data = data;
 				this.render();
@@ -106,7 +106,7 @@ class DashboardChart {
 						const values = d.get_values();
 						if (!Object.entries(this.filters).map(e => values[e[0]] === e[1]).every(Boolean)) {
 							frappe.db.set_value("Dashboard Chart", this.chart_doc.name, "filters_json", JSON.stringify(values)).then(() => {
-								this.fetch().then(data => {
+								this.fetch(values, true).then(data => {
 									this.update_chart_object();
 									this.data = data;
 									this.render();
@@ -127,7 +127,7 @@ class DashboardChart {
 				label: __("Force Refresh"),
 				action: "force-refresh",
 				handler: () => {
-					this.fetch(true).then(data => {
+					this.fetch(this.filters, true).then(data => {
 						this.update_chart_object();
 						this.data = data;
 						this.render();
@@ -155,12 +155,12 @@ class DashboardChart {
 
 	}
 
-	fetch(refresh=false) {
+	fetch(filters, refresh=false) {
 		return frappe.xcall(
 			this.settings.method_path,
 			{
 				chart_name: this.chart_doc.name,
-				filters: this.filters,
+				filters: filters,
 				refresh: refresh,
 			}
 		);

From 11202c79b4f686ca99432037899a5fa914b656c2 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 6 Feb 2019 10:41:32 +0530
Subject: [PATCH 070/256] refactor(dashboard): Remove tabular filter view

---
 .../dashboard_chart/dashboard_chart.js        | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index d902616147..ff84a0a976 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -2,30 +2,6 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Dashboard Chart', {
-	onload: function(frm) {
-		var wrapper = $(frm.fields_dict["filters_json"].wrapper).empty();
-		let filter_table = $(`<table class="table table-bordered">
-			<thead>
-				<tr>
-					<td>${ __("Filter") }</td>
-					<td>${ __("Value") }</td>
-				</tr>
-			</thead>
-			<tbody></tbody>
-		</table>`);
-
-		const filters = JSON.parse(frm.doc.filters_json);
-
-		Object.keys(filters).forEach(key => {
-			const filter_row = $(`<tr>
-				<td>${frappe.model.unscrub(key)}</td>
-				<td>${filters[key]}</td>
-			</tr>`);
-			filter_table.find('tbody').append(filter_row);
-		});
-
-		wrapper.append(filter_table);
-	},
 	refresh: function(frm) {
 
 	}

From e7a59ad1cbe6dc789da0fc4a83b7e2d98ac0af6f Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 6 Feb 2019 10:43:57 +0530
Subject: [PATCH 071/256] fix(dashboard): Remove unnecessary column break

---
 .../dashboard_chart/dashboard_chart.json      | 34 ++-----------------
 1 file changed, 2 insertions(+), 32 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index 9cb71f2a34..0aefc38c63 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -46,37 +46,6 @@
    "translatable": 0,
    "unique": 1
   },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_6",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
   {
    "allow_bulk_edit": 0,
    "allow_in_quick_entry": 0,
@@ -149,6 +118,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "default": "",
    "fieldname": "filters_json",
    "fieldtype": "Code",
    "hidden": 0,
@@ -410,7 +380,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-02-06 09:27:26.109148",
+ "modified": "2019-02-06 10:43:29.276670",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",

From fa7b67d16b8bd86a3e36d795aed6fc2852e09fd1 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 6 Feb 2019 10:53:24 +0530
Subject: [PATCH 072/256] refactor(dashboard): Break down prepare_container
 into smaller functions

---
 frappe/core/page/dashboard/dashboard.js | 63 +++++++++++++------------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 084460d9e4..53c1490dbd 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -68,6 +68,7 @@ class DashboardChart {
 		this.get_settings().then(() => {
 			this.prepare_chart_object();
 			this.prepare_container();
+			this.prepare_chart_actions();
 			this.fetch(this.filters).then((data) => {
 				this.update_last_synced();
 				this.data = data;
@@ -89,39 +90,14 @@ class DashboardChart {
 
 		let last_synced_text = $(`<span class="text-muted last-synced-text"></span>`);
 		last_synced_text.prependTo(this.chart_container);
+	}
 
+	prepare_chart_actions() {
 		let actions = [
 			{
 				label: __("Set Filters"),
 				action: "set-filters",
-				handler: () => {
-					const d = new frappe.ui.Dialog({
-						title: __('Set Filters'),
-						fields: this.settings.filters,
-					});
-					d.set_values(this.filters);
-					d.show();
-
-					const set_filters = () => {
-						const values = d.get_values();
-						if (!Object.entries(this.filters).map(e => values[e[0]] === e[1]).every(Boolean)) {
-							frappe.db.set_value("Dashboard Chart", this.chart_doc.name, "filters_json", JSON.stringify(values)).then(() => {
-								this.fetch(values, true).then(data => {
-									this.update_chart_object();
-									this.data = data;
-									this.render();
-								});
-							});
-						}
-						d.hide();
-					};
-
-					this.settings.filters.map(field => field.onchange = e => {
-						if(e) {
-							d.set_primary_action(__('Save Filters'), set_filters);
-						}
-					});
-				}
+				handler: this.create_set_filters_dialog
 			},
 			{
 				label: __("Force Refresh"),
@@ -150,9 +126,7 @@ class DashboardChart {
 			const action = o.dataset.action;
 			$(o).click(actions.find(a => a.action === action));
 		});
-
 		this.chart_actions.prependTo(this.chart_container);
-
 	}
 
 	fetch(filters, refresh=false) {
@@ -218,4 +192,33 @@ class DashboardChart {
 		}));
 		return this._load_script;
 	}
+
+	create_set_filters_dialog() {
+		const d = new frappe.ui.Dialog({
+			title: __('Set Filters'),
+			fields: this.settings.filters,
+		});
+		d.set_values(this.filters);
+		d.show();
+
+		const set_filters = () => {
+			const values = d.get_values();
+			if (!Object.entries(this.filters).map(e => values[e[0]] === e[1]).every(Boolean)) {
+				frappe.db.set_value("Dashboard Chart", this.chart_doc.name, "filters_json", JSON.stringify(values)).then(() => {
+					this.fetch(values, true).then(data => {
+						this.update_chart_object();
+						this.data = data;
+						this.render();
+					});
+				});
+			}
+			d.hide();
+		};
+
+		this.settings.filters.map(field => field.onchange = e => {
+			if(e) {
+				d.set_primary_action(__('Save Filters'), set_filters);
+			}
+		});
+	}
 }
\ No newline at end of file

From 654d125a3b672f627d73b1ffade1bf5c5a850124 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 6 Feb 2019 10:54:23 +0530
Subject: [PATCH 073/256] fix(dashboard): Update error message

---
 .../doctype/dashboard_chart_source/dashboard_chart_source.py    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.py b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.py
index 048d2bc588..70c1bda483 100644
--- a/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.py
+++ b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.py
@@ -11,7 +11,7 @@ from frappe.modules.export_file import export_to_files
 class DashboardChartSource(Document):
 	def validate(self):
 		if frappe.session.user != "Administrator":
-			frappe.throw(_("Only Administrator allowed to create Dashboard Chart Sources"))
+			frappe.throw(_("Only Administrator is allowed to create Dashboard Chart Sources"))
 
 	def on_update(self):
 		export_to_files(record_list=[[self.doctype, self.name]], record_module=self.module, create_init=True)

From dd94bc04aee2642dc79f44acc591f738f04e0b6b Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 6 Feb 2019 13:10:57 +0530
Subject: [PATCH 074/256] fix(dashboard): Show update filters modal correctly

---
 frappe/core/page/dashboard/dashboard.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 53c1490dbd..cb04a3968d 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -97,7 +97,7 @@ class DashboardChart {
 			{
 				label: __("Set Filters"),
 				action: "set-filters",
-				handler: this.create_set_filters_dialog
+				handler: this.create_set_filters_dialog.bind(this)
 			},
 			{
 				label: __("Force Refresh"),
@@ -196,7 +196,7 @@ class DashboardChart {
 	create_set_filters_dialog() {
 		const d = new frappe.ui.Dialog({
 			title: __('Set Filters'),
-			fields: this.settings.filters,
+			fields: this.settings.filters
 		});
 		d.set_values(this.filters);
 		d.show();

From f36d2c078fefc386bbd685ec563f2048d247f6bc Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 6 Feb 2019 13:11:37 +0530
Subject: [PATCH 075/256] style: Linting fixes

---
 .../dashboard_chart_source/test_dashboard_chart_source.py        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frappe/desk/doctype/dashboard_chart_source/test_dashboard_chart_source.py b/frappe/desk/doctype/dashboard_chart_source/test_dashboard_chart_source.py
index 1247240ff1..822526b591 100644
--- a/frappe/desk/doctype/dashboard_chart_source/test_dashboard_chart_source.py
+++ b/frappe/desk/doctype/dashboard_chart_source/test_dashboard_chart_source.py
@@ -3,7 +3,6 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import frappe
 import unittest
 
 class TestDashboardChartSource(unittest.TestCase):

From b7241f34b4479caf293d8f553df36ce8fd53ea0c Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 6 Feb 2019 19:38:02 +0530
Subject: [PATCH 076/256] feat(dashboard): Provide modal to update filters

---
 .../dashboard_chart/dashboard_chart.js        | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index ff84a0a976..657402501f 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -1,8 +1,73 @@
 // Copyright (c) 2019, Frappe Technologies and contributors
 // For license information, please see license.txt
+frappe.provide("frappe.dashboard_chart_sources");
 
 frappe.ui.form.on('Dashboard Chart', {
 	refresh: function(frm) {
+		frm.trigger("show_filters");
+	},
 
+	source: function(frm) {
+		frm.trigger("show_filters");
+	},
+
+	show_filters: function(frm) {
+		if (frm.doc.source) {
+			if (frappe.dashboard_chart_sources && frappe.dashboard_chart_sources[frm.doc.source]) {
+				frm.trigger('render_filters_table');
+			} else {
+				frappe.call({
+					method: 'frappe.core.page.dashboard.dashboard.get_script',
+					args: {
+						source_name: frm.doc.source
+					},
+					callback: result => {
+						frappe.dom.eval(result.message.script || '');
+						frm.trigger('render_filters_table');
+					}
+				});
+			}
+		}
+	},
+
+	render_filters_table: function(frm) {
+		let fields = frappe.dashboard_chart_sources[frm.doc.source].filters;
+
+		let wrapper = $(frm.get_field('filters_json').wrapper).empty();
+		let table = $(`<table class="table table-bordered" style="cursor:pointer; margin:0px;">
+			<thead>
+				<tr>
+					<th>${__('Filter')}</th>
+					<th>${__('Value')}</th>
+				</tr>
+			</thead>
+			<tbody></tbody>
+		</table>`).appendTo(wrapper);
+		$(`<p class="text-muted small">${__("Click table to edit")}</p>`).appendTo(wrapper);
+
+		let filters = JSON.parse(frm.doc.filters_json || '{}');
+		fields.map( f => {
+			const filter_row = $(`<tr><td>${f.label}</td><td>${filters[f.fieldname]}</td></tr>`);
+			table.find('tbody').append(filter_row);
+		});
+
+		table.on('click', () => {
+			let dialog = new frappe.ui.Dialog({
+				title: __('Set Filters'),
+				fields: fields,
+				primary_action: function() {
+					let values = this.get_values();
+					if(values) {
+						this.hide();
+						frm.set_value('filters_json', JSON.stringify(values));
+						frm.trigger('show_filters');
+					}
+				}
+			});
+			dialog.show();
+			dialog.set_values(filters);
+		});
 	}
 });
+
+

From 866f8b2a0825f618d35042905dbbb36e7290b65a Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 6 Feb 2019 20:41:34 +0530
Subject: [PATCH 077/256] feat(dashboard): Use xIsSeries chart option for time
 series

---
 frappe/core/page/dashboard/dashboard.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index cb04a3968d..5ff0cbf98b 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -150,6 +150,9 @@ class DashboardChart {
 			data: this.data,
 			type: chart_type_map[this.chart_doc.type],
 			colors: [this.chart_doc.color || "light-blue"],
+			axisOptions: {
+				xIsSeries: this.settings.is_time_series
+			},
 		};
 		if(!this.chart) {
 			this.chart = new Chart(this.chart_container.find(".chart-wrapper")[0], chart_args);

From 179a9e0db6ccefd5941ca85bcd31547a3cdeae6c Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 6 Feb 2019 23:44:27 +0530
Subject: [PATCH 078/256] feat(dashboard): Show links to other dashboards in a
 dropdown menu

---
 frappe/core/page/dashboard/dashboard.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 5ff0cbf98b..4e3ef18a5a 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -33,6 +33,7 @@ class Dashboard {
 		if(this.dashboard_name !== current_dashboard_name) {
 			this.dashboard_name = current_dashboard_name;
 			this.page.set_title(this.dashboard_name);
+			this.set_dropdown();
 			this.refresh();
 		}
 		this.charts = {};
@@ -56,6 +57,17 @@ class Dashboard {
 	get_dashboard_doc() {
 		return frappe.model.with_doc('Dashboard', this.dashboard_name);
 	}
+
+	set_dropdown() {
+		frappe.db.get_list("Dashboard").then(dashboards => {
+			dashboards.map(dashboard => {
+				let name = dashboard.name;
+				if(name != this.dashboard_name){
+					this.page.add_menu_item(name, () => frappe.set_route("dashboard", name));
+				}
+			});
+		});
+	}
 }
 
 class DashboardChart {

From 45332d02c44046f04300a95b5c6e6b33f862f082 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Tue, 12 Mar 2019 16:35:40 +0530
Subject: [PATCH 079/256] fix(dashboard): Use Dashboard Chart Link for listing
 charts

---
 frappe/core/page/dashboard/dashboard.js       |  8 +-
 frappe/desk/doctype/dashboard/dashboard.json  |  6 +-
 .../dashboard_chart/dashboard_chart.json      | 14 +++-
 .../doctype/dashboard_chart_link/__init__.py  |  0
 .../dashboard_chart_link.json                 | 77 +++++++++++++++++++
 .../dashboard_chart_link.py                   | 10 +++
 6 files changed, 109 insertions(+), 6 deletions(-)
 create mode 100644 frappe/desk/doctype/dashboard_chart_link/__init__.py
 create mode 100644 frappe/desk/doctype/dashboard_chart_link/dashboard_chart_link.json
 create mode 100644 frappe/desk/doctype/dashboard_chart_link/dashboard_chart_link.py

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 4e3ef18a5a..bf218670f2 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -44,12 +44,14 @@ class Dashboard {
 			this.dashboard_doc = doc;
 			this.charts = this.dashboard_doc.charts;
 
-			this.charts.map((chart_doc) => {
+			this.charts.map((chart) => {
 				let chart_container = $("<div><div>");
 				chart_container.appendTo(this.container);
 
-				let dashboard_chart = new DashboardChart(chart_doc, chart_container);
-				dashboard_chart.show();
+				frappe.model.with_doc("Dashboard Chart", chart.chart).then( chart_doc => {
+					let dashboard_chart = new DashboardChart(chart_doc, chart_container);
+					dashboard_chart.show();
+				});
 			});
 		});
 	}
diff --git a/frappe/desk/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json
index e7f2d73784..4df97a957c 100644
--- a/frappe/desk/doctype/dashboard/dashboard.json
+++ b/frappe/desk/doctype/dashboard/dashboard.json
@@ -21,6 +21,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "dashboard_name",
    "fieldtype": "Data",
    "hidden": 0,
@@ -53,6 +54,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "charts",
    "fieldtype": "Table",
    "hidden": 0,
@@ -65,7 +67,7 @@
    "label": "Charts",
    "length": 0,
    "no_copy": 0,
-   "options": "Dashboard Chart",
+   "options": "Dashboard Chart Link",
    "permlevel": 0,
    "precision": "",
    "print_hide": 0,
@@ -90,7 +92,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-01-16 13:35:14.516114",
+ "modified": "2019-03-12 15:01:12.183208",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard",
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index 0aefc38c63..09503d8a17 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -21,6 +21,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "chart_name",
    "fieldtype": "Data",
    "hidden": 0,
@@ -53,6 +54,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "source",
    "fieldtype": "Link",
    "hidden": 0,
@@ -86,6 +88,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "filters_section",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -119,6 +122,8 @@
    "collapsible": 0,
    "columns": 0,
    "default": "",
+   "depends_on": "",
+   "fetch_if_empty": 0,
    "fieldname": "filters_json",
    "fieldtype": "Code",
    "hidden": 0,
@@ -152,6 +157,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "chart_options_section",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -184,6 +190,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "type",
    "fieldtype": "Select",
    "hidden": 0,
@@ -217,6 +224,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "width",
    "fieldtype": "Select",
    "hidden": 0,
@@ -250,6 +258,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "column_break_2",
    "fieldtype": "Column Break",
    "hidden": 0,
@@ -281,6 +290,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "color",
    "fieldtype": "Color",
    "hidden": 0,
@@ -313,6 +323,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "section_break_10",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -344,6 +355,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "last_synced_on",
    "fieldtype": "Datetime",
    "hidden": 0,
@@ -380,7 +392,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-02-06 10:43:29.276670",
+ "modified": "2019-03-12 15:06:15.868942",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",
diff --git a/frappe/desk/doctype/dashboard_chart_link/__init__.py b/frappe/desk/doctype/dashboard_chart_link/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/desk/doctype/dashboard_chart_link/dashboard_chart_link.json b/frappe/desk/doctype/dashboard_chart_link/dashboard_chart_link.json
new file mode 100644
index 0000000000..df278fb4c1
--- /dev/null
+++ b/frappe/desk/doctype/dashboard_chart_link/dashboard_chart_link.json
@@ -0,0 +1,77 @@
+{
+ "allow_copy": 0,
+ "allow_events_in_timeline": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2019-03-12 15:00:57.052684",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "chart",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Chart",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Dashboard Chart",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "max_attachments": 0,
+ "modified": "2019-03-12 15:01:31.639414",
+ "modified_by": "Administrator",
+ "module": "Desk",
+ "name": "Dashboard Chart Link",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "ASC",
+ "track_changes": 1,
+ "track_seen": 0,
+ "track_views": 0
+}
\ No newline at end of file
diff --git a/frappe/desk/doctype/dashboard_chart_link/dashboard_chart_link.py b/frappe/desk/doctype/dashboard_chart_link/dashboard_chart_link.py
new file mode 100644
index 0000000000..7cd4f9daa3
--- /dev/null
+++ b/frappe/desk/doctype/dashboard_chart_link/dashboard_chart_link.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class DashboardChartLink(Document):
+	pass

From 3567326ae90a6e34f2330669374ebad96101c079 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Mon, 18 Mar 2019 11:17:38 +0530
Subject: [PATCH 080/256] fix(dashboard): Use config insteaad of get_script

Earlier implementation used a get_script function which
served a JS configuration file which was then evaluated
inside the dom.

Now dashboard chart source contains a code field for
storing configuration in JSON
---
 frappe/core/page/dashboard/dashboard.js       | 17 ++-------
 frappe/core/page/dashboard/dashboard.py       | 16 --------
 .../dashboard_chart/dashboard_chart.js        | 21 +++++-----
 .../dashboard_chart/dashboard_chart.json      |  2 +-
 .../dashboard_chart_source.json               | 38 ++++++++++++++++++-
 5 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index bf218670f2..ea49cf2999 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -193,21 +193,10 @@ class DashboardChart {
 	}
 
 	get_settings() {
-		if (frappe.dashboard_chart_sources && frappe.dashboard_chart_sources[this.chart_doc.source]) {
-			return this._load_script;
-		}
-		this._load_script = new Promise(resolve => frappe.call({
-			method: 'frappe.core.page.dashboard.dashboard.get_script',
-			args: {
-				source_name: this.chart_doc.source
-			},
-			callback: result => {
-				frappe.dom.eval(result.message.script || '');
-				this.settings = frappe.dashboard_chart_sources[this.chart_doc.source];
-				resolve();
-			}
+		return new Promise(resolve => frappe.db.get_value("Dashboard Chart Source", this.chart_doc.source, "config", e => {
+			this.settings = JSON.parse(e.config);
+			resolve();
 		}));
-		return this._load_script;
 	}
 
 	create_set_filters_dialog() {
diff --git a/frappe/core/page/dashboard/dashboard.py b/frappe/core/page/dashboard/dashboard.py
index a9717d41c4..ce4bf4742c 100644
--- a/frappe/core/page/dashboard/dashboard.py
+++ b/frappe/core/page/dashboard/dashboard.py
@@ -33,19 +33,3 @@ def generate_and_cache_results(chart_name, function, filters, cache_key):
 	frappe.cache().set_value(cache_key, json.dumps(results, default=str))
 	frappe.db.set_value("Dashboard Chart", chart_name, "last_synced_on", frappe.utils.now())
 	return results
-
-
-@frappe.whitelist()
-def get_script(source_name):
-	source = frappe.get_doc("Dashboard Chart Source", source_name)
-	module_path = get_module_path(source.module)
-	scrubbed_source_name = frappe.scrub(source_name)
-	script_path = os.path.join(module_path, "dashboard_chart_source", scrubbed_source_name, scrubbed_source_name + ".js")
-
-	if os.path.exists(script_path):
-		with open(script_path, "r") as f:
-			script = f.read()
-
-	return {
-		"script": render_include(script),
-	}
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 657402501f..b86e6b7d8d 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -4,6 +4,7 @@ frappe.provide("frappe.dashboard_chart_sources");
 
 frappe.ui.form.on('Dashboard Chart', {
 	refresh: function(frm) {
+		frm.set_df_property("filters_section", "hidden", 1);
 		frm.trigger("show_filters");
 	},
 
@@ -13,25 +14,20 @@ frappe.ui.form.on('Dashboard Chart', {
 
 	show_filters: function(frm) {
 		if (frm.doc.source) {
-			if (frappe.dashboard_chart_sources && frappe.dashboard_chart_sources[frm.doc.source]) {
+			if (frm.filters) {
 				frm.trigger('render_filters_table');
 			} else {
-				frappe.call({
-					method: 'frappe.core.page.dashboard.dashboard.get_script',
-					args: {
-						source_name: frm.doc.source
-					},
-					callback: result => {
-						frappe.dom.eval(result.message.script || '');
-						frm.trigger('render_filters_table');
-					}
+				frappe.db.get_value("Dashboard Chart Source", frm.doc.source, "config", e => {
+					frm.filters = JSON.parse(e.config).filters;
+					frm.trigger('render_filters_table');
 				});
 			}
 		}
 	},
 
 	render_filters_table: function(frm) {
-		let fields = frappe.dashboard_chart_sources[frm.doc.source].filters;
+		frm.set_df_property("filters_section", "hidden", 0);
+		let fields = frm.filters;
 
 		let wrapper = $(frm.get_field('filters_json').wrapper).empty();
 		let table = $(`<table class="table table-bordered" style="cursor:pointer; margin:0px;">
@@ -62,7 +58,8 @@ frappe.ui.form.on('Dashboard Chart', {
 						frm.set_value('filters_json', JSON.stringify(values));
 						frm.trigger('show_filters');
 					}
-				}
+				},
+				primary_action_label: "Set"
 			});
 			dialog.show();
 			dialog.set_values(filters);
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index 09503d8a17..6406a3a0f0 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -392,7 +392,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-03-12 15:06:15.868942",
+ "modified": "2019-03-18 11:05:51.316816",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",
diff --git a/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.json b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.json
index a87b2bf9b9..f46468ba9f 100644
--- a/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.json
+++ b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.json
@@ -21,6 +21,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "source_name",
    "fieldtype": "Data",
    "hidden": 0,
@@ -53,6 +54,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "module",
    "fieldtype": "Link",
    "hidden": 0,
@@ -78,6 +80,40 @@
    "set_only_once": 0,
    "translatable": 0,
    "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "config",
+   "fieldtype": "Code",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Config",
+   "length": 0,
+   "no_copy": 0,
+   "options": "JSON",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   }
  ],
  "has_web_view": 0,
@@ -90,7 +126,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-02-06 07:55:31.898604",
+ "modified": "2019-03-15 14:57:17.696656",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart Source",

From e31368a9f72faa31cd6f11f694e63eb4cf259a51 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Mon, 18 Mar 2019 11:35:07 +0530
Subject: [PATCH 081/256] style: Linting fixes

---
 frappe/core/page/dashboard/dashboard.js | 5 ++++-
 frappe/core/page/dashboard/dashboard.py | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index ea49cf2999..7ac3eec066 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -125,7 +125,10 @@ class DashboardChart {
 				}
 			}
 		];
+		this.set_chart_actions(actions);
+	}
 
+	set_chart_actions(actions) {
 		this.chart_actions = $(`<div class="chart-actions btn-group dropdown pull-right">
 			<a class="dropdown-toggle" data-toggle="dropdown"
 				aria-haspopup="true" aria-expanded="false"> <button class="btn btn-default btn-xs"><span class="caret"></span></button>
@@ -149,7 +152,7 @@ class DashboardChart {
 			{
 				chart_name: this.chart_doc.name,
 				filters: filters,
-				refresh: refresh,
+				refresh: refresh ? 1 : 0,
 			}
 		);
 	}
diff --git a/frappe/core/page/dashboard/dashboard.py b/frappe/core/page/dashboard/dashboard.py
index ce4bf4742c..b1f45e0737 100644
--- a/frappe/core/page/dashboard/dashboard.py
+++ b/frappe/core/page/dashboard/dashboard.py
@@ -16,7 +16,7 @@ def cache_source(function):
 			"name": chart_name,
 			"filters": filters
 		}, default=str)
-		if kwargs.get("refresh") == "true":
+		if kwargs.get("refresh"):
 			results = generate_and_cache_results(chart_name, function, filters, cache_key)
 		else:
 			cached_results = frappe.cache().get_value(cache_key)

From 7182312746171077b903645f0a87e2f42e1f1694 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Mon, 18 Mar 2019 11:41:57 +0530
Subject: [PATCH 082/256] fix(dashboard): Clear container when rendering
 another dashboard

---
 frappe/core/page/dashboard/dashboard.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 7ac3eec066..561d2d4104 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -34,6 +34,7 @@ class Dashboard {
 			this.dashboard_name = current_dashboard_name;
 			this.page.set_title(this.dashboard_name);
 			this.set_dropdown();
+			this.container.empty();
 			this.refresh();
 		}
 		this.charts = {};
@@ -61,6 +62,7 @@ class Dashboard {
 	}
 
 	set_dropdown() {
+		this.page.clear_menu();
 		frappe.db.get_list("Dashboard").then(dashboards => {
 			dashboards.map(dashboard => {
 				let name = dashboard.name;

From bd03fd5e1615ffba736472babf2f98605c959a98 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Mon, 25 Mar 2019 15:52:06 +0530
Subject: [PATCH 083/256] fix: Formatting issue in print_grid template (#7122)

Before:
![Screenshot 2019-03-25 at 2 32 27 PM](https://user-images.githubusercontent.com/42651287/54908358-b288f500-4f0d-11e9-9271-1ef0baffcb9e.png)

After:
![Screenshot 2019-03-25 at 2 42 51 PM](https://user-images.githubusercontent.com/42651287/54908369-bc125d00-4f0d-11e9-82ff-f2b5f575a5a5.png)
---
 .../public/js/frappe/views/reports/print_grid.html  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/print_grid.html b/frappe/public/js/frappe/views/reports/print_grid.html
index c559a234af..12854e74f3 100644
--- a/frappe/public/js/frappe/views/reports/print_grid.html
+++ b/frappe/public/js/frappe/views/reports/print_grid.html
@@ -31,9 +31,15 @@
                     {% var value = col.fieldname ? row[col.fieldname] : row[col.id]; %}
 
                     <td>
-                        {{ col.formatter
-	                        ? col.formatter(row._index, col._index, value, col, row, true)
-                            : (col.docfield ? frappe.format(value, col.docfield) : value) }}
+                        {{
+                            col.formatter
+                                ? col.formatter(row._index, col._index, value, col, row, true)
+                                : col.format
+                                    ? col.format(value, row, col, data)
+                                    : col.docfield
+                                        ? frappe.format(value, col.docfield)
+                                        : value
+                        }}
                     </td>
                 {% endif %}
             {% endfor %}
@@ -41,3 +47,4 @@
         {% endfor %}
     </tbody>
 </table>
+

From 9b67ed156230b13dfde78a2797391fcf70644c2f Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 25 Mar 2019 16:37:16 +0530
Subject: [PATCH 084/256] fix: Get real review data

- Rename points_gained listener to energy_point_alert
- Fix alert messages
---
 frappe/public/js/frappe/desk.js               |  2 +-
 frappe/public/js/frappe/form/review.js        | 34 ++++++-----
 .../energy_point_log/energy_point_log.py      | 57 ++++++++++++++-----
 3 files changed, 66 insertions(+), 27 deletions(-)

diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index e444e335bf..4a9157cc6d 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -554,7 +554,7 @@ frappe.Application = Class.extend({
 	},
 
 	setup_energy_point_listeners() {
-		frappe.realtime.on('points_gained', (message) => {
+		frappe.realtime.on('energy_point_alert', (message) => {
 			frappe.show_alert(message);
 		});
 	},
diff --git a/frappe/public/js/frappe/form/review.js b/frappe/public/js/frappe/form/review.js
index f4324f5cae..3b1ec9a434 100644
--- a/frappe/public/js/frappe/form/review.js
+++ b/frappe/public/js/frappe/form/review.js
@@ -9,6 +9,7 @@ frappe.ui.form.Review = class Review {
 		this.frm = frm;
 		this.make_review_container();
 		this.add_review_button();
+		this.update_reviewers();
 	}
 	make_review_container() {
 		this.$wrapper = this.parent.append(`
@@ -18,20 +19,10 @@ frappe.ui.form.Review = class Review {
 				<li class="review-list"></li>
 			</ul>
 		`);
+		this.review_list_wrapper = this.$wrapper.find('.review-list');
 	}
 	add_review_button() {
-		this.review_list_wrapper = this.$wrapper.find('.review-list');
-
-		Object.keys(frappe.boot.user_info).forEach((user) => {
-			this.review_list_wrapper.append(`
-				<span class="review-pill">
-					${frappe.avatar(user)}
-					<span class="text-muted">
-						${Math.floor(Math.random() * 100) + 1}
-					</span>
-				</span>
-			`);
-		});
+		if (!frappe.boot.review_points) return;
 
 		this.review_list_wrapper.append(`
 			<span class="avatar avatar-small avatar-empty share-doc-btn cursor-pointer" title="${__("Review")}">
@@ -94,7 +85,7 @@ frappe.ui.form.Review = class Review {
 				label: __('Reason')
 			}],
 			primary_action: (values) => {
-				if (values.points >= frappe.boot.review_points) {
+				if (values.points > frappe.boot.review_points) {
 					return frappe.msgprint(__('You do not have enough points'));
 				}
 				// Add energy point log -- need api for that
@@ -117,4 +108,21 @@ frappe.ui.form.Review = class Review {
 		});
 		review_dialog.show();
 	}
+	update_reviewers() {
+		frappe.xcall('frappe.social.doctype.energy_point_log.energy_point_log.get_reviews', {
+			'doctype': this.frm.doc.doctype,
+			'docname': this.frm.doc.name,
+		}).then(review_logs => {
+			review_logs.forEach(review_log => {
+				this.review_list_wrapper.prepend(`
+					<span class="review-pill">
+						${frappe.avatar(review_log.owner)}
+						<span class="text-muted">
+							${review_log.points}
+						</span>
+					</span>
+				`);
+			});
+		});
+	}
 };
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index 7ca75c91f4..325f3588d1 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -12,8 +12,21 @@ from frappe.utils import cint
 class EnergyPointLog(Document):
 	def after_insert(self):
 		if self.type == 'Auto':
-			message='=== You gained <b>{}</b> points ==='.format(self.points)
-			frappe.publish_realtime('points_gained', message=message , user=self.user)
+			message=_('You gained <b>{}</b> points').format(self.points)
+		elif self.type == 'Appreciation':
+			message = _('{} appreciated your work on {} with {} points'.format(
+				self.owner,
+				self.reference_name,
+				self.points
+			))
+		elif self.type == 'Criticism':
+			message = _('{} criticized your work on {} with {} points'.format(
+				self.owner,
+				self.reference_name,
+				self.points
+			))
+		if message:
+			frappe.publish_realtime('energy_point_alert', message=message , user=self.user)
 
 def create_energy_points_log(ref_doctype, ref_name, doc):
 	doc = frappe._dict(doc)
@@ -53,33 +66,51 @@ def get_energy_points(user, points_type=None):
 
 	return log[0].points if log else 0
 
+def get_user_energy_and_review_points():
+	points_list =  frappe.db.sql("""
+		SELECT
+			SUM(CASE WHEN `type`!= 'Review' THEN `points` ELSE 0 END) as energy_points,
+			SUM(CASE WHEN `type`='Review' THEN `points` ELSE 0 END) as review_points,
+			`user`
+		FROM `tabEnergy Point Log`
+		GROUP BY `user`
+	""", as_dict=1)
+
+	dict_to_return = frappe._dict()
+
+	for d in points_list:
+		dict_to_return[d.pop('user')] = d
+
+	return dict_to_return
+
+
 @frappe.whitelist()
 def review(doc, points, to_user, reason, review_type='Appreciation'):
 	current_review_points = get_energy_points(frappe.session.user, 'Review')
 	doc = frappe._dict(json.loads(doc))
-	points = cint(points)
-	if current_review_points < abs(points):
+	points = abs(cint(points))
+	if current_review_points < points:
 		frappe.msgprint(_('You do not have enough review points'))
 		return
 
 	# deduct review points from reviewer
 	create_review_points_log(
 		user=frappe.session.user,
-		points=-abs(points),
+		points=-points,
 		reason=reason
 	)
 
 	create_energy_points_log(doc.doctype, doc.name, {
 		'type': review_type,
 		'reason': reason,
-		'points': points,
+		'points': points if review_type == 'Appreciation' else -points,
 		'user': to_user
 	})
 
-	message = _('{} appreciated your work on {} with {} points'.format(
-		frappe.session.user,
-		doc.name,
-		points
-	))
-
-	frappe.publish_realtime('points_gained', message=message , user=to_user)
\ No newline at end of file
+@frappe.whitelist()
+def get_reviews(doctype, docname):
+	return frappe.get_all('Energy Point Log', filters={
+		'reference_doctype': doctype,
+		'reference_name': docname,
+		'type': ['in', ('Appreciation', 'Criticism')],
+	}, fields=['points', 'owner', 'type', 'user'])
\ No newline at end of file

From 860473ab0a24ccdcdd7d6e563d5dadbed8ba5b6f Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 25 Mar 2019 16:38:27 +0530
Subject: [PATCH 085/256] fix: Check for review point allocation date

---
 .../energy_point_settings.py                   | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/frappe/social/doctype/energy_point_settings/energy_point_settings.py b/frappe/social/doctype/energy_point_settings/energy_point_settings.py
index d343e9e32d..65b8a2626c 100644
--- a/frappe/social/doctype/energy_point_settings/energy_point_settings.py
+++ b/frappe/social/doctype/energy_point_settings/energy_point_settings.py
@@ -6,7 +6,7 @@ from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
 from frappe.social.doctype.energy_point_log.energy_point_log import create_review_points_log
-from frappe.utils import add_to_date, today
+from frappe.utils import add_to_date, today, getdate
 
 class EnergyPointSettings(Document):
 	pass
@@ -34,15 +34,17 @@ def create_review_points(level):
 
 def can_allocate_today(last_date, periodicity):
 	if not last_date:
-		days_to_add = {
-			'Daily': 1,
-			'Weekly': 7,
-			'Monthly': 30
-		}.get(periodicity, 1)
+		return True
 
-		next_allocation_date = add_to_date(last_date, days=days_to_add)
+	days_to_add = {
+		'Daily': 1,
+		'Weekly': 7,
+		'Monthly': 30
+	}.get(periodicity, 1)
 
-		return next_allocation_date <= today()
+	next_allocation_date = add_to_date(last_date, days=days_to_add)
+
+	return getdate(next_allocation_date) <= getdate()
 
 
 def get_users_with_role(role):

From 0d98d24a40f6fd0164ea13c2ec28b90896da7259 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 14 Mar 2019 14:10:45 +0530
Subject: [PATCH 086/256] feat: add rating field in the webform

---
 .../web_form_field/web_form_field.json        | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/frappe/website/doctype/web_form_field/web_form_field.json b/frappe/website/doctype/web_form_field/web_form_field.json
index 31d36c5625..8b6eb5744d 100644
--- a/frappe/website/doctype/web_form_field/web_form_field.json
+++ b/frappe/website/doctype/web_form_field/web_form_field.json
@@ -19,6 +19,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "fieldname",
    "fieldtype": "Select",
    "hidden": 0,
@@ -50,6 +51,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "fieldtype",
    "fieldtype": "Select",
    "hidden": 0,
@@ -62,7 +64,7 @@
    "label": "Fieldtype",
    "length": 0,
    "no_copy": 0,
-   "options": "Attach\nAttach Image\nCheck\nCurrency\nData\nDate\nDatetime\nFloat\nHTML\nInt\nLink\nSelect\nSmall Text\nText\nText Editor\nTable\nSection Break\nColumn Break\nPage Break",
+   "options": "Attach\nAttach Image\nCheck\nCurrency\nData\nDate\nDatetime\nFloat\nHTML\nInt\nLink\nRating\nSelect\nSmall Text\nText\nText Editor\nTable\nSection Break\nColumn Break\nPage Break",
    "permlevel": 0,
    "print_hide": 0,
    "print_hide_if_no_value": 0,
@@ -82,6 +84,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "label",
    "fieldtype": "Data",
    "hidden": 0,
@@ -114,6 +117,7 @@
    "collapsible": 0,
    "columns": 0,
    "depends_on": "eval:doc.fieldtype === 'Link'",
+   "fetch_if_empty": 0,
    "fieldname": "allow_read_on_all_link_options",
    "fieldtype": "Check",
    "hidden": 0,
@@ -146,6 +150,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "reqd",
    "fieldtype": "Check",
    "hidden": 0,
@@ -177,6 +182,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "depends_on",
    "fieldtype": "Code",
    "hidden": 0,
@@ -209,6 +215,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "read_only",
    "fieldtype": "Check",
    "hidden": 0,
@@ -240,6 +247,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "show_in_filter",
    "fieldtype": "Check",
    "hidden": 0,
@@ -272,6 +280,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "hidden",
    "fieldtype": "Check",
    "hidden": 0,
@@ -303,6 +312,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "column_break_4",
    "fieldtype": "Column Break",
    "hidden": 0,
@@ -333,6 +343,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "options",
    "fieldtype": "Text",
    "hidden": 0,
@@ -364,6 +375,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "max_length",
    "fieldtype": "Int",
    "hidden": 0,
@@ -397,6 +409,7 @@
    "collapsible": 0,
    "columns": 0,
    "depends_on": "eval:doc.fieldtype=='Int'",
+   "fetch_if_empty": 0,
    "fieldname": "max_value",
    "fieldtype": "Int",
    "hidden": 0,
@@ -429,6 +442,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "section_break_6",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -459,6 +473,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "description",
    "fieldtype": "Text",
    "hidden": 0,
@@ -490,6 +505,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "column_break_8",
    "fieldtype": "Column Break",
    "hidden": 0,
@@ -520,6 +536,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "default",
    "fieldtype": "Data",
    "hidden": 0,
@@ -555,7 +572,7 @@
  "issingle": 0,
  "istable": 1,
  "max_attachments": 0,
- "modified": "2019-01-31 15:06:55.367043",
+ "modified": "2019-03-12 17:00:50.034229",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Web Form Field",

From 813b6fc77738f957072c9cbc0d45a2d72970b3b1 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 14 Mar 2019 14:12:29 +0530
Subject: [PATCH 087/256] feat: create a control for rating

---
 .../public/js/frappe/form/controls/rating.js  | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 frappe/public/js/frappe/form/controls/rating.js

diff --git a/frappe/public/js/frappe/form/controls/rating.js b/frappe/public/js/frappe/form/controls/rating.js
new file mode 100644
index 0000000000..0e0b90750e
--- /dev/null
+++ b/frappe/public/js/frappe/form/controls/rating.js
@@ -0,0 +1,52 @@
+frappe.ui.form.ControlRating  = frappe.ui.form.ControlInt.extend({
+	make_input() {
+		this._super();
+		const star_template = `
+		<div>
+			<i class="fa fa-fw fa-star-o star-icon" data-idx=1></i>
+			<i class="fa fa-fw fa-star-o star-icon" data-idx=2></i>
+			<i class="fa fa-fw fa-star-o star-icon" data-idx=3></i>
+			<i class="fa fa-fw fa-star-o star-icon" data-idx=4></i>
+			<i class="fa fa-fw fa-star-o star-icon" data-idx=5></i>
+		</div>
+		`;
+		
+		this.$input_wrapper.html(star_template);
+
+		this.$input_wrapper.find('i').hover((ev) => {
+			const el = $(ev.currentTarget);
+			var star_value = el.data('idx');
+			el.parent().children('i.fa').each( function(e){
+				if (e < star_value) {
+					$(this).addClass('fa-star');
+					$(this).removeClass('fa-star-o');
+				} else {
+					$(this).addClass('fa-star-o');
+					$(this).removeClass('fa-star');
+				}
+			});	
+		}, (ev) => {
+			const el = $(ev.currentTarget);
+			el.parent().children('i.fa').each( function(e) {
+				$(this).addClass('fa-star-o');
+				$(this).removeClass('fa-star');
+			});
+		});
+
+		this.$input_wrapper.find('i').click((ev) => {
+			const el = $(ev.currentTarget);
+			var star_value = el.data('idx');
+			el.parent().children('i.fa').each( function(e) {
+				if (e < star_value){
+					$(this).css('color', 'green');
+				} else {
+					$(this).css('color', '');
+				}
+				
+			});
+		});
+	},
+	set_formatted_input(value) { 
+		console.log(value)
+	}
+});
\ No newline at end of file

From 32f834be787bcfe17fd237644ebca7cd628d70b1 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 14 Mar 2019 14:17:53 +0530
Subject: [PATCH 088/256] feat: add font awesome as part of frappe-web-b4

---
 frappe/public/build.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frappe/public/build.json b/frappe/public/build.json
index 73a9fae189..2ce134ea42 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -12,6 +12,7 @@
 		"node_modules/frappe-datatable/dist/frappe-datatable.css"
 	],
 	"css/frappe-web-b4.css": [
+		"public/css/font-awesome.css",
 		"public/less/indicator.less",
 		"public/scss/website.scss"
 	],
@@ -93,7 +94,8 @@
 		"public/js/frappe/form/controls/geolocation.js",
 		"public/js/frappe/form/controls/multiselect.js",
 		"public/js/frappe/form/controls/multicheck.js",
-		"public/js/frappe/form/controls/table_multiselect.js"
+		"public/js/frappe/form/controls/table_multiselect.js",
+		"public/js/frappe/form/controls/rating.js"
 	],
 	"js/dialog.min.js": [
 		"public/js/frappe/dom.js",

From c660efdf0c3c59a5152431aa5435201344e2e701 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Fri, 15 Mar 2019 12:12:54 +0530
Subject: [PATCH 089/256] feat: register a separate event for click by
 maintaining state

---
 .../public/js/frappe/form/controls/rating.js  | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/rating.js b/frappe/public/js/frappe/form/controls/rating.js
index 0e0b90750e..3b15591710 100644
--- a/frappe/public/js/frappe/form/controls/rating.js
+++ b/frappe/public/js/frappe/form/controls/rating.js
@@ -2,12 +2,12 @@ frappe.ui.form.ControlRating  = frappe.ui.form.ControlInt.extend({
 	make_input() {
 		this._super();
 		const star_template = `
-		<div>
-			<i class="fa fa-fw fa-star-o star-icon" data-idx=1></i>
-			<i class="fa fa-fw fa-star-o star-icon" data-idx=2></i>
-			<i class="fa fa-fw fa-star-o star-icon" data-idx=3></i>
-			<i class="fa fa-fw fa-star-o star-icon" data-idx=4></i>
-			<i class="fa fa-fw fa-star-o star-icon" data-idx=5></i>
+		<div class = "rating">
+			<i class="fa fa-fw fa-star text-extra-muted" data-idx=1></i>
+			<i class="fa fa-fw fa-star text-extra-muted" data-idx=2></i>
+			<i class="fa fa-fw fa-star text-extra-muted" data-idx=3></i>
+			<i class="fa fa-fw fa-star text-extra-muted" data-idx=4></i>
+			<i class="fa fa-fw fa-star text-extra-muted" data-idx=5></i>
 		</div>
 		`;
 		
@@ -18,19 +18,16 @@ frappe.ui.form.ControlRating  = frappe.ui.form.ControlInt.extend({
 			var star_value = el.data('idx');
 			el.parent().children('i.fa').each( function(e){
 				if (e < star_value) {
-					$(this).addClass('fa-star');
-					$(this).removeClass('fa-star-o');
+					$(this).addClass('hover');
 				} else {
-					$(this).addClass('fa-star-o');
-					$(this).removeClass('fa-star');
+					$(this).removeClass('hover');
 				}
 			});	
 		}, (ev) => {
-			const el = $(ev.currentTarget);
-			el.parent().children('i.fa').each( function(e) {
-				$(this).addClass('fa-star-o');
-				$(this).removeClass('fa-star');
-			});
+				const el = $(ev.currentTarget);
+				el.parent().children('i.fa').each( function(e) {
+					$(this).removeClass('hover');
+				});
 		});
 
 		this.$input_wrapper.find('i').click((ev) => {
@@ -38,15 +35,19 @@ frappe.ui.form.ControlRating  = frappe.ui.form.ControlInt.extend({
 			var star_value = el.data('idx');
 			el.parent().children('i.fa').each( function(e) {
 				if (e < star_value){
-					$(this).css('color', 'green');
+					$(this).addClass('click');
+					
 				} else {
-					$(this).css('color', '');
+					$(this).removeClass('click');
 				}
-				
 			});
+			this.set_value(star_value);
 		});
 	},
+	get_value() {
+		return this.value ? this.value : 0;
+	},
 	set_formatted_input(value) { 
-		console.log(value)
+		console.log(this.$input_wrapper.find('i'))
 	}
 });
\ No newline at end of file

From 93561c4ff5e238b4c1f34a93e1739f55e7d5c1f6 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Fri, 15 Mar 2019 12:18:42 +0530
Subject: [PATCH 090/256] feat: set default value for the rating control

---
 frappe/public/js/frappe/form/controls/rating.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/controls/rating.js b/frappe/public/js/frappe/form/controls/rating.js
index 3b15591710..764dfc45d5 100644
--- a/frappe/public/js/frappe/form/controls/rating.js
+++ b/frappe/public/js/frappe/form/controls/rating.js
@@ -48,6 +48,11 @@ frappe.ui.form.ControlRating  = frappe.ui.form.ControlInt.extend({
 		return this.value ? this.value : 0;
 	},
 	set_formatted_input(value) { 
-		console.log(this.$input_wrapper.find('i'))
+		var el = this.$input_wrapper.find('i');
+		el.children('i.fa').prevObject.each( function(e) {
+			if (e < value){
+				$(this).addClass('click');	
+			} 
+		});	
 	}
 });
\ No newline at end of file

From 097f00d37d48d8873f1ff5aa3fb465cd3efbcfea Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Fri, 15 Mar 2019 12:21:56 +0530
Subject: [PATCH 091/256] feat: add css class for maintaing state in rating

---
 frappe/public/scss/website.scss | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss
index 8a42bc26dd..36ea2673f3 100644
--- a/frappe/public/scss/website.scss
+++ b/frappe/public/scss/website.scss
@@ -66,6 +66,10 @@ img {
 	text-decoration: underline;
 }
 
+.text-extra-muted {
+	color: #d1d8dd !important;
+}
+
 .web-footer {
 	padding: 5rem 0;
 	min-height: 140px;
@@ -87,3 +91,12 @@ img {
 .indicator {
     font-size: inherit;
 }
+
+.rating {
+	.hover {
+		color: rgb(148, 148, 143) !important;
+	}
+	.click {
+		color: rgb(7, 7, 6) !important;
+	}
+}
\ No newline at end of file

From d564cc26eb2394d6da46bd95114be7f606c4594d Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Mon, 18 Mar 2019 13:28:01 +0530
Subject: [PATCH 092/256] style: clean code format

---
 frappe/public/js/frappe/form/controls/rating.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/rating.js b/frappe/public/js/frappe/form/controls/rating.js
index 764dfc45d5..7e9b9c2474 100644
--- a/frappe/public/js/frappe/form/controls/rating.js
+++ b/frappe/public/js/frappe/form/controls/rating.js
@@ -22,7 +22,7 @@ frappe.ui.form.ControlRating  = frappe.ui.form.ControlInt.extend({
 				} else {
 					$(this).removeClass('hover');
 				}
-			});	
+			});
 		}, (ev) => {
 				const el = $(ev.currentTarget);
 				el.parent().children('i.fa').each( function(e) {
@@ -36,7 +36,6 @@ frappe.ui.form.ControlRating  = frappe.ui.form.ControlInt.extend({
 			el.parent().children('i.fa').each( function(e) {
 				if (e < star_value){
 					$(this).addClass('click');
-					
 				} else {
 					$(this).removeClass('click');
 				}
@@ -47,12 +46,12 @@ frappe.ui.form.ControlRating  = frappe.ui.form.ControlInt.extend({
 	get_value() {
 		return this.value ? this.value : 0;
 	},
-	set_formatted_input(value) { 
+	set_formatted_input(value) {
 		var el = this.$input_wrapper.find('i');
 		el.children('i.fa').prevObject.each( function(e) {
 			if (e < value){
-				$(this).addClass('click');	
-			} 
-		});	
+				$(this).addClass('click');
+			}
+		});
 	}
 });
\ No newline at end of file

From dfe55b6d97194ba6403a017653dd85a06fa836f8 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Mon, 25 Mar 2019 14:56:42 +0530
Subject: [PATCH 093/256] feat: add rating control in docfield, custom
 docfield, custom form field

---
 frappe/core/doctype/docfield/docfield.json    | 3247 +++++++++--------
 .../doctype/custom_field/custom_field.json    | 2862 +++++++--------
 .../customize_form_field.json                 | 2874 +++++++--------
 3 files changed, 4515 insertions(+), 4468 deletions(-)

diff --git a/frappe/core/doctype/docfield/docfield.json b/frappe/core/doctype/docfield/docfield.json
index dbc58e296e..b295a9be66 100644
--- a/frappe/core/doctype/docfield/docfield.json
+++ b/frappe/core/doctype/docfield/docfield.json
@@ -1,1601 +1,1648 @@
 {
-    "allow_copy": 0,
-    "allow_events_in_timeline": 0,
-    "allow_guest_to_view": 0,
-    "allow_import": 0,
-    "allow_rename": 0,
-    "autoname": "hash",
-    "beta": 0,
-    "creation": "2013-02-22 01:27:33",
-    "custom": 0,
-    "docstatus": 0,
-    "doctype": "DocType",
-    "document_type": "Setup",
-    "editable_grid": 1,
-    "engine": "InnoDB",
-    "fields": [
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "label_and_type",
-      "fieldtype": "Section Break",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 1,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "label",
-      "fieldtype": "Data",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 1,
-      "in_standard_filter": 0,
-      "label": "Label",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "label",
-      "oldfieldtype": "Data",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "print_width": "163",
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 1,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0,
-      "width": "163"
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 1,
-      "collapsible": 0,
-      "columns": 0,
-      "default": "Data",
-      "fieldname": "fieldtype",
-      "fieldtype": "Select",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 1,
-      "in_standard_filter": 0,
-      "label": "Type",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "fieldtype",
-      "oldfieldtype": "Select",
-      "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 1,
-      "search_index": 1,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 1,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "fieldname",
-      "fieldtype": "Data",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 1,
-      "in_standard_filter": 0,
-      "label": "Name",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "fieldname",
-      "oldfieldtype": "Data",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 1,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "reqd",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 1,
-      "in_standard_filter": 0,
-      "label": "Mandatory",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "reqd",
-      "oldfieldtype": "Check",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "print_width": "50px",
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0,
-      "width": "50px"
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval:in_list([\"Float\", \"Currency\", \"Percent\"], doc.fieldtype)",
-      "description": "Set non-standard precision for a Float or Currency field",
-      "fieldname": "precision",
-      "fieldtype": "Select",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Precision",
-      "length": 0,
-      "no_copy": 0,
-      "options": "\n1\n2\n3\n4\n5\n6\n7\n8\n9",
-      "permlevel": 0,
-      "print_hide": 1,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval:in_list(['Data', 'Link', 'Dynamic Link', 'Password', 'Select', 'Read Only', 'Attach', 'Attach Image', 'Int'], doc.fieldtype)",
-      "fieldname": "length",
-      "fieldtype": "Int",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Length",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "search_index",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Index",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "search_index",
-      "oldfieldtype": "Check",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "print_width": "50px",
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0,
-      "width": "50px"
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "in_list_view",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "In List View",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "print_width": "70px",
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0,
-      "width": "70px"
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "in_standard_filter",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "In Standard Filter",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval:([\"Data\", \"Select\", \"Table\", \"Text\", \"Text Editor\", \"Link\", \"Small Text\", \"Long Text\", \"Read Only\", \"Heading\", \"Dynamic Link\"].indexOf(doc.fieldtype) !== -1)",
-      "fieldname": "in_global_search",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "In Global Search",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "allow_in_quick_entry",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Allow in Quick Entry",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "bold",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Bold",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "default": "0",
-      "depends_on": "eval:['Data', 'Select', 'Text', 'Small Text', 'Text Editor'].includes(doc.fieldtype)",
-      "fieldname": "translatable",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Translatable",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval:doc.fieldtype===\"Section Break\"",
-      "fieldname": "collapsible",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Collapsible",
-      "length": 255,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval:doc.fieldtype==\"Section Break\"",
-      "fieldname": "collapsible_depends_on",
-      "fieldtype": "Code",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Collapsible Depends On",
-      "length": 0,
-      "no_copy": 0,
-      "options": "JS",
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "column_break_6",
-      "fieldtype": "Column Break",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "description": "For Links, enter the DocType as range.\nFor Select, enter list of Options, each on a new line.",
-      "fieldname": "options",
-      "fieldtype": "Small Text",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 1,
-      "in_standard_filter": 0,
-      "label": "Options",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "options",
-      "oldfieldtype": "Text",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "default",
-      "fieldtype": "Small Text",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Default",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "default",
-      "oldfieldtype": "Text",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "fetch_from",
-      "fieldtype": "Small Text",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Fetch From",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "description": "If checked, this field will be not overwritten based on Fetch From if a value already exists.",
-      "fieldname": "fetch_if_empty",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Fetch If Empty",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "permissions",
-      "fieldtype": "Section Break",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Permissions",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "depends_on",
-      "fieldtype": "Code",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Display Depends On",
-      "length": 255,
-      "no_copy": 0,
-      "oldfieldname": "depends_on",
-      "oldfieldtype": "Data",
-      "options": "JS",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "hidden",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Hidden",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "hidden",
-      "oldfieldtype": "Check",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "print_width": "50px",
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0,
-      "width": "50px"
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "read_only",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Read Only",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "print_width": "50px",
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0,
-      "width": "50px"
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "unique",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Unique",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "description": "Do not allow user to change after set the first time",
-      "fieldname": "set_only_once",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Set Only Once",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval: doc.fieldtype == \"Table\"",
-      "fieldname": "allow_bulk_edit",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Allow Bulk Edit",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "column_break_13",
-      "fieldtype": "Column Break",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "default": "0",
-      "fieldname": "permlevel",
-      "fieldtype": "Int",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Perm Level",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "permlevel",
-      "oldfieldtype": "Int",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "print_width": "50px",
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0,
-      "width": "50px"
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "description": "User permissions should not apply for this Link",
-      "fieldname": "ignore_user_permissions",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Ignore User Permissions",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval: parent.is_submittable",
-      "fieldname": "allow_on_submit",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Allow on Submit",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "allow_on_submit",
-      "oldfieldtype": "Check",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "print_width": "50px",
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0,
-      "width": "50px"
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "report_hide",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Report Hide",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "report_hide",
-      "oldfieldtype": "Check",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "print_width": "50px",
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0,
-      "width": "50px"
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval:(doc.fieldtype == 'Link')",
-      "fieldname": "remember_last_selected_value",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Remember Last Selected Value",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "description": "Don't HTML Encode HTML tags like &lt;script&gt; or just characters like &lt; or &gt;, as they could be intentionally used in this field",
-      "fieldname": "ignore_xss_filter",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Ignore XSS Filter",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "display",
-      "fieldtype": "Section Break",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Display",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "in_filter",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "In Filter",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "in_filter",
-      "oldfieldtype": "Check",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "print_width": "50px",
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0,
-      "width": "50px"
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "no_copy",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "No Copy",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "no_copy",
-      "oldfieldtype": "Check",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "print_width": "50px",
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0,
-      "width": "50px"
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "print_hide",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Print Hide",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "print_hide",
-      "oldfieldtype": "Check",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "print_width": "50px",
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0,
-      "width": "50px"
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval:[\"Int\", \"Float\", \"Currency\", \"Percent\"].indexOf(doc.fieldtype)!==-1",
-      "fieldname": "print_hide_if_no_value",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Print Hide If No Value",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "print_width",
-      "fieldtype": "Data",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Print Width",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "width",
-      "fieldtype": "Data",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Width",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "width",
-      "oldfieldtype": "Data",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "print_width": "50px",
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0,
-      "width": "50px"
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "",
-      "description": "Number of columns for a field in a List View or a Grid (Total Columns should be less than 11)",
-      "fieldname": "columns",
-      "fieldtype": "Int",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Columns",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "column_break_22",
-      "fieldtype": "Column Break",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "description",
-      "fieldtype": "Small Text",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 1,
-      "in_standard_filter": 0,
-      "label": "Description",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "description",
-      "oldfieldtype": "Text",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "print_width": "300px",
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0,
-      "width": "300px"
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "oldfieldname",
-      "fieldtype": "Data",
-      "hidden": 1,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "oldfieldname",
-      "oldfieldtype": "Data",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fieldname": "oldfieldtype",
-      "fieldtype": "Data",
-      "hidden": 1,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "oldfieldtype",
-      "oldfieldtype": "Data",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     }
-    ],
-    "has_web_view": 0,
-    "hide_heading": 0,
-    "hide_toolbar": 0,
-    "idx": 1,
-    "image_view": 0,
-    "in_create": 0,
-    "is_submittable": 0,
-    "issingle": 0,
-    "istable": 1,
-    "max_attachments": 0,
-    "modified": "2019-02-26 21:49:13.665322",
-    "modified_by": "Administrator",
-    "module": "Core",
-    "name": "DocField",
-    "owner": "Administrator",
-    "permissions": [],
-    "quick_entry": 0,
-    "read_only": 0,
-    "read_only_onload": 0,
-    "show_name_in_global_search": 0,
-    "sort_order": "ASC",
-    "track_changes": 0,
-    "track_seen": 0,
-    "track_views": 0
-   }
\ No newline at end of file
+ "allow_copy": 0,
+ "allow_events_in_timeline": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "autoname": "hash",
+ "beta": 0,
+ "creation": "2013-02-22 01:27:33",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "label_and_type",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "label",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Label",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "label",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": "163",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 1,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": "163"
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "Data",
+   "fetch_if_empty": 0,
+   "fieldname": "fieldtype",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Type",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "fieldtype",
+   "oldfieldtype": "Select",
+   "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 1,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "fieldname",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Name",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "fieldname",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 1,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "reqd",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Mandatory",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "reqd",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": "50px",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": "50px"
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:in_list([\"Float\", \"Currency\", \"Percent\"], doc.fieldtype)",
+   "description": "Set non-standard precision for a Float or Currency field",
+   "fetch_if_empty": 0,
+   "fieldname": "precision",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Precision",
+   "length": 0,
+   "no_copy": 0,
+   "options": "\n1\n2\n3\n4\n5\n6\n7\n8\n9",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:in_list(['Data', 'Link', 'Dynamic Link', 'Password', 'Select', 'Read Only', 'Attach', 'Attach Image', 'Int'], doc.fieldtype)",
+   "fetch_if_empty": 0,
+   "fieldname": "length",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Length",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "search_index",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Index",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "search_index",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": "50px",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": "50px"
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "in_list_view",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "In List View",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": "70px",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": "70px"
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "in_standard_filter",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "In Standard Filter",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:([\"Data\", \"Select\", \"Table\", \"Text\", \"Text Editor\", \"Link\", \"Small Text\", \"Long Text\", \"Read Only\", \"Heading\", \"Dynamic Link\"].indexOf(doc.fieldtype) !== -1)",
+   "fetch_if_empty": 0,
+   "fieldname": "in_global_search",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "In Global Search",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "allow_in_quick_entry",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Allow in Quick Entry",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "bold",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Bold",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "0",
+   "depends_on": "eval:['Data', 'Select', 'Text', 'Small Text', 'Text Editor'].includes(doc.fieldtype)",
+   "fetch_if_empty": 0,
+   "fieldname": "translatable",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Translatable",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:doc.fieldtype===\"Section Break\"",
+   "fetch_if_empty": 0,
+   "fieldname": "collapsible",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Collapsible",
+   "length": 255,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:doc.fieldtype==\"Section Break\"",
+   "fetch_if_empty": 0,
+   "fieldname": "collapsible_depends_on",
+   "fieldtype": "Code",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Collapsible Depends On",
+   "length": 0,
+   "no_copy": 0,
+   "options": "JS",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "column_break_6",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "For Links, enter the DocType as range.\nFor Select, enter list of Options, each on a new line.",
+   "fetch_if_empty": 0,
+   "fieldname": "options",
+   "fieldtype": "Small Text",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Options",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "options",
+   "oldfieldtype": "Text",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "default",
+   "fieldtype": "Small Text",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Default",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "default",
+   "oldfieldtype": "Text",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "fetch_from",
+   "fieldtype": "Small Text",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Fetch From",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "If checked, this field will be not overwritten based on Fetch From if a value already exists.",
+   "fetch_if_empty": 0,
+   "fieldname": "fetch_if_empty",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Fetch If Empty",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "permissions",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Permissions",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "depends_on",
+   "fieldtype": "Code",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Display Depends On",
+   "length": 255,
+   "no_copy": 0,
+   "oldfieldname": "depends_on",
+   "oldfieldtype": "Data",
+   "options": "JS",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "hidden",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Hidden",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "hidden",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": "50px",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": "50px"
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "read_only",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Read Only",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": "50px",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": "50px"
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "unique",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Unique",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "Do not allow user to change after set the first time",
+   "fetch_if_empty": 0,
+   "fieldname": "set_only_once",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Set Only Once",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval: doc.fieldtype == \"Table\"",
+   "fetch_if_empty": 0,
+   "fieldname": "allow_bulk_edit",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Allow Bulk Edit",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "column_break_13",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "0",
+   "fetch_if_empty": 0,
+   "fieldname": "permlevel",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Perm Level",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "permlevel",
+   "oldfieldtype": "Int",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": "50px",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": "50px"
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "User permissions should not apply for this Link",
+   "fetch_if_empty": 0,
+   "fieldname": "ignore_user_permissions",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Ignore User Permissions",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval: parent.is_submittable",
+   "fetch_if_empty": 0,
+   "fieldname": "allow_on_submit",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Allow on Submit",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "allow_on_submit",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": "50px",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": "50px"
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "report_hide",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Report Hide",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "report_hide",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": "50px",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": "50px"
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:(doc.fieldtype == 'Link')",
+   "fetch_if_empty": 0,
+   "fieldname": "remember_last_selected_value",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Remember Last Selected Value",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "Don't HTML Encode HTML tags like &lt;script&gt; or just characters like &lt; or &gt;, as they could be intentionally used in this field",
+   "fetch_if_empty": 0,
+   "fieldname": "ignore_xss_filter",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Ignore XSS Filter",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "display",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Display",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "in_filter",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "In Filter",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "in_filter",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": "50px",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": "50px"
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "no_copy",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "No Copy",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "no_copy",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": "50px",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": "50px"
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "print_hide",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Print Hide",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "print_hide",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": "50px",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": "50px"
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:[\"Int\", \"Float\", \"Currency\", \"Percent\"].indexOf(doc.fieldtype)!==-1",
+   "fetch_if_empty": 0,
+   "fieldname": "print_hide_if_no_value",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Print Hide If No Value",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "print_width",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Print Width",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "width",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Width",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "width",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": "50px",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": "50px"
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "description": "Number of columns for a field in a List View or a Grid (Total Columns should be less than 11)",
+   "fetch_if_empty": 0,
+   "fieldname": "columns",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Columns",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "column_break_22",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "description",
+   "fieldtype": "Small Text",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Description",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "description",
+   "oldfieldtype": "Text",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": "300px",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": "300px"
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "oldfieldname",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "oldfieldname",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "oldfieldtype",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "oldfieldtype",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 1,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "max_attachments": 0,
+ "modified": "2019-03-18 17:59:57.873790",
+ "modified_by": "Administrator",
+ "module": "Core",
+ "name": "DocField",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_order": "ASC",
+ "track_changes": 0,
+ "track_seen": 0,
+ "track_views": 0
+}
\ No newline at end of file
diff --git a/frappe/custom/doctype/custom_field/custom_field.json b/frappe/custom/doctype/custom_field/custom_field.json
index 9d13afd767..0f31939eb8 100644
--- a/frappe/custom/doctype/custom_field/custom_field.json
+++ b/frappe/custom/doctype/custom_field/custom_field.json
@@ -1,1432 +1,1432 @@
 {
-    "allow_copy": 0,
-    "allow_events_in_timeline": 0,
-    "allow_guest_to_view": 0,
-    "allow_import": 1,
-    "allow_rename": 0,
-    "beta": 0,
-    "creation": "2013-01-10 16:34:01",
-    "custom": 0,
-    "description": "Adds a custom field to a DocType",
-    "docstatus": 0,
-    "doctype": "DocType",
-    "document_type": "Setup",
-    "editable_grid": 0,
-    "engine": "InnoDB",
-    "fields": [
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 1,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "dt",
-      "fieldtype": "Link",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 1,
-      "in_global_search": 0,
-      "in_list_view": 1,
-      "in_standard_filter": 0,
-      "label": "Document",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "dt",
-      "oldfieldtype": "Link",
-      "options": "DocType",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 1,
-      "search_index": 1,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 1,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "label",
-      "fieldtype": "Data",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 1,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Label",
-      "length": 0,
-      "no_copy": 1,
-      "oldfieldname": "label",
-      "oldfieldtype": "Data",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "label_help",
-      "fieldtype": "HTML",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Label Help",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldtype": "HTML",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "fieldname",
-      "fieldtype": "Data",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 1,
-      "in_standard_filter": 0,
-      "label": "Fieldname",
-      "length": 0,
-      "no_copy": 1,
-      "oldfieldname": "fieldname",
-      "oldfieldtype": "Data",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 1,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "",
-      "description": "Select the label after which you want to insert new field.",
-      "fetch_if_empty": 0,
-      "fieldname": "insert_after",
-      "fieldtype": "Select",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Insert After",
-      "length": 0,
-      "no_copy": 1,
-      "oldfieldname": "insert_after",
-      "oldfieldtype": "Select",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "column_break_6",
-      "fieldtype": "Column Break",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 1,
-      "collapsible": 0,
-      "columns": 0,
-      "default": "Data",
-      "fetch_if_empty": 0,
-      "fieldname": "fieldtype",
-      "fieldtype": "Select",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 1,
-      "in_global_search": 0,
-      "in_list_view": 1,
-      "in_standard_filter": 0,
-      "label": "Field Type",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "fieldtype",
-      "oldfieldtype": "Select",
-      "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDynamic Link\nFloat\nGeolocation\nHTML\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 1,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval:in_list([\"Float\", \"Currency\", \"Percent\"], doc.fieldtype)",
-      "description": "Set non-standard precision for a Float or Currency field",
-      "fetch_if_empty": 0,
-      "fieldname": "precision",
-      "fieldtype": "Select",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Precision",
-      "length": 0,
-      "no_copy": 0,
-      "options": "\n1\n2\n3\n4\n5\n6\n7\n8\n9",
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "options",
-      "fieldtype": "Small Text",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 1,
-      "in_standard_filter": 0,
-      "label": "Options",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "options",
-      "oldfieldtype": "Text",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "fetch_from",
-      "fieldtype": "Small Text",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Fetch From",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "description": "If checked, this field will be not overwritten based on Fetch From if a value already exists.",
-      "fetch_if_empty": 0,
-      "fieldname": "fetch_if_empty",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Fetch If Empty",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "options_help",
-      "fieldtype": "HTML",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Options Help",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldtype": "HTML",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "section_break_11",
-      "fieldtype": "Section Break",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval:doc.fieldtype==\"Section Break\"",
-      "fetch_if_empty": 0,
-      "fieldname": "collapsible",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Collapsible",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval:doc.fieldtype==\"Section Break\"",
-      "fetch_if_empty": 0,
-      "fieldname": "collapsible_depends_on",
-      "fieldtype": "Code",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Collapsible Depends On",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "default",
-      "fieldtype": "Text",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Default Value",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "default",
-      "oldfieldtype": "Text",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "depends_on",
-      "fieldtype": "Code",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Depends On",
-      "length": 255,
-      "no_copy": 0,
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "description",
-      "fieldtype": "Text",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Field Description",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "description",
-      "oldfieldtype": "Text",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "print_width": "300px",
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0,
-      "width": "300px"
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "default": "0",
-      "fetch_if_empty": 0,
-      "fieldname": "permlevel",
-      "fieldtype": "Int",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Permission Level",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "permlevel",
-      "oldfieldtype": "Int",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "width",
-      "fieldtype": "Data",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Width",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "width",
-      "oldfieldtype": "Data",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "description": "Number of columns for a field in a List View or a Grid (Total Columns should be less than 11)",
-      "fetch_if_empty": 0,
-      "fieldname": "columns",
-      "fieldtype": "Int",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Columns",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "properties",
-      "fieldtype": "Column Break",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldtype": "Column Break",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "print_width": "50%",
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0,
-      "width": "50%"
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "reqd",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 1,
-      "in_standard_filter": 0,
-      "label": "Is Mandatory Field",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "reqd",
-      "oldfieldtype": "Check",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "unique",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Unique",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "read_only",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Read Only",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval:doc.fieldtype===\"Link\"",
-      "fetch_if_empty": 0,
-      "fieldname": "ignore_user_permissions",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Ignore User Permissions",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "hidden",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Hidden",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "print_hide",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Print Hide",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "print_hide",
-      "oldfieldtype": "Check",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval:[\"Int\", \"Float\", \"Currency\", \"Percent\"].indexOf(doc.fieldtype)!==-1",
-      "fetch_if_empty": 0,
-      "fieldname": "print_hide_if_no_value",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Print Hide If No Value",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "print_width",
-      "fieldtype": "Data",
-      "hidden": 1,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Print Width",
-      "length": 0,
-      "no_copy": 1,
-      "permlevel": 0,
-      "print_hide": 1,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "no_copy",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "No Copy",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "no_copy",
-      "oldfieldtype": "Check",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "allow_on_submit",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Allow on Submit",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "allow_on_submit",
-      "oldfieldtype": "Check",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "in_list_view",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "In List View",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "in_standard_filter",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "In Standard Filter",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval:([\"Data\", \"Select\", \"Table\", \"Text\", \"Text Editor\", \"Link\", \"Small Text\", \"Long Text\", \"Read Only\", \"Heading\", \"Dynamic Link\"].indexOf(doc.fieldtype) !== -1)",
-      "fetch_if_empty": 0,
-      "fieldname": "in_global_search",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "In Global Search",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "bold",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Bold",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "report_hide",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Report Hide",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "report_hide",
-      "oldfieldtype": "Check",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "search_index",
-      "fieldtype": "Check",
-      "hidden": 1,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Index",
-      "length": 0,
-      "no_copy": 1,
-      "permlevel": 0,
-      "print_hide": 1,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "description": "Don't HTML Encode HTML tags like &lt;script&gt; or just characters like &lt; or &gt;, as they could be intentionally used in this field",
-      "fetch_if_empty": 0,
-      "fieldname": "ignore_xss_filter",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Ignore XSS Filter",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "default": "1",
-      "depends_on": "eval:['Data', 'Select', 'Text', 'Small Text', 'Text Editor'].includes(doc.fieldtype)",
-      "fetch_if_empty": 0,
-      "fieldname": "translatable",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Translatable",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     }
-    ],
-    "has_web_view": 0,
-    "hide_heading": 0,
-    "hide_toolbar": 0,
-    "icon": "fa fa-glass",
-    "idx": 1,
-    "image_view": 0,
-    "in_create": 0,
-    "is_submittable": 0,
-    "issingle": 0,
-    "istable": 0,
-    "max_attachments": 0,
-    "modified": "2019-02-26 21:30:12.326576",
-    "modified_by": "Administrator",
-    "module": "Custom",
-    "name": "Custom Field",
-    "owner": "Administrator",
-    "permissions": [
-     {
-      "amend": 0,
-      "cancel": 0,
-      "create": 1,
-      "delete": 1,
-      "email": 1,
-      "export": 0,
-      "if_owner": 0,
-      "import": 0,
-      "permlevel": 0,
-      "print": 1,
-      "read": 1,
-      "report": 1,
-      "role": "Administrator",
-      "set_user_permissions": 0,
-      "share": 1,
-      "submit": 0,
-      "write": 1
-     },
-     {
-      "amend": 0,
-      "cancel": 0,
-      "create": 1,
-      "delete": 1,
-      "email": 1,
-      "export": 0,
-      "if_owner": 0,
-      "import": 0,
-      "permlevel": 0,
-      "print": 1,
-      "read": 1,
-      "report": 1,
-      "role": "System Manager",
-      "set_user_permissions": 0,
-      "share": 1,
-      "submit": 0,
-      "write": 1
-     }
-    ],
-    "quick_entry": 0,
-    "read_only": 0,
-    "read_only_onload": 0,
-    "search_fields": "dt,label,fieldtype,options",
-    "show_name_in_global_search": 0,
-    "sort_order": "ASC",
-    "track_changes": 1,
-    "track_seen": 0,
-    "track_views": 0
-   }
\ No newline at end of file
+ "allow_copy": 0,
+ "allow_events_in_timeline": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 1,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2013-01-10 16:34:01",
+ "custom": 0,
+ "description": "Adds a custom field to a DocType",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "editable_grid": 0,
+ "engine": "InnoDB",
+ "fields": [
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "dt",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 1,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Document",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "dt",
+   "oldfieldtype": "Link",
+   "options": "DocType",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 1,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "label",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 1,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Label",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "label",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "label_help",
+   "fieldtype": "HTML",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Label Help",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "HTML",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "fieldname",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Fieldname",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "fieldname",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "description": "Select the label after which you want to insert new field.",
+   "fetch_if_empty": 0,
+   "fieldname": "insert_after",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Insert After",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "insert_after",
+   "oldfieldtype": "Select",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "column_break_6",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "Data",
+   "fetch_if_empty": 0,
+   "fieldname": "fieldtype",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 1,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Field Type",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "fieldtype",
+   "oldfieldtype": "Select",
+   "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDynamic Link\nFloat\nGeolocation\nHTML\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:in_list([\"Float\", \"Currency\", \"Percent\"], doc.fieldtype)",
+   "description": "Set non-standard precision for a Float or Currency field",
+   "fetch_if_empty": 0,
+   "fieldname": "precision",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Precision",
+   "length": 0,
+   "no_copy": 0,
+   "options": "\n1\n2\n3\n4\n5\n6\n7\n8\n9",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "options",
+   "fieldtype": "Small Text",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Options",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "options",
+   "oldfieldtype": "Text",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "fetch_from",
+   "fieldtype": "Small Text",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Fetch From",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "If checked, this field will be not overwritten based on Fetch From if a value already exists.",
+   "fetch_if_empty": 0,
+   "fieldname": "fetch_if_empty",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Fetch If Empty",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "options_help",
+   "fieldtype": "HTML",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Options Help",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "HTML",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "section_break_11",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:doc.fieldtype==\"Section Break\"",
+   "fetch_if_empty": 0,
+   "fieldname": "collapsible",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Collapsible",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:doc.fieldtype==\"Section Break\"",
+   "fetch_if_empty": 0,
+   "fieldname": "collapsible_depends_on",
+   "fieldtype": "Code",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Collapsible Depends On",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "default",
+   "fieldtype": "Text",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Default Value",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "default",
+   "oldfieldtype": "Text",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "depends_on",
+   "fieldtype": "Code",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Depends On",
+   "length": 255,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "description",
+   "fieldtype": "Text",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Field Description",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "description",
+   "oldfieldtype": "Text",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": "300px",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": "300px"
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "0",
+   "fetch_if_empty": 0,
+   "fieldname": "permlevel",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Permission Level",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "permlevel",
+   "oldfieldtype": "Int",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "width",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Width",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "width",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "Number of columns for a field in a List View or a Grid (Total Columns should be less than 11)",
+   "fetch_if_empty": 0,
+   "fieldname": "columns",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Columns",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "properties",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Column Break",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": "50%",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": "50%"
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "reqd",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Is Mandatory Field",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "reqd",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "unique",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Unique",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "read_only",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Read Only",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:doc.fieldtype===\"Link\"",
+   "fetch_if_empty": 0,
+   "fieldname": "ignore_user_permissions",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Ignore User Permissions",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "hidden",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Hidden",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "print_hide",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Print Hide",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "print_hide",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:[\"Int\", \"Float\", \"Currency\", \"Percent\"].indexOf(doc.fieldtype)!==-1",
+   "fetch_if_empty": 0,
+   "fieldname": "print_hide_if_no_value",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Print Hide If No Value",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "print_width",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Print Width",
+   "length": 0,
+   "no_copy": 1,
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "no_copy",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "No Copy",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "no_copy",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "allow_on_submit",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Allow on Submit",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "allow_on_submit",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "in_list_view",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "In List View",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "in_standard_filter",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "In Standard Filter",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:([\"Data\", \"Select\", \"Table\", \"Text\", \"Text Editor\", \"Link\", \"Small Text\", \"Long Text\", \"Read Only\", \"Heading\", \"Dynamic Link\"].indexOf(doc.fieldtype) !== -1)",
+   "fetch_if_empty": 0,
+   "fieldname": "in_global_search",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "In Global Search",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "bold",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Bold",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "report_hide",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Report Hide",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "report_hide",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "search_index",
+   "fieldtype": "Check",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Index",
+   "length": 0,
+   "no_copy": 1,
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "Don't HTML Encode HTML tags like &lt;script&gt; or just characters like &lt; or &gt;, as they could be intentionally used in this field",
+   "fetch_if_empty": 0,
+   "fieldname": "ignore_xss_filter",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Ignore XSS Filter",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "1",
+   "depends_on": "eval:['Data', 'Select', 'Text', 'Small Text', 'Text Editor'].includes(doc.fieldtype)",
+   "fetch_if_empty": 0,
+   "fieldname": "translatable",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Translatable",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "icon": "fa fa-glass",
+ "idx": 1,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2019-03-18 18:03:38.155276",
+ "modified_by": "Administrator",
+ "module": "Custom",
+ "name": "Custom Field",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Administrator",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
+   "write": 1
+  },
+  {
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
+   "write": 1
+  }
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "search_fields": "dt,label,fieldtype,options",
+ "show_name_in_global_search": 0,
+ "sort_order": "ASC",
+ "track_changes": 1,
+ "track_seen": 0,
+ "track_views": 0
+}
\ No newline at end of file
diff --git a/frappe/custom/doctype/customize_form_field/customize_form_field.json b/frappe/custom/doctype/customize_form_field/customize_form_field.json
index 3cfa06fdb4..1f808c94c5 100644
--- a/frappe/custom/doctype/customize_form_field/customize_form_field.json
+++ b/frappe/custom/doctype/customize_form_field/customize_form_field.json
@@ -1,1438 +1,1438 @@
 {
-    "allow_copy": 0,
-    "allow_events_in_timeline": 0,
-    "allow_guest_to_view": 0,
-    "allow_import": 0,
-    "allow_rename": 0,
-    "autoname": "hash",
-    "beta": 0,
-    "creation": "2013-02-22 01:27:32",
-    "custom": 0,
-    "docstatus": 0,
-    "doctype": "DocType",
-    "document_type": "Setup",
-    "editable_grid": 1,
-    "fields": [
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "label_and_type",
-      "fieldtype": "Section Break",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Label and Type",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "label",
-      "fieldtype": "Data",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 1,
-      "in_standard_filter": 0,
-      "label": "Label",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "label",
-      "oldfieldtype": "Data",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 1,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "default": "Data",
-      "fetch_if_empty": 0,
-      "fieldname": "fieldtype",
-      "fieldtype": "Select",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 1,
-      "in_standard_filter": 0,
-      "label": "Type",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "fieldtype",
-      "oldfieldtype": "Select",
-      "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRead Only\nSection Break\nSelect\nSignature\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 1,
-      "search_index": 1,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "fieldname",
-      "fieldtype": "Data",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 1,
-      "in_standard_filter": 0,
-      "label": "Name",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "fieldname",
-      "oldfieldtype": "Data",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 1,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 1,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "reqd",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Mandatory",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "reqd",
-      "oldfieldtype": "Check",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "print_width": "50px",
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0,
-      "width": "50px"
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "unique",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Unique",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "in_list_view",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "In List View",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "in_standard_filter",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "In Standard Filter",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval:([\"Data\", \"Select\", \"Table\", \"Text\", \"Text Editor\", \"Link\", \"Small Text\", \"Long Text\", \"Read Only\", \"Heading\", \"Dynamic Link\"].indexOf(doc.fieldtype) !== -1)",
-      "fetch_if_empty": 0,
-      "fieldname": "in_global_search",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "In Global Search",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "bold",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Bold",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "default": "1",
-      "depends_on": "eval:['Data', 'Select', 'Text', 'Small Text', 'Text Editor'].includes(doc.fieldtype)",
-      "fetch_if_empty": 0,
-      "fieldname": "translatable",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Translatable",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "column_break_7",
-      "fieldtype": "Column Break",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval:in_list([\"Float\", \"Currency\", \"Percent\"], doc.fieldtype)",
-      "description": "Set non-standard precision for a Float or Currency field",
-      "fetch_if_empty": 0,
-      "fieldname": "precision",
-      "fieldtype": "Select",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Precision",
-      "length": 0,
-      "no_copy": 0,
-      "options": "\n1\n2\n3\n4\n5\n6\n7\n8\n9",
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval:in_list(['Data', 'Link', 'Dynamic Link', 'Password', 'Select', 'Read Only', 'Attach', 'Attach Image'], doc.fieldtype)",
-      "fetch_if_empty": 0,
-      "fieldname": "length",
-      "fieldtype": "Int",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Length",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "description": "For Links, enter the DocType as range.\nFor Select, enter list of Options, each on a new line.",
-      "fetch_if_empty": 0,
-      "fieldname": "options",
-      "fieldtype": "Small Text",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 1,
-      "in_standard_filter": 0,
-      "label": "Options",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "options",
-      "oldfieldtype": "Text",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "fetch_from",
-      "fieldtype": "Small Text",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Fetch From",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "description": "If checked, this field will be not overwritten based on Fetch From if a value already exists.",
-      "fetch_if_empty": 0,
-      "fieldname": "fetch_if_empty",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Fetch If Empty",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "permissions",
-      "fieldtype": "Section Break",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Permissions",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "description": "This field will appear only if the fieldname defined here has value OR the rules are true (examples): \nmyfield\neval:doc.myfield=='My Value'\neval:doc.age&gt;18",
-      "fetch_if_empty": 0,
-      "fieldname": "depends_on",
-      "fieldtype": "Code",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Depends On",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "depends_on",
-      "oldfieldtype": "Data",
-      "options": "JS",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "default": "0",
-      "fetch_if_empty": 0,
-      "fieldname": "permlevel",
-      "fieldtype": "Int",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 1,
-      "in_standard_filter": 0,
-      "label": "Perm Level",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "permlevel",
-      "oldfieldtype": "Int",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "hidden",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Hidden",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "hidden",
-      "oldfieldtype": "Check",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "print_width": "50px",
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0,
-      "width": "50px"
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "read_only",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Read Only",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval:doc.fieldtype==\"Section Break\"",
-      "fetch_if_empty": 0,
-      "fieldname": "collapsible",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Collapsible",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval: doc.fieldtype == \"Table\"",
-      "fetch_if_empty": 0,
-      "fieldname": "allow_bulk_edit",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Allow Bulk Edit",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval:doc.fieldtype==\"Section Break\"",
-      "fetch_if_empty": 0,
-      "fieldname": "collapsible_depends_on",
-      "fieldtype": "Code",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Collapsible Depends On",
-      "length": 0,
-      "no_copy": 0,
-      "options": "JS",
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "column_break_14",
-      "fieldtype": "Column Break",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "ignore_user_permissions",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Ignore User Permissions",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "allow_on_submit",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Allow on Submit",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "allow_on_submit",
-      "oldfieldtype": "Check",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "report_hide",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Report Hide",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "report_hide",
-      "oldfieldtype": "Check",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval:(doc.fieldtype == 'Link')",
-      "fetch_if_empty": 0,
-      "fieldname": "remember_last_selected_value",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Remember Last Selected Value",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "display",
-      "fieldtype": "Section Break",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Display",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "default",
-      "fieldtype": "Text",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Default",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "default",
-      "oldfieldtype": "Text",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "in_filter",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "In Filter",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "in_filter",
-      "oldfieldtype": "Check",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "print_width": "50px",
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0,
-      "width": "50px"
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "column_break_21",
-      "fieldtype": "Column Break",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "description",
-      "fieldtype": "Text",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Description",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "description",
-      "oldfieldtype": "Text",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "print_width": "300px",
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0,
-      "width": "300px"
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "print_hide",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Print Hide",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "print_hide",
-      "oldfieldtype": "Check",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval:[\"Int\", \"Float\", \"Currency\", \"Percent\"].indexOf(doc.fieldtype)!==-1",
-      "fetch_if_empty": 0,
-      "fieldname": "print_hide_if_no_value",
-      "fieldtype": "Check",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Print Hide If No Value",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "description": "Print Width of the field, if the field is a column in a table",
-      "fetch_if_empty": 0,
-      "fieldname": "print_width",
-      "fieldtype": "Data",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Print Width",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "print_width": "50px",
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0,
-      "width": "50px"
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "depends_on": "eval:cur_frm.doc.istable",
-      "description": "Number of columns for a field in a Grid (Total Columns in a grid should be less than 11)",
-      "fetch_if_empty": 0,
-      "fieldname": "columns",
-      "fieldtype": "Int",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Columns",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "width",
-      "fieldtype": "Data",
-      "hidden": 0,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 1,
-      "in_standard_filter": 0,
-      "label": "Width",
-      "length": 0,
-      "no_copy": 0,
-      "oldfieldname": "width",
-      "oldfieldtype": "Data",
-      "permlevel": 0,
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "print_width": "50px",
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0,
-      "width": "50px"
-     },
-     {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "is_custom_field",
-      "fieldtype": "Check",
-      "hidden": 1,
-      "ignore_user_permissions": 0,
-      "ignore_xss_filter": 0,
-      "in_filter": 0,
-      "in_global_search": 0,
-      "in_list_view": 0,
-      "in_standard_filter": 0,
-      "label": "Is Custom Field",
-      "length": 0,
-      "no_copy": 0,
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 1,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-     }
-    ],
-    "has_web_view": 0,
-    "hide_heading": 0,
-    "hide_toolbar": 0,
-    "idx": 1,
-    "image_view": 0,
-    "in_create": 0,
-    "is_submittable": 0,
-    "issingle": 0,
-    "istable": 1,
-    "max_attachments": 0,
-    "modified": "2019-02-26 21:25:17.487129",
-    "modified_by": "Administrator",
-    "module": "Custom",
-    "name": "Customize Form Field",
-    "owner": "Administrator",
-    "permissions": [],
-    "quick_entry": 0,
-    "read_only": 0,
-    "read_only_onload": 0,
-    "show_name_in_global_search": 0,
-    "sort_order": "ASC",
-    "track_changes": 0,
-    "track_seen": 0,
-    "track_views": 0
-   }
\ No newline at end of file
+ "allow_copy": 0,
+ "allow_events_in_timeline": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "autoname": "hash",
+ "beta": 0,
+ "creation": "2013-02-22 01:27:32",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "editable_grid": 1,
+ "fields": [
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "label_and_type",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Label and Type",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "label",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Label",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "label",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 1,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "Data",
+   "fetch_if_empty": 0,
+   "fieldname": "fieldtype",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Type",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "fieldtype",
+   "oldfieldtype": "Select",
+   "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSignature\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 1,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "fieldname",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Name",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "fieldname",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 1,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "reqd",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Mandatory",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "reqd",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": "50px",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": "50px"
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "unique",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Unique",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "in_list_view",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "In List View",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "in_standard_filter",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "In Standard Filter",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:([\"Data\", \"Select\", \"Table\", \"Text\", \"Text Editor\", \"Link\", \"Small Text\", \"Long Text\", \"Read Only\", \"Heading\", \"Dynamic Link\"].indexOf(doc.fieldtype) !== -1)",
+   "fetch_if_empty": 0,
+   "fieldname": "in_global_search",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "In Global Search",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "bold",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Bold",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "1",
+   "depends_on": "eval:['Data', 'Select', 'Text', 'Small Text', 'Text Editor'].includes(doc.fieldtype)",
+   "fetch_if_empty": 0,
+   "fieldname": "translatable",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Translatable",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "column_break_7",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:in_list([\"Float\", \"Currency\", \"Percent\"], doc.fieldtype)",
+   "description": "Set non-standard precision for a Float or Currency field",
+   "fetch_if_empty": 0,
+   "fieldname": "precision",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Precision",
+   "length": 0,
+   "no_copy": 0,
+   "options": "\n1\n2\n3\n4\n5\n6\n7\n8\n9",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:in_list(['Data', 'Link', 'Dynamic Link', 'Password', 'Select', 'Read Only', 'Attach', 'Attach Image'], doc.fieldtype)",
+   "fetch_if_empty": 0,
+   "fieldname": "length",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Length",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "For Links, enter the DocType as range.\nFor Select, enter list of Options, each on a new line.",
+   "fetch_if_empty": 0,
+   "fieldname": "options",
+   "fieldtype": "Small Text",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Options",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "options",
+   "oldfieldtype": "Text",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "fetch_from",
+   "fieldtype": "Small Text",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Fetch From",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "If checked, this field will be not overwritten based on Fetch From if a value already exists.",
+   "fetch_if_empty": 0,
+   "fieldname": "fetch_if_empty",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Fetch If Empty",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "permissions",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Permissions",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "This field will appear only if the fieldname defined here has value OR the rules are true (examples): \nmyfield\neval:doc.myfield=='My Value'\neval:doc.age&gt;18",
+   "fetch_if_empty": 0,
+   "fieldname": "depends_on",
+   "fieldtype": "Code",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Depends On",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "depends_on",
+   "oldfieldtype": "Data",
+   "options": "JS",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "0",
+   "fetch_if_empty": 0,
+   "fieldname": "permlevel",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Perm Level",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "permlevel",
+   "oldfieldtype": "Int",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "hidden",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Hidden",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "hidden",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": "50px",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": "50px"
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "read_only",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Read Only",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:doc.fieldtype==\"Section Break\"",
+   "fetch_if_empty": 0,
+   "fieldname": "collapsible",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Collapsible",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval: doc.fieldtype == \"Table\"",
+   "fetch_if_empty": 0,
+   "fieldname": "allow_bulk_edit",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Allow Bulk Edit",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:doc.fieldtype==\"Section Break\"",
+   "fetch_if_empty": 0,
+   "fieldname": "collapsible_depends_on",
+   "fieldtype": "Code",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Collapsible Depends On",
+   "length": 0,
+   "no_copy": 0,
+   "options": "JS",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "column_break_14",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "ignore_user_permissions",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Ignore User Permissions",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "allow_on_submit",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Allow on Submit",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "allow_on_submit",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "report_hide",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Report Hide",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "report_hide",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:(doc.fieldtype == 'Link')",
+   "fetch_if_empty": 0,
+   "fieldname": "remember_last_selected_value",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Remember Last Selected Value",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "display",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Display",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "default",
+   "fieldtype": "Text",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Default",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "default",
+   "oldfieldtype": "Text",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "in_filter",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "In Filter",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "in_filter",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": "50px",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": "50px"
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "column_break_21",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "description",
+   "fieldtype": "Text",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Description",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "description",
+   "oldfieldtype": "Text",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": "300px",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": "300px"
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "print_hide",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Print Hide",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "print_hide",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:[\"Int\", \"Float\", \"Currency\", \"Percent\"].indexOf(doc.fieldtype)!==-1",
+   "fetch_if_empty": 0,
+   "fieldname": "print_hide_if_no_value",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Print Hide If No Value",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "Print Width of the field, if the field is a column in a table",
+   "fetch_if_empty": 0,
+   "fieldname": "print_width",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Print Width",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": "50px",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": "50px"
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:cur_frm.doc.istable",
+   "description": "Number of columns for a field in a Grid (Total Columns in a grid should be less than 11)",
+   "fetch_if_empty": 0,
+   "fieldname": "columns",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Columns",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "width",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Width",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "width",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": "50px",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": "50px"
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "is_custom_field",
+   "fieldtype": "Check",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Is Custom Field",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 1,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "max_attachments": 0,
+ "modified": "2019-03-18 18:03:59.122249",
+ "modified_by": "Administrator",
+ "module": "Custom",
+ "name": "Customize Form Field",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_order": "ASC",
+ "track_changes": 0,
+ "track_seen": 0,
+ "track_views": 0
+}
\ No newline at end of file

From de150cd23325a0d6351b8cc9e995bc2448edaba4 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Mon, 25 Mar 2019 15:01:56 +0530
Subject: [PATCH 094/256] feat: add typemap for rating control

---
 frappe/database/mariadb/database.py  | 1 +
 frappe/database/postgres/database.py | 1 +
 frappe/model/db_schema.py            | 1 +
 3 files changed, 3 insertions(+)

diff --git a/frappe/database/mariadb/database.py b/frappe/database/mariadb/database.py
index 8a95bba228..69a9cf5e9f 100644
--- a/frappe/database/mariadb/database.py
+++ b/frappe/database/mariadb/database.py
@@ -46,6 +46,7 @@ class MariaDBDatabase(Database):
 			'Dynamic Link':	('varchar', self.VARCHAR_LEN),
 			'Password':		('varchar', self.VARCHAR_LEN),
 			'Select':		('varchar', self.VARCHAR_LEN),
+			'Rating':		('int', '1'),
 			'Read Only':	('varchar', self.VARCHAR_LEN),
 			'Attach':		('text', ''),
 			'Attach Image':	('text', ''),
diff --git a/frappe/database/postgres/database.py b/frappe/database/postgres/database.py
index cfbbb80b4c..4b8a4ae500 100644
--- a/frappe/database/postgres/database.py
+++ b/frappe/database/postgres/database.py
@@ -51,6 +51,7 @@ class PostgresDatabase(Database):
 			'Dynamic Link':	('varchar', self.VARCHAR_LEN),
 			'Password':		('varchar', self.VARCHAR_LEN),
 			'Select':		('varchar', self.VARCHAR_LEN),
+			'Rating':		('smallint', None),
 			'Read Only':	('varchar', self.VARCHAR_LEN),
 			'Attach':		('text', ''),
 			'Attach Image':	('text', ''),
diff --git a/frappe/model/db_schema.py b/frappe/model/db_schema.py
index d877d2ae0c..16ccf284d5 100644
--- a/frappe/model/db_schema.py
+++ b/frappe/model/db_schema.py
@@ -45,6 +45,7 @@ type_map = {
 	'Dynamic Link':		('varchar', varchar_len),
 	'Password':		('varchar', varchar_len),
 	'Select':		('varchar', varchar_len),
+	'Rating':		('int', '1'),
 	'Read Only':		('varchar', varchar_len),
 	'Attach':		('text', ''),
 	'Attach Image':		('text', ''),

From 19af18767e17d04914592cd29ff5e762751f26c1 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Mon, 25 Mar 2019 15:05:40 +0530
Subject: [PATCH 095/256] test: add cypress command for initializing a dialog
 for ui testing

---
 cypress/support/commands.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 3fd3028604..007d0d9f3e 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -61,3 +61,19 @@ Cypress.Commands.add('new_form', (doctype) => {
 Cypress.Commands.add('go_to_list', (doctype) => {
 	cy.visit(`/desk#List/${doctype}/List`);
 });
+
+Cypress.Commands.add('dialog', (title, fields) => {
+	cy.window().then(win => {
+		var d = new win.frappe.ui.Dialog({
+			title: title,
+			fields: [
+				fields
+			],
+			primary_action: function(){
+				d.hide();
+			}
+		});
+		d.show();
+		return d
+	});
+});

From 4e0dab3621f10cb17636b35a46ee126c4234708c Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Mon, 25 Mar 2019 15:06:36 +0530
Subject: [PATCH 096/256] feat: initialize a new fieldtype called rating

---
 frappe/model/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/model/__init__.py b/frappe/model/__init__.py
index 40ab9e3e5b..5f804e3c36 100644
--- a/frappe/model/__init__.py
+++ b/frappe/model/__init__.py
@@ -27,6 +27,7 @@ data_fieldtypes = (
 	'Dynamic Link',
 	'Password',
 	'Select',
+	'Rating',
 	'Read Only',
 	'Attach',
 	'Attach Image',

From c9f8c4e40ef4fa04d4a4397e50cd842004ef867d Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Mon, 25 Mar 2019 15:10:43 +0530
Subject: [PATCH 097/256] refactor: move the css classes for star rating from
 website saas to control less file

---
 .../public/js/frappe/form/controls/rating.js  | 28 +++++++++----------
 frappe/public/less/controls.less              | 12 ++++++++
 frappe/public/scss/website.scss               |  9 ------
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/rating.js b/frappe/public/js/frappe/form/controls/rating.js
index 7e9b9c2474..bb651a47f8 100644
--- a/frappe/public/js/frappe/form/controls/rating.js
+++ b/frappe/public/js/frappe/form/controls/rating.js
@@ -3,11 +3,11 @@ frappe.ui.form.ControlRating  = frappe.ui.form.ControlInt.extend({
 		this._super();
 		const star_template = `
 		<div class = "rating">
-			<i class="fa fa-fw fa-star text-extra-muted" data-idx=1></i>
-			<i class="fa fa-fw fa-star text-extra-muted" data-idx=2></i>
-			<i class="fa fa-fw fa-star text-extra-muted" data-idx=3></i>
-			<i class="fa fa-fw fa-star text-extra-muted" data-idx=4></i>
-			<i class="fa fa-fw fa-star text-extra-muted" data-idx=5></i>
+			<i class="fa fa-fw fa-star" data-idx=1></i>
+			<i class="fa fa-fw fa-star" data-idx=2></i>
+			<i class="fa fa-fw fa-star" data-idx=3></i>
+			<i class="fa fa-fw fa-star" data-idx=4></i>
+			<i class="fa fa-fw fa-star" data-idx=5></i>
 		</div>
 		`;
 		
@@ -15,29 +15,29 @@ frappe.ui.form.ControlRating  = frappe.ui.form.ControlInt.extend({
 
 		this.$input_wrapper.find('i').hover((ev) => {
 			const el = $(ev.currentTarget);
-			var star_value = el.data('idx');
+			let star_value = el.data('idx');
 			el.parent().children('i.fa').each( function(e){
 				if (e < star_value) {
-					$(this).addClass('hover');
+					$(this).addClass('star-hover');
 				} else {
-					$(this).removeClass('hover');
+					$(this).removeClass('star-hover');
 				}
 			});
 		}, (ev) => {
 				const el = $(ev.currentTarget);
 				el.parent().children('i.fa').each( function(e) {
-					$(this).removeClass('hover');
+					$(this).removeClass('star-hover');
 				});
 		});
 
 		this.$input_wrapper.find('i').click((ev) => {
 			const el = $(ev.currentTarget);
-			var star_value = el.data('idx');
+			let star_value = el.data('idx');
 			el.parent().children('i.fa').each( function(e) {
 				if (e < star_value){
-					$(this).addClass('click');
+					$(this).addClass('star-click');
 				} else {
-					$(this).removeClass('click');
+					$(this).removeClass('star-click');
 				}
 			});
 			this.set_value(star_value);
@@ -47,10 +47,10 @@ frappe.ui.form.ControlRating  = frappe.ui.form.ControlInt.extend({
 		return this.value ? this.value : 0;
 	},
 	set_formatted_input(value) {
-		var el = this.$input_wrapper.find('i');
+		let el = this.$input_wrapper.find('i');
 		el.children('i.fa').prevObject.each( function(e) {
 			if (e < value){
-				$(this).addClass('click');
+				$(this).addClass('star-click');
 			}
 		});
 	}
diff --git a/frappe/public/less/controls.less b/frappe/public/less/controls.less
index a5c91d4fdc..77274e93b0 100644
--- a/frappe/public/less/controls.less
+++ b/frappe/public/less/controls.less
@@ -77,3 +77,15 @@
 	margin-right: 5px;
 	margin-bottom: 5px;
 }
+
+.rating {
+	i {
+		color: @text-extra-muted;
+	}
+	.star-hover {
+		color: @text-muted;
+	}
+	.star-click {
+		color: @text-light;
+	}
+}
\ No newline at end of file
diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss
index 36ea2673f3..72b646fb64 100644
--- a/frappe/public/scss/website.scss
+++ b/frappe/public/scss/website.scss
@@ -90,13 +90,4 @@ img {
 
 .indicator {
     font-size: inherit;
-}
-
-.rating {
-	.hover {
-		color: rgb(148, 148, 143) !important;
-	}
-	.click {
-		color: rgb(7, 7, 6) !important;
-	}
 }
\ No newline at end of file

From 6cc59aabd8c3dd482f5000716a1c34651d4e24e8 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Mon, 25 Mar 2019 15:44:47 +0530
Subject: [PATCH 098/256] test: check effects on trigger of hover and click
 events

---
 cypress/integration/control_rating.js | 36 +++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 cypress/integration/control_rating.js

diff --git a/cypress/integration/control_rating.js b/cypress/integration/control_rating.js
new file mode 100644
index 0000000000..2df10d0351
--- /dev/null
+++ b/cypress/integration/control_rating.js
@@ -0,0 +1,36 @@
+context('Rating Control', () => {
+	beforeEach(() => {
+		cy.login('Administrator', 'qwe');
+    });
+
+    it('click on the star rating to record value', () => {
+        cy.visit('/desk')
+        cy.dialog('Rating', {
+            'fieldname': 'rate', 'fieldtype': 'Rating',
+        }).as('dialog');
+
+        cy.get('div.rating')
+            .children('i.fa')
+            .first()
+            .click()
+            .should('have.class', 'star-click');
+        cy.get('@dialog').then(dialog => {
+            var value = dialog.get_value('rate');
+        })
+    });
+
+    it('hover on the star', () => {
+        cy.visit('/desk')
+        cy.dialog('Rating', {
+            'fieldname': 'rate', 'fieldtype': 'Rating',
+        })
+        cy.get('div.rating')
+            .children('i.fa')
+            .first()
+            .invoke('trigger', 'mouseenter')
+            .should('have.class', 'star-hover')
+            .invoke('trigger', 'mouseleave')
+            .should('not.have.class', 'star-hover');
+    });
+
+});
\ No newline at end of file

From da105079f51218e8160a24a91db94c097f715218 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Mon, 25 Mar 2019 16:48:26 +0530
Subject: [PATCH 099/256] style: create a common css for formatters of star
 rating

---
 frappe/public/build.json                   | 5 ++---
 frappe/public/js/frappe/form/formatters.js | 9 +++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/frappe/public/build.json b/frappe/public/build.json
index 2ce134ea42..249471567c 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -6,9 +6,7 @@
 		"public/less/avatar.less",
 		"node_modules/highlight.js/styles/zenburn.css",
 		"public/less/form.less",
-		"public/less/controls.less",
 		"public/less/chat.less",
-		"public/less/form_grid.less",
 		"node_modules/frappe-datatable/dist/frappe-datatable.css"
 	],
 	"css/frappe-web-b4.css": [
@@ -376,7 +374,8 @@
 		"public/less/quill.less",
 		"public/less/datepicker.less",
 		"public/less/awesomplete.less",
-		"public/less/form_grid.less"
+		"public/less/form_grid.less",
+		"public/less/controls.less"
 	],
 	"js/print_format_v3.min.js": [
 		"public/js/legacy/layout.js",
diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index 841bd4ddfb..0d360f96b7 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -52,6 +52,15 @@ frappe.form.formatters = {
 	Percent: function(value, docfield, options) {
 		return frappe.form.formatters._right(flt(value, 2) + "%", options)
 	},
+	Rating: function(value, docfield, options, doc) {
+		return `
+			<div class="rating">
+				${Array.from(new Array(5)).map((_, i) =>
+					`<i class="fa fa-fw fa-star ${i <= (value || 0) ? "star-click": "" } star-icon" data-idx="${i}"></i>`
+					).join('')}
+			</div>
+		`;
+	},
 	Currency: function (value, docfield, options, doc) {
 		var currency  = frappe.meta.get_field_currency(docfield, doc);
 		var precision = docfield.precision || cint(frappe.boot.sysdefaults.currency_precision) || 2;

From aea425d13d9912f6299d0e26e12605de73de21e3 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 25 Mar 2019 20:18:35 +0530
Subject: [PATCH 100/256] fix: convert name of docs to string (#7127)

- filter used to skip docs with numerical names
---
 frappe/public/js/frappe/list/list_view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index c5e960e21d..841f62d6a3 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -898,7 +898,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 
 	get_checked_items(only_docnames) {
 		const docnames = Array.from(this.$checks || [])
-			.map(check => $(check).data().name);
+			.map(check => cstr($(check).data().name));
 
 		if (only_docnames) return docnames;
 

From 96ec88d4d925aa2e5203b875762cdce3c14874c7 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 26 Mar 2019 09:15:13 +0530
Subject: [PATCH 101/256] feat: Attach popover to review pills for more info

---
 frappe/public/js/frappe/form/review.js        | 28 ++++++++++++++++---
 frappe/public/less/sidebar.less               |  4 +--
 .../energy_point_log/energy_point_log.py      |  3 +-
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/frappe/public/js/frappe/form/review.js b/frappe/public/js/frappe/form/review.js
index 3b1ec9a434..537759d148 100644
--- a/frappe/public/js/frappe/form/review.js
+++ b/frappe/public/js/frappe/form/review.js
@@ -61,7 +61,7 @@ frappe.ui.form.Review = class Review {
 				options: this.get_involved_users(),
 				default: this.frm.doc.owner
 			}, {
-				fieldname: 'action',
+				fieldname: 'review_type',
 				fieldtype: 'Select',
 				label: __('Action'),
 				options: [{
@@ -96,6 +96,7 @@ frappe.ui.form.Review = class Review {
 					},
 					to_user: values.to_user,
 					points: values.points,
+					review_type: values.review_type,
 					reason: values.reason
 				}).then(() => {
 					review_dialog.hide();
@@ -114,15 +115,34 @@ frappe.ui.form.Review = class Review {
 			'docname': this.frm.doc.name,
 		}).then(review_logs => {
 			review_logs.forEach(review_log => {
-				this.review_list_wrapper.prepend(`
+				let review_pill = $(`
 					<span class="review-pill">
 						${frappe.avatar(review_log.owner)}
-						<span class="text-muted">
-							${review_log.points}
+						<span class="bold ${review_log.type === 'Appreciation' ? 'text-success': 'text-danger'}">
+							${review_log.type === 'Appreciation' ? '+': ''}${review_log.points}
 						</span>
 					</span>
 				`);
+				this.review_list_wrapper.prepend(review_pill);
+				this.setup_detail_popover(review_pill, review_log);
 			});
 		});
 	}
+	setup_detail_popover(el, data) {
+		el.popover({
+			animation: true,
+			trigger: 'hover',
+			delay: 500,
+			placement: 'top',
+			content: () => {
+				return `<div class="text-small">
+					<b>For</b> ${frappe.user_info(data.user).fullname}
+					<p>${data.reason}</p>
+				</div>`;
+			},
+			html: true,
+			container: 'body'
+		});
+		return el;
+	}
 };
diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less
index 6ed1e49370..6cf1ac86a2 100644
--- a/frappe/public/less/sidebar.less
+++ b/frappe/public/less/sidebar.less
@@ -385,8 +385,7 @@ body[data-route^="Module"] .main-menu {
 		border: 1px solid #d2d8dd;
 		border-radius: 4px;
 		display: flex;
-		margin-right: 5px;
-		margin-bottom: 10px;
+		margin: 0 10px 10px 0;
 		.avatar {
 			padding: 0px;
 			margin: 0px;
@@ -400,5 +399,6 @@ body[data-route^="Module"] .main-menu {
 			align-self: center;
 			font-size: @text-small;
 		}
+		cursor: pointer;
 	}
 }
\ No newline at end of file
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index 325f3588d1..7f53188216 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -11,6 +11,7 @@ from frappe.utils import cint
 
 class EnergyPointLog(Document):
 	def after_insert(self):
+		message = ''
 		if self.type == 'Auto':
 			message=_('You gained <b>{}</b> points').format(self.points)
 		elif self.type == 'Appreciation':
@@ -113,4 +114,4 @@ def get_reviews(doctype, docname):
 		'reference_doctype': doctype,
 		'reference_name': docname,
 		'type': ['in', ('Appreciation', 'Criticism')],
-	}, fields=['points', 'owner', 'type', 'user'])
\ No newline at end of file
+	}, fields=['points', 'owner', 'type', 'user', 'reason'])
\ No newline at end of file

From d775416a126713c995eeefb0b58feb421a3eeeda Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Tue, 26 Mar 2019 10:09:13 +0530
Subject: [PATCH 102/256] fix: display correct number of stars in the list view
 and report view

---
 frappe/public/js/frappe/form/controls/rating.js | 4 ++--
 frappe/public/js/frappe/form/formatters.js      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/rating.js b/frappe/public/js/frappe/form/controls/rating.js
index bb651a47f8..505e08f21f 100644
--- a/frappe/public/js/frappe/form/controls/rating.js
+++ b/frappe/public/js/frappe/form/controls/rating.js
@@ -10,7 +10,7 @@ frappe.ui.form.ControlRating  = frappe.ui.form.ControlInt.extend({
 			<i class="fa fa-fw fa-star" data-idx=5></i>
 		</div>
 		`;
-		
+
 		this.$input_wrapper.html(star_template);
 
 		this.$input_wrapper.find('i').hover((ev) => {
@@ -25,7 +25,7 @@ frappe.ui.form.ControlRating  = frappe.ui.form.ControlInt.extend({
 			});
 		}, (ev) => {
 				const el = $(ev.currentTarget);
-				el.parent().children('i.fa').each( function(e) {
+				el.parent().children('i.fa').each( function() {
 					$(this).removeClass('star-hover');
 				});
 		});
diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index 0d360f96b7..34966b5eb5 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -56,7 +56,7 @@ frappe.form.formatters = {
 		return `
 			<div class="rating">
 				${Array.from(new Array(5)).map((_, i) =>
-					`<i class="fa fa-fw fa-star ${i <= (value || 0) ? "star-click": "" } star-icon" data-idx="${i}"></i>`
+					`<i class="fa fa-fw fa-star ${i < (value || 0) ? "star-click": "" } star-icon" data-idx="${(i+1)}"></i>`
 					).join('')}
 			</div>
 		`;

From 0608c6b956abfda58517c8a0c7e4ab6f137be9c4 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Tue, 26 Mar 2019 10:10:39 +0530
Subject: [PATCH 103/256] test: validate value stored via rating fieldtype on
 click

---
 cypress/integration/control_rating.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cypress/integration/control_rating.js b/cypress/integration/control_rating.js
index 2df10d0351..7098bb9a77 100644
--- a/cypress/integration/control_rating.js
+++ b/cypress/integration/control_rating.js
@@ -16,6 +16,7 @@ context('Rating Control', () => {
             .should('have.class', 'star-click');
         cy.get('@dialog').then(dialog => {
             var value = dialog.get_value('rate');
+            expect(value).to.equal(1)
         })
     });
 

From 54322d9587137291e5f19175f5e121d4147e8890 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 26 Mar 2019 19:04:21 +0530
Subject: [PATCH 104/256] fix: Remove energy_points from user_info

---
 frappe/auth.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/auth.py b/frappe/auth.py
index 9a6d608092..37a79bd4a6 100644
--- a/frappe/auth.py
+++ b/frappe/auth.py
@@ -140,7 +140,7 @@ class LoginManager:
 
 	def get_user_info(self, resume=False):
 		self.info = frappe.db.get_value("User", self.user,
-			["user_type", "first_name", "last_name", "user_image", "energy_points"], as_dict=1)
+			["user_type", "first_name", "last_name", "user_image"], as_dict=1)
 
 		self.user_type = self.info.user_type
 

From bde72dcba9394cf883cabc9aaffba43a8a3b4b31 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 26 Mar 2019 21:18:31 +0530
Subject: [PATCH 105/256] fix: Remove energy_points data from boot

---
 frappe/boot.py                  |  3 ---
 frappe/public/js/frappe/desk.js | 11 -----------
 2 files changed, 14 deletions(-)

diff --git a/frappe/boot.py b/frappe/boot.py
index fd204f34b1..b1c1e3cf4c 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -81,9 +81,6 @@ def get_bootinfo():
 	bootinfo.success_action = get_success_action()
 	bootinfo.update(get_email_accounts(user=frappe.session.user))
 	bootinfo.energy_points_enabled = is_energy_point_enabled()
-	bootinfo.energy_points = get_energy_points(frappe.session.user)
-
-	bootinfo.review_points = get_energy_points(frappe.session.user, 'Review')
 
 	return bootinfo
 
diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index 4a9157cc6d..db85dce81f 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -47,7 +47,6 @@ frappe.Application = Class.extend({
 		this.setup_analytics();
 
 		this.setup_energy_point_listeners();
-		this.show_energy_points();
 
 		frappe.ui.keys.setup();
 		this.set_rtl();
@@ -557,16 +556,6 @@ frappe.Application = Class.extend({
 		frappe.realtime.on('energy_point_alert', (message) => {
 			frappe.show_alert(message);
 		});
-	},
-
-	show_energy_points() {
-		if (frappe.boot.energy_points_enabled) {
-			$(".toolbar-user-fullname").append(`
-				<span class="ellipsis hidden-xs energy-points hidden-sm primary">
-					(${frappe.boot.energy_points} pts)
-				</span>
-			`);
-		}
 	}
 });
 

From d25ed701ab4a1956ac8240a0991d5ab3a65cbcae Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 26 Mar 2019 21:22:13 +0530
Subject: [PATCH 106/256] refactor: User list

Co-authored-by: Faris Ansari <netchampfaris@users.noreply.github.com>
---
 frappe/public/js/frappe/social/Home.vue       |  13 +-
 .../frappe/social/components/PostSidebar.vue  |   2 +-
 .../public/js/frappe/social/pages/Profile.vue |   7 -
 .../js/frappe/social/pages/UserList.vue       | 142 +++++++++++++-----
 .../energy_point_log/energy_point_log.py      |  31 ++--
 5 files changed, 135 insertions(+), 60 deletions(-)

diff --git a/frappe/public/js/frappe/social/Home.vue b/frappe/public/js/frappe/social/Home.vue
index 55397de76b..cf112dcb92 100644
--- a/frappe/public/js/frappe/social/Home.vue
+++ b/frappe/public/js/frappe/social/Home.vue
@@ -83,11 +83,22 @@ export default {
 		},
 		update_primary_action(current_route) {
 			if (current_route === 'home') {
+				this.$root.page.set_title(__('Social'));
+				frappe.breadcrumbs.update();
 				this.$root.page.set_primary_action(__('Post'), () => {
 					frappe.social.post_dialog.show();
 				});
 			} else {
-				this.$root.page.clear_primary_action()
+				frappe.breadcrumbs.add({
+					type: 'Custom',
+					label: __('Social Home'),
+					route: '#social/home'
+				});
+				this.$root.page.clear_primary_action();
+			}
+
+			if (current_route === 'users') {
+				this.$root.page.set_title(__('Leaderboard'));
 			}
 		},
 		get_current_page() {
diff --git a/frappe/public/js/frappe/social/components/PostSidebar.vue b/frappe/public/js/frappe/social/components/PostSidebar.vue
index 108e83e734..cef1e2d833 100644
--- a/frappe/public/js/frappe/social/components/PostSidebar.vue
+++ b/frappe/public/js/frappe/social/components/PostSidebar.vue
@@ -2,7 +2,7 @@
 	<div class="flex flex-column">
 		<a class="route-link"
 			@click.prevent="go_to_user_list()">
-			{{ __('All Users') }}
+			{{ __('Leaderboard') }}
 		</a>
 		<div class="links" v-if="frequently_visited_list.length">
 			<div class="muted-title">
diff --git a/frappe/public/js/frappe/social/pages/Profile.vue b/frappe/public/js/frappe/social/pages/Profile.vue
index e36441fe98..8b24e6deb8 100644
--- a/frappe/public/js/frappe/social/pages/Profile.vue
+++ b/frappe/public/js/frappe/social/pages/Profile.vue
@@ -24,13 +24,6 @@
 						<span>Likes</span>
 						<span>({{ liked_posts_count }})</span>
 					</div>
-					<div
-						class="option"
-						:class="{'bold': show_list === 'badges'}"
-						@click="show_list = 'badges'">
-						<span>Badges</span>
-						<span>({{ user_posts_count }})</span>
-					</div>
 				</div>
 				<post-loader :post_list_filter="post_list_filter"></post-loader>
 			</div>
diff --git a/frappe/public/js/frappe/social/pages/UserList.vue b/frappe/public/js/frappe/social/pages/UserList.vue
index 5cdf1142e7..fbe6b836a8 100644
--- a/frappe/public/js/frappe/social/pages/UserList.vue
+++ b/frappe/public/js/frappe/social/pages/UserList.vue
@@ -1,29 +1,45 @@
 <template>
-	<div class="flex justify-center">
-		<div class="col-md-6">
-			<div class="flex justify-between padding search-bar">
-				<div class="flex col-md-6">
-					<button class="btn" @click="frappe.set_route('social', 'home')">← {{ __('Back') }}</button>
-					<input type="text" class="form-control" :placeholder="__('Search for a user...')" v-model="search_text">
-				</div>
-			</div>
-			<ul class="list-unstyled user-list">
-				<li
-					class="padding cursor-pointer flex user-card"
-					v-for="user in filtered_users" :key="user.name"
-					@click="go_to_profile_page(user.name)">
+	<div class="user-list-container">
+		<ul class="list-unstyled user-list">
+			<li class="user-card user-list-header text-medium">
+				<span class="user-details text-muted">
+					{{ __('User') }}
+				</span>
+				<span class="user-points text-muted">
+					{{ __('Energy Points') }}
+				</span>
+				<span class="user-points text-muted">
+					{{ __('Review Points') }}
+				</span>
+				<span class="user-points text-muted">
+					{{ __('Points Given') }}
+				</span>
+			</li>
+			<li
+				class="user-card"
+				v-for="user in filtered_users" :key="user.name"
+				@click="go_to_profile_page(user.name)">
+				<div class="user-details flex">
 					<span v-html="get_avatar(user.name)"></span>
-					<div class="user-details">
-						{{ user.fullname }}
+					<div>
+						<div>{{ user.fullname }}</div>
 						<div class="text-muted text-medium" :class="{'italic': !user.bio}">
 							{{ frappe.ellipsis(user.bio, 100) || 'No Bio'}}
 						</div>
 					</div>
-					<span class="text-muted text-nowrap">{{frappe.boot.energy_points}} pts</span>
-				</li>
-				<li class="text-muted" v-if="!filtered_users.length">{{__('No user found')}}</li>
-			</ul>
-		</div>
+				</div>
+				<span class="text-muted text-nowrap user-points">
+					{{ user.energy_points }}
+				</span>
+				<span class="text-muted text-nowrap user-points">
+					{{ user.review_points }}
+				</span>
+				<span class="text-muted text-nowrap user-points">
+					{{ user.given_points }}
+				</span>
+			</li>
+			<li class="text-muted" v-if="!filtered_users.length">{{__('No user found')}}</li>
+		</ul>
 	</div>
 </template>
 <script>
@@ -31,18 +47,41 @@ export default {
 	data() {
 		return {
 			users: [],
-			search_text: ''
+			filter_users_by: null,
+			sort_users_by: 'energy_points',
+			sort_order: 'desc',
 		}
 	},
 	computed: {
 		filtered_users() {
-			let filtered = this.users;
-			if (this.search_text !== '') {
-				filtered = filtered.filter(user => {
-					if (user.fullname.toLowerCase().includes(this.search_text.toLowerCase())) {
-						return true;
+			let filtered = this.users.slice();
+
+			if (this.filter_users_by) {
+				filtered = filtered.filter(user =>
+					user.fullname.toLowerCase().includes(this.filter_users_by.toLowerCase())
+				)
+			}
+
+			if (this.sort_users_by) {
+				filtered.sort((a, b) => {
+					const value_a = a[this.sort_users_by];
+					const value_b = b[this.sort_users_by];
+
+					let return_value = 0;
+					if (value_a > value_b) {
+						return_value = 1;
 					}
-				})
+
+					if (value_a < value_b) {
+						return_value = -1;
+					}
+
+					if (this.sort_order === 'desc') {
+						return_value = -return_value
+					}
+
+					return return_value
+				});
 			}
 			return filtered;
 		}
@@ -53,6 +92,7 @@ export default {
 		// delete standard users from the list
 		standard_users.forEach(user => delete this.users[user]);
 		this.users = Object.values(this.users);
+		this.fetch_users_energy_points_and_update_users();
 	},
 	methods: {
 		get_avatar(user) {
@@ -60,31 +100,59 @@ export default {
 		},
 		go_to_profile_page(user) {
 			frappe.set_route('social', 'profile', user)
+		},
+		fetch_users_energy_points_and_update_users() {
+			frappe.xcall(
+				'frappe.social.doctype.energy_point_log.energy_point_log.get_user_energy_and_review_points'
+			).then(data => {
+				let users = this.users.slice();
+				this.users = users.map(user => {
+					const points = data[user.name] || {};
+					user.energy_points = points.energy_points || 0;
+					user.review_points = points.review_points || 0;
+					user.given_points = points.given_points || 0;
+					return user;
+				});
+			});
 		}
 	}
 }
 </script>
 <style lang="less" scoped>
+@import "frappe/public/less/variables";
+
 .user-list {
-	// similar to search bar height
-	margin-top: 75px;
+	border-left: 1px solid @border-color;
+	border-right: 1px solid @border-color;
+
 	.user-card {
-		border: 1px solid white;
-		&:hover {
-			border-color:#d1d8dd;
-		}
-		border-radius: 5px;
+		display: flex;
+		cursor: pointer;
+		padding: 12px 15px;
+		border-bottom: 1px solid @border-color;
+
 		.user-details {
-			width: 100%;
-			margin: 0 10px;
+			flex: 1;
+
 			.italic {
 				font-style: italic;
 			}
 		}
 	}
 }
+
+.user-points {
+	flex: 0 0 20%;
+	text-align: right;
+}
+
+.user-list-header {
+	background-color: @light-bg;
+}
+
 .search-bar {
-	position: fixed;
+	position: sticky;
+	top: 0;
 	background: white;
 	height: 75px;
 	text-align: center;
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index 7f53188216..b48d004ed4 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -29,6 +29,8 @@ class EnergyPointLog(Document):
 		if message:
 			frappe.publish_realtime('energy_point_alert', message=message , user=self.user)
 
+		frappe.cache().hdel('energy_points', self.user)
+
 def create_energy_points_log(ref_doctype, ref_name, doc):
 	doc = frappe._dict(doc)
 	log_exists = frappe.db.exists('Energy Point Log', {
@@ -56,38 +58,39 @@ def create_review_points_log(user, points, reason=None):
 		'reason': reason
 	}).insert(ignore_permissions=True)
 
-def get_energy_points(user, points_type=None):
-	if not points_type:
-		points_type = ['NOT IN', ('Review')]
+@frappe.whitelist()
+def get_energy_points(user):
+	points = frappe.cache().hget('energy_points', user,
+		lambda: get_user_energy_and_review_points(user))
+	return frappe._dict(points.get(user, {}))
 
-	log = frappe.db.get_all('Energy Point Log', filters={
-		'user': user,
-		'type': points_type
-	}, fields=['SUM(`points`) as points'], group_by='user')
+@frappe.whitelist()
+def get_user_energy_and_review_points(user=None):
+	if user:
+		where_user = 'WHERE `user` = %s'
+	else:
+		where_user = ''
 
-	return log[0].points if log else 0
-
-def get_user_energy_and_review_points():
 	points_list =  frappe.db.sql("""
 		SELECT
 			SUM(CASE WHEN `type`!= 'Review' THEN `points` ELSE 0 END) as energy_points,
 			SUM(CASE WHEN `type`='Review' THEN `points` ELSE 0 END) as review_points,
+			SUM(CASE WHEN `type`='Review' and `points` < 0 THEN ABS(`points`) ELSE 0 END) as given_points,
 			`user`
 		FROM `tabEnergy Point Log`
+		{where_user}
 		GROUP BY `user`
-	""", as_dict=1)
+	""".format(where_user=where_user), values=[user] if user else (), debug=1, as_dict=1)
 
 	dict_to_return = frappe._dict()
-
 	for d in points_list:
 		dict_to_return[d.pop('user')] = d
-
 	return dict_to_return
 
 
 @frappe.whitelist()
 def review(doc, points, to_user, reason, review_type='Appreciation'):
-	current_review_points = get_energy_points(frappe.session.user, 'Review')
+	current_review_points = get_energy_points(frappe.session.user).review_points
 	doc = frappe._dict(json.loads(doc))
 	points = abs(cint(points))
 	if current_review_points < points:

From 5fc64b7a15d314fc5d88fbc79b316a93c48001ab Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 26 Mar 2019 21:27:20 +0530
Subject: [PATCH 107/256] fix: UX review

Co-authored-by: Faris Ansari <netchampfaris@users.noreply.github.com>
---
 frappe/public/js/frappe/form/review.js        | 94 +++++++++++++------
 frappe/public/less/desk.less                  |  9 ++
 frappe/public/less/sidebar.less               | 28 +++++-
 .../energy_point_log/energy_point_log.py      |  6 +-
 .../energy_point_settings.json                | 38 +++++++-
 5 files changed, 141 insertions(+), 34 deletions(-)

diff --git a/frappe/public/js/frappe/form/review.js b/frappe/public/js/frappe/form/review.js
index 537759d148..57c0fc3678 100644
--- a/frappe/public/js/frappe/form/review.js
+++ b/frappe/public/js/frappe/form/review.js
@@ -7,9 +7,19 @@ frappe.ui.form.Review = class Review {
 	constructor({parent, frm}) {
 		this.parent = parent;
 		this.frm = frm;
-		this.make_review_container();
-		this.add_review_button();
-		this.update_reviewers();
+		this.fetch_energy_points()
+			.then(() => {
+				this.make_review_container();
+				this.add_review_button();
+				this.update_reviewers();
+			});
+	}
+	fetch_energy_points() {
+		return frappe.xcall('frappe.social.doctype.energy_point_log.energy_point_log.get_energy_points', {
+			user: frappe.session.user
+		}).then(data => {
+			this.points = data;
+		});
 	}
 	make_review_container() {
 		this.$wrapper = this.parent.append(`
@@ -22,16 +32,15 @@ frappe.ui.form.Review = class Review {
 		this.review_list_wrapper = this.$wrapper.find('.review-list');
 	}
 	add_review_button() {
-		if (!frappe.boot.review_points) return;
+		if (!this.points.review_points || !this.get_involved_users().length) return;
 
 		this.review_list_wrapper.append(`
-			<span class="avatar avatar-small avatar-empty share-doc-btn cursor-pointer" title="${__("Review")}">
-				<i class="octicon octicon-plus text-muted" style="position: relative; left: 4.5px;"></i>
+			<span class="avatar avatar-small avatar-empty btn-add-review" title="${__('Add Review')}">
+				<i class="octicon octicon-plus text-muted"></i>
 			</span>
 		`);
 
-		this.review_list_wrapper.find('.share-doc-btn').click(() => this.show());
-
+		this.review_list_wrapper.find('.btn-add-review').click(() => this.show());
 	}
 	get_involved_users() {
 		const user_fields = this.frm.meta.fields
@@ -43,20 +52,24 @@ frappe.ui.form.Review = class Review {
 
 		const docinfo = this.frm.get_docinfo();
 
-		involved_users.concat(docinfo.communications.map(d => d.sender && d.delivery_status==='sent'));
-		involved_users.concat(docinfo.comments.map(d => d.owner));
-		involved_users.concat(docinfo.versions.map(d => d.owner));
-		involved_users.concat(docinfo.assignments.map(d => d.owner));
+		involved_users = involved_users.concat(
+			docinfo.communications.map(d => d.sender && d.delivery_status==='sent'),
+			docinfo.comments.map(d => d.owner),
+			docinfo.versions.map(d => d.owner),
+			docinfo.assignments.map(d => d.owner)
+		);
 
-		involved_users = [...new Set(involved_users)];
-		return involved_users.filter(Boolean);
+		return involved_users
+			.uniqBy(u => u)
+			.filter(user => user !== frappe.session.user)
+			.filter(Boolean);
 	}
 	show() {
 		const review_dialog = new frappe.ui.Dialog({
-			'title': __('Review'),
+			'title': __('Add Review'),
 			'fields': [{
 				fieldname: 'to_user',
-				fieldtype: 'Select',
+				fieldtype: 'Autocomplete',
 				label: __('To User'),
 				options: this.get_involved_users(),
 				default: this.frm.doc.owner
@@ -77,7 +90,7 @@ frappe.ui.form.Review = class Review {
 				fieldtype: 'Int',
 				label: __('Points'),
 				reqd: 1,
-				description: __(`Currently you have ${frappe.boot.review_points} review points`)
+				description: __(`Currently you have ${this.points.review_points} review points`)
 			}, {
 				fieldtype: 'Small Text',
 				fieldname: 'reason',
@@ -85,7 +98,7 @@ frappe.ui.form.Review = class Review {
 				label: __('Reason')
 			}],
 			primary_action: (values) => {
-				if (values.points > frappe.boot.review_points) {
+				if (values.points > this.points.review_points) {
 					return frappe.msgprint(__('You do not have enough points'));
 				}
 				// Add energy point log -- need api for that
@@ -101,11 +114,12 @@ frappe.ui.form.Review = class Review {
 				}).then(() => {
 					review_dialog.hide();
 					review_dialog.clear();
+					this.update_reviewers();
 				});
 				// deduct review points from the user
 				// Alert
 			},
-			primary_action_label: __('Send')
+			primary_action_label: __('Submit')
 		});
 		review_dialog.show();
 	}
@@ -114,30 +128,56 @@ frappe.ui.form.Review = class Review {
 			'doctype': this.frm.doc.doctype,
 			'docname': this.frm.doc.name,
 		}).then(review_logs => {
-			review_logs.forEach(review_log => {
+			this.review_list_wrapper.find('.review-pill').remove();
+			review_logs.forEach(log => {
 				let review_pill = $(`
 					<span class="review-pill">
-						${frappe.avatar(review_log.owner)}
-						<span class="bold ${review_log.type === 'Appreciation' ? 'text-success': 'text-danger'}">
-							${review_log.type === 'Appreciation' ? '+': ''}${review_log.points}
+						${frappe.avatar(log.owner)}
+						<span class="bold" style="color: ${log.points > 0 ? '#45A163': '#e42121'}">
+							${log.points > 0 ? '+': ''}${log.points}
 						</span>
 					</span>
 				`);
 				this.review_list_wrapper.prepend(review_pill);
-				this.setup_detail_popover(review_pill, review_log);
+				this.setup_detail_popover(review_pill, log);
 			});
 		});
 	}
 	setup_detail_popover(el, data) {
+		let subject = '';
+		let fullname = frappe.user_info(data.user).fullname;
+		let timestamp = `<span class="text-muted">${frappe.datetime.comment_when(data.creation)}</span>`;
+		let message_parts = [Math.abs(data.points), fullname, timestamp];
+		if (data.type === 'Appreciation') {
+			if (data.points == 1) {
+				subject = __('{0} appreciation point to {1} {2}', message_parts);
+			} else {
+				subject = __('{0} appreciation points to {1} {2}', message_parts);
+			}
+		} else {
+			if (data.points == -1) {
+				subject = __('{0} criticism point to {1} {2}', message_parts);
+			} else {
+				subject = __('{0} criticism points to {1} {2}', message_parts);
+			}
+		}
 		el.popover({
 			animation: true,
 			trigger: 'hover',
 			delay: 500,
 			placement: 'top',
+			template:`<div class="review-popover popover">
+				<div class="arrow"></div>
+				<div class="popover-content"></div>
+			</div>`,
 			content: () => {
-				return `<div class="text-small">
-					<b>For</b> ${frappe.user_info(data.user).fullname}
-					<p>${data.reason}</p>
+				return `<div class="text-medium">
+					<div class="subject">
+						${subject}
+					</div>
+					<div class="body">
+						<div>${data.reason}</div>
+					</div>
 				</div>`;
 			},
 			html: true,
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 2856ea34fa..0290ca7e45 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -1049,3 +1049,12 @@ img.img-loading:after {
 	font-family: 'Octicons';
 	content: "\f00b";
 }
+
+// popover
+.popover {
+	border-radius: 4px;
+}
+
+.popover-content {
+	padding: 12px;
+}
\ No newline at end of file
diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less
index 6cf1ac86a2..f4da773a7d 100644
--- a/frappe/public/less/sidebar.less
+++ b/frappe/public/less/sidebar.less
@@ -203,7 +203,7 @@ body[data-route^="Module"] .main-menu {
 	}
 }
 
-.form-sidebar .form-shared .share-doc-btn& {
+.form-sidebar .form-shared .share-doc-btn, .btn-add-review {
 	&:hover,
 	&:focus,
 	&:active {
@@ -380,6 +380,16 @@ body[data-route^="Module"] .main-menu {
 .review-list {
 	display: flex;
 	flex-wrap: wrap;
+
+	.btn-add-review {
+		cursor: pointer;
+
+		.octicon {
+			position: relative;
+			left: 4.5px;
+		}
+	}
+
 	.review-pill {
 		width: 50px;
 		border: 1px solid #d2d8dd;
@@ -401,4 +411,18 @@ body[data-route^="Module"] .main-menu {
 		}
 		cursor: pointer;
 	}
-}
\ No newline at end of file
+}
+
+.review-popover  {
+	max-width: 150px;
+
+	.popover-content {
+		padding: 0;
+	}
+	.subject {
+		border-bottom: 1px solid @border-color;
+	}
+	.subject, .body {
+		padding: 12px;
+	}
+}
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index b48d004ed4..c71959b74d 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -10,6 +10,10 @@ from frappe.model.document import Document
 from frappe.utils import cint
 
 class EnergyPointLog(Document):
+	def validate(self):
+		if self.type in ['Appreciation', 'Criticism'] and self.user == self.owner:
+			frappe.throw(_('You cannot give review points to yourself'))
+
 	def after_insert(self):
 		message = ''
 		if self.type == 'Auto':
@@ -117,4 +121,4 @@ def get_reviews(doctype, docname):
 		'reference_doctype': doctype,
 		'reference_name': docname,
 		'type': ['in', ('Appreciation', 'Criticism')],
-	}, fields=['points', 'owner', 'type', 'user', 'reason'])
\ No newline at end of file
+	}, fields=['points', 'owner', 'type', 'user', 'reason', 'creation'])
\ No newline at end of file
diff --git a/frappe/social/doctype/energy_point_settings/energy_point_settings.json b/frappe/social/doctype/energy_point_settings/energy_point_settings.json
index 3fee8fb594..7023c450f0 100644
--- a/frappe/social/doctype/energy_point_settings/energy_point_settings.json
+++ b/frappe/social/doctype/energy_point_settings/energy_point_settings.json
@@ -47,6 +47,39 @@
    "translatable": 0,
    "unique": 0
   },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "enabled",
+   "fetch_if_empty": 0,
+   "fieldname": "section_break_2",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
   {
    "allow_bulk_edit": 0,
    "allow_in_quick_entry": 0,
@@ -151,16 +184,14 @@
   }
  ],
  "has_web_view": 0,
- "hide_heading": 0,
  "hide_toolbar": 0,
  "idx": 0,
- "image_view": 0,
  "in_create": 0,
  "is_submittable": 0,
  "issingle": 1,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-03-21 15:47:30.230995",
+ "modified": "2019-03-26 19:10:14.087840",
  "modified_by": "Administrator",
  "module": "Social",
  "name": "Energy Point Settings",
@@ -189,7 +220,6 @@
  ],
  "quick_entry": 1,
  "read_only": 0,
- "read_only_onload": 0,
  "show_name_in_global_search": 0,
  "sort_field": "modified",
  "sort_order": "ASC",

From 64b2d38d6ac02a573f50a136918fd712e7f58645 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 27 Mar 2019 09:15:14 +0530
Subject: [PATCH 108/256] fix(style): setup wizard

---
 frappe/public/js/frappe/ui/slides.js | 2 +-
 frappe/public/less/desk.less         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/ui/slides.js b/frappe/public/js/frappe/ui/slides.js
index e51a49cff4..7db8e958ce 100644
--- a/frappe/public/js/frappe/ui/slides.js
+++ b/frappe/public/js/frappe/ui/slides.js
@@ -238,7 +238,7 @@ frappe.ui.Slides = class Slides {
 			.appendTo(this.container);
 		this.$body = $(`<div>`).addClass(`slide-container`)
 			.appendTo(this.container);
-		this.$footer = $(`<div>`).addClass(`footer`)
+		this.$footer = $(`<div>`).addClass(`slide-footer`)
 			.appendTo(this.container);
 
 		this.render_progress_dots();
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 7cfa90073d..036c488acc 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -946,8 +946,8 @@ input[type="checkbox"] {
 	.btn-primary {
 		font-weight: bold;
 	}
-	.footer {
-		margin-top: 15px;
+	.slide-footer {
+		margin: 15px 0px;
 		padding: 0px 7px;
 
 		.btn:not(:last-child) {

From c92b9f00fcaf6a4a36c65112afc739b9631fde2c Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 27 Mar 2019 11:37:47 +0530
Subject: [PATCH 109/256] fix: Hide toolbar from energy point settings

---
 .../doctype/energy_point_settings/energy_point_settings.json    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/social/doctype/energy_point_settings/energy_point_settings.json b/frappe/social/doctype/energy_point_settings/energy_point_settings.json
index 7023c450f0..0001b26529 100644
--- a/frappe/social/doctype/energy_point_settings/energy_point_settings.json
+++ b/frappe/social/doctype/energy_point_settings/energy_point_settings.json
@@ -184,7 +184,7 @@
   }
  ],
  "has_web_view": 0,
- "hide_toolbar": 0,
+ "hide_toolbar": 1,
  "idx": 0,
  "in_create": 0,
  "is_submittable": 0,

From 738cab059b39a41c6982eab45c2066ec00d2a724 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 27 Mar 2019 12:05:02 +0530
Subject: [PATCH 110/256] style: Fix review pill

---
 frappe/public/less/sidebar.less | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less
index f4da773a7d..e2bc09ce5e 100644
--- a/frappe/public/less/sidebar.less
+++ b/frappe/public/less/sidebar.less
@@ -392,13 +392,16 @@ body[data-route^="Module"] .main-menu {
 
 	.review-pill {
 		width: 50px;
-		border: 1px solid #d2d8dd;
+		border: 1px solid @border-color;
 		border-radius: 4px;
 		display: flex;
 		margin: 0 10px 10px 0;
 		.avatar {
 			padding: 0px;
 			margin: 0px;
+			.avatar-frame {
+				border-radius: 3px 0 0 3px;
+			}
 		}
 		.standard-image {
 			border-left: 0;

From 1942f07aa2b36086d3ef92cb05caa958a0e77313 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 27 Mar 2019 12:06:27 +0530
Subject: [PATCH 111/256] chore: Fix codacy

---
 frappe/boot.py                                             | 1 -
 frappe/social/doctype/energy_point_log/energy_point_log.js | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/frappe/boot.py b/frappe/boot.py
index b1c1e3cf4c..6763583307 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -18,7 +18,6 @@ from frappe.translate import get_lang_dict
 from frappe.email.inbox import get_email_accounts
 from frappe.core.doctype.feedback_trigger.feedback_trigger import get_enabled_feedback_trigger
 from frappe.social.doctype.energy_point_settings.energy_point_settings import is_energy_point_enabled
-from frappe.social.doctype.energy_point_log.energy_point_log import get_energy_points
 
 def get_bootinfo():
 	"""build and return boot info"""
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.js b/frappe/social/doctype/energy_point_log/energy_point_log.js
index 5b6bd9ab7d..c01d8e6c28 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.js
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.js
@@ -2,7 +2,7 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Energy Point Log', {
-	refresh: function(frm) {
+	refresh: function() {
 
 	}
 });

From b8da13943209c8bfface319a9537a81dcea2176f Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 27 Mar 2019 12:07:04 +0530
Subject: [PATCH 112/256] chore: Remove energy point history page

---
 .../page/energy_point_history/__init__.py     |  0
 .../energy_point_history.js                   | 16 ----------------
 .../energy_point_history.json                 | 19 -------------------
 .../energy_point_transactions.html            | 11 -----------
 4 files changed, 46 deletions(-)
 delete mode 100644 frappe/core/page/energy_point_history/__init__.py
 delete mode 100644 frappe/core/page/energy_point_history/energy_point_history.js
 delete mode 100644 frappe/core/page/energy_point_history/energy_point_history.json
 delete mode 100644 frappe/core/page/energy_point_history/energy_point_transactions.html

diff --git a/frappe/core/page/energy_point_history/__init__.py b/frappe/core/page/energy_point_history/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frappe/core/page/energy_point_history/energy_point_history.js b/frappe/core/page/energy_point_history/energy_point_history.js
deleted file mode 100644
index e3c98c54d5..0000000000
--- a/frappe/core/page/energy_point_history/energy_point_history.js
+++ /dev/null
@@ -1,16 +0,0 @@
-frappe.pages['energy-point-history'].on_page_load = function(wrapper) {
-	const page = frappe.ui.make_app_page({
-		parent: wrapper,
-		title: 'Energy Point History',
-		single_column: true,
-		btn_primary: console.log
-
-	});
-	frappe.db.get_list('Energy Point Log', {
-		filters: { user: frappe.session.user, type: ['not in', 'Review'] },
-		fields: ['points', 'reason', 'rule', 'reference_doctype', 'reference_name', 'type']
-	}).then((data) => {
-		$(frappe.render_template('energy_point_transactions', {data: data}))
-			.appendTo(page.body);
-	});
-}
\ No newline at end of file
diff --git a/frappe/core/page/energy_point_history/energy_point_history.json b/frappe/core/page/energy_point_history/energy_point_history.json
deleted file mode 100644
index ba9563f0cd..0000000000
--- a/frappe/core/page/energy_point_history/energy_point_history.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "content": null,
- "creation": "2018-08-06 12:43:28.480030",
- "docstatus": 0,
- "doctype": "Page",
- "idx": 0,
- "modified": "2019-03-23 19:25:26.947734",
- "modified_by": "Administrator",
- "module": "Core",
- "name": "energy-point-history",
- "owner": "Administrator",
- "page_name": "Energy Point History",
- "roles": [],
- "script": null,
- "standard": "Yes",
- "style": null,
- "system_page": 1,
- "title": "Energy Point History"
-}
\ No newline at end of file
diff --git a/frappe/core/page/energy_point_history/energy_point_transactions.html b/frappe/core/page/energy_point_history/energy_point_transactions.html
deleted file mode 100644
index e3eee35ca0..0000000000
--- a/frappe/core/page/energy_point_history/energy_point_transactions.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div style="padding: 20px;">
-    <ul class="list-group">
-    {% for d in data %}
-        <li class="list-item">
-            <span class="text-success mr-2">{{d.points}}</span>
-            <span class="text-muted">{{d.reason || d.rule}}</span>
-            <span class="text-muted">{{d.reference_doctype}}:{{d.reference_name}}</span>
-        </li>
-    {% endfor %}
-    </ul>
-</div>
\ No newline at end of file

From de1045fc8313be0735e51db491c5362f0de808e8 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 27 Mar 2019 12:07:52 +0530
Subject: [PATCH 113/256] chore: Remove energy badge and user badge doctype

---
 frappe/social/doctype/badge/__init__.py       |   0
 frappe/social/doctype/badge/badge.js          |   8 -
 frappe/social/doctype/badge/badge.json        | 191 ------------------
 frappe/social/doctype/badge/badge.py          |  10 -
 frappe/social/doctype/user_badge/__init__.py  |   0
 .../social/doctype/user_badge/user_badge.json | 108 ----------
 .../social/doctype/user_badge/user_badge.py   |  10 -
 7 files changed, 327 deletions(-)
 delete mode 100644 frappe/social/doctype/badge/__init__.py
 delete mode 100644 frappe/social/doctype/badge/badge.js
 delete mode 100644 frappe/social/doctype/badge/badge.json
 delete mode 100644 frappe/social/doctype/badge/badge.py
 delete mode 100644 frappe/social/doctype/user_badge/__init__.py
 delete mode 100644 frappe/social/doctype/user_badge/user_badge.json
 delete mode 100644 frappe/social/doctype/user_badge/user_badge.py

diff --git a/frappe/social/doctype/badge/__init__.py b/frappe/social/doctype/badge/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frappe/social/doctype/badge/badge.js b/frappe/social/doctype/badge/badge.js
deleted file mode 100644
index eb736fd370..0000000000
--- a/frappe/social/doctype/badge/badge.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2018, Frappe Technologies and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Badge', {
-	refresh: function(frm) {
-
-	}
-});
diff --git a/frappe/social/doctype/badge/badge.json b/frappe/social/doctype/badge/badge.json
deleted file mode 100644
index e698babd8f..0000000000
--- a/frappe/social/doctype/badge/badge.json
+++ /dev/null
@@ -1,191 +0,0 @@
-{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "field:badge_name",
- "beta": 0,
- "creation": "2018-09-07 12:33:22.027439",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
- "editable_grid": 1,
- "engine": "InnoDB",
- "fields": [
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "badge_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Badge Name",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 1
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "description",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Badge Description",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "track_counter_type",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Track Counter Type",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "count",
-   "fieldtype": "Int",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Count",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2018-09-12 13:29:44.696578",
- "modified_by": "Administrator",
- "module": "Social",
- "name": "Badge",
- "name_case": "",
- "owner": "Administrator",
- "permissions": [
-  {
-   "amend": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
-   "write": 1
-  }
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 0,
- "track_seen": 0,
- "track_views": 0
-}
\ No newline at end of file
diff --git a/frappe/social/doctype/badge/badge.py b/frappe/social/doctype/badge/badge.py
deleted file mode 100644
index f40cf51d82..0000000000
--- a/frappe/social/doctype/badge/badge.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2018, Frappe Technologies and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-
-class Badge(Document):
-	pass
diff --git a/frappe/social/doctype/user_badge/__init__.py b/frappe/social/doctype/user_badge/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frappe/social/doctype/user_badge/user_badge.json b/frappe/social/doctype/user_badge/user_badge.json
deleted file mode 100644
index 57fddc29be..0000000000
--- a/frappe/social/doctype/user_badge/user_badge.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
- "creation": "2018-09-07 12:33:29.975737",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
- "editable_grid": 1,
- "engine": "InnoDB",
- "fields": [
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "badge",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Badge",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Badge",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "badge_description",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Badge Description",
-   "length": 0,
-   "no_copy": 0,
-   "options": "badge.description",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 1,
- "max_attachments": 0,
- "modified": "2018-09-12 13:29:31.372604",
- "modified_by": "Administrator",
- "module": "Social",
- "name": "User Badge",
- "name_case": "",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0,
- "track_views": 0
-}
\ No newline at end of file
diff --git a/frappe/social/doctype/user_badge/user_badge.py b/frappe/social/doctype/user_badge/user_badge.py
deleted file mode 100644
index 03fe73fc35..0000000000
--- a/frappe/social/doctype/user_badge/user_badge.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2018, Frappe Technologies and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-
-class UserBadge(Document):
-	pass

From 1ecaff205a273636289aa33df1b2124e6720fa0e Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 27 Mar 2019 12:08:49 +0530
Subject: [PATCH 114/256] fix: Hide sidebar in energy point rule master

---
 .../doctype/energy_point_rule/energy_point_rule.json       | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.json b/frappe/social/doctype/energy_point_rule/energy_point_rule.json
index 0b9d7a4516..926b34f3a3 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.json
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.json
@@ -251,16 +251,14 @@
   }
  ],
  "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
+ "hide_toolbar": 1,
  "idx": 0,
- "image_view": 0,
  "in_create": 0,
  "is_submittable": 0,
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-03-21 11:36:06.399428",
+ "modified": "2019-03-27 11:57:27.672792",
  "modified_by": "Administrator",
  "module": "Social",
  "name": "Energy Point Rule",
@@ -289,7 +287,6 @@
  ],
  "quick_entry": 0,
  "read_only": 0,
- "read_only_onload": 0,
  "show_name_in_global_search": 0,
  "sort_field": "modified",
  "sort_order": "DESC",

From db85de1737ebc0abab7c9b0200494287dc9780f5 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 27 Mar 2019 12:11:51 +0530
Subject: [PATCH 115/256] style: Add whitespace around if check

---
 frappe/core/doctype/user/user.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/core/doctype/user/user.js b/frappe/core/doctype/user/user.js
index c7145c7efe..015e1c4f00 100644
--- a/frappe/core/doctype/user/user.js
+++ b/frappe/core/doctype/user/user.js
@@ -249,7 +249,7 @@ frappe.ModuleEditor = Class.extend({
 			if($(this).prop("checked")) {
 				// remove from block_modules
 				me.frm.doc.block_modules = $.map(me.frm.doc.block_modules || [], function(d) {
-					if(d.module != module){
+					if (d.module != module) {
 						return d;
 					}
 				});

From 695304796cc690b046bfef44d466a0cd69ff2cb3 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 27 Mar 2019 12:14:05 +0530
Subject: [PATCH 116/256] chore: Remove github event handler file

---
 frappe/integrations/github_event_handler.py | 81 ---------------------
 1 file changed, 81 deletions(-)
 delete mode 100644 frappe/integrations/github_event_handler.py

diff --git a/frappe/integrations/github_event_handler.py b/frappe/integrations/github_event_handler.py
deleted file mode 100644
index 052ccecdf8..0000000000
--- a/frappe/integrations/github_event_handler.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt
-
-from __future__ import unicode_literals
-import json
-import frappe
-import frappe.utils
-from frappe.social.doctype.energy_point_log.energy_point_log import ENERGY_POINT_VALUES, create_energy_point_log
-
-
-@frappe.whitelist(allow_guest=True)
-def handle_event(*args, **kwargs):
-	r = frappe.request
-	event_type = r.headers.get('X-Github-Event')
-	payload = json.loads(r.get_data())
-	if event_type == 'pull_request':
-		process_pull_request(payload)
-	if event_type == 'pull_request_review':
-		process_pull_request(payload)
-	elif event_type == 'issues':
-		process_issues(payload)
-	return True
-
-def process_pull_request(payload):
-	action = payload.get('action')
-	data = payload.get('pull_request')
-	user_github_id = data['user']['login']
-	if not is_local_user(user_github_id): return
-	if action == 'closed' and data['merged']:
-		process_merged_pull_request(data)
-	if action == 'submitted':
-		process_pull_request_review(data)
-
-def process_issues(payload):
-	action = payload.get('action')
-	data = payload.get('issue')
-	user_github_id = data['user']['login']
-	if not is_local_user(user_github_id): return
-	if action == 'opened':
-		create_energy_point_log(
-			ENERGY_POINT_VALUES['github_issue_open'],
-			'Opened Issue: {}'.format(data['title']),
-			None,
-			None,
-			get_user_name(data['user']['login'])
-		)
-	if action == 'closed':
-		create_energy_point_log(
-			ENERGY_POINT_VALUES['github_issue_close'],
-			'Closed Issue: {}'.format(data['title']),
-			None,
-			None,
-			get_user_name(data['user']['login'])
-		)
-
-def process_merged_pull_request(data):
-	create_energy_point_log(
-		ENERGY_POINT_VALUES['github_pull_request_merge'],
-		'Pull Request Merged: {}'.format(data['title']),
-		None,
-		None,
-		get_user_name(data['user']['login'])
-	)
-
-def process_pull_request_review(data):
-	create_energy_point_log(
-		ENERGY_POINT_VALUES['github_pull_request_review_submit'],
-		'Reviewed Pull Request: {}'.format(data['title']),
-		None,
-		None,
-		get_user_name(data['user']['login'])
-	)
-
-
-def is_local_user(github_id):
-	return frappe.db.count('Social Profile', {'github_id': github_id})
-
-def get_user_name(github_id):
-	return frappe.get_value('Social Profile', filters={
-		'github_id': github_id
-	}, fieldname='name')

From fc1e017dfcb2cea5b35db85b5033ce50ff7016fd Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 27 Mar 2019 12:18:04 +0530
Subject: [PATCH 117/256] style: Remove unwanted comments

---
 frappe/public/js/frappe/form/review.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frappe/public/js/frappe/form/review.js b/frappe/public/js/frappe/form/review.js
index 57c0fc3678..27c1452c29 100644
--- a/frappe/public/js/frappe/form/review.js
+++ b/frappe/public/js/frappe/form/review.js
@@ -101,7 +101,6 @@ frappe.ui.form.Review = class Review {
 				if (values.points > this.points.review_points) {
 					return frappe.msgprint(__('You do not have enough points'));
 				}
-				// Add energy point log -- need api for that
 				frappe.xcall('frappe.social.doctype.energy_point_log.energy_point_log.review', {
 					doc: {
 						doctype: this.frm.doc.doctype,
@@ -116,8 +115,6 @@ frappe.ui.form.Review = class Review {
 					review_dialog.clear();
 					this.update_reviewers();
 				});
-				// deduct review points from the user
-				// Alert
 			},
 			primary_action_label: __('Submit')
 		});

From de6c8f5ba873bb9b9f596b7223658e2c0870de3a Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 27 Mar 2019 12:30:53 +0530
Subject: [PATCH 118/256] fix: Revert unwanted file change

---
 frappe/core/doctype/user/user.json | 77 +-----------------------------
 1 file changed, 1 insertion(+), 76 deletions(-)

diff --git a/frappe/core/doctype/user/user.json b/frappe/core/doctype/user/user.json
index f161fd23a0..e96cdf6f36 100644
--- a/frappe/core/doctype/user/user.json
+++ b/frappe/core/doctype/user/user.json
@@ -21,7 +21,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "sb0_5",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -54,7 +53,6 @@
    "collapsible": 0,
    "columns": 0,
    "default": "1",
-   "fetch_if_empty": 0,
    "fieldname": "enabled",
    "fieldtype": "Check",
    "hidden": 0,
@@ -89,7 +87,6 @@
    "collapsible": 0,
    "columns": 0,
    "depends_on": "enabled",
-   "fetch_if_empty": 0,
    "fieldname": "section_break_3",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -121,7 +118,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "email",
    "fieldtype": "Data",
    "hidden": 0,
@@ -156,7 +152,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "first_name",
    "fieldtype": "Data",
    "hidden": 0,
@@ -190,7 +185,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "middle_name",
    "fieldtype": "Data",
    "hidden": 0,
@@ -224,7 +218,6 @@
    "bold": 1,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "last_name",
    "fieldtype": "Data",
    "hidden": 0,
@@ -258,7 +251,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "full_name",
    "fieldtype": "Data",
    "hidden": 0,
@@ -293,7 +285,6 @@
    "columns": 0,
    "default": "1",
    "depends_on": "eval:doc.__islocal",
-   "fetch_if_empty": 0,
    "fieldname": "send_welcome_email",
    "fieldtype": "Check",
    "hidden": 0,
@@ -326,7 +317,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "unsubscribed",
    "fieldtype": "Check",
    "hidden": 1,
@@ -358,7 +348,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "column_break0",
    "fieldtype": "Column Break",
    "hidden": 0,
@@ -392,7 +381,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "username",
    "fieldtype": "Data",
    "hidden": 0,
@@ -426,7 +414,6 @@
    "collapsible": 0,
    "columns": 0,
    "description": "",
-   "fetch_if_empty": 0,
    "fieldname": "language",
    "fieldtype": "Link",
    "hidden": 0,
@@ -460,7 +447,6 @@
    "collapsible": 0,
    "columns": 0,
    "description": "",
-   "fetch_if_empty": 0,
    "fieldname": "time_zone",
    "fieldtype": "Select",
    "hidden": 0,
@@ -493,7 +479,6 @@
    "collapsible": 0,
    "columns": 0,
    "description": "Get your globally recognized avatar from Gravatar.com",
-   "fetch_if_empty": 0,
    "fieldname": "user_image",
    "fieldtype": "Attach Image",
    "hidden": 1,
@@ -527,7 +512,6 @@
    "columns": 0,
    "depends_on": "enabled",
    "description": "",
-   "fetch_if_empty": 0,
    "fieldname": "sb1",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -559,7 +543,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "role_profile_name",
    "fieldtype": "Link",
    "hidden": 0,
@@ -593,7 +576,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "roles_html",
    "fieldtype": "HTML",
    "hidden": 0,
@@ -625,7 +607,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "roles",
    "fieldtype": "Table",
    "hidden": 1,
@@ -660,7 +641,6 @@
    "collapsible": 1,
    "columns": 0,
    "depends_on": "enabled",
-   "fetch_if_empty": 0,
    "fieldname": "short_bio",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -692,7 +672,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "gender",
    "fieldtype": "Link",
    "hidden": 0,
@@ -727,7 +706,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "phone",
    "fieldtype": "Data",
    "hidden": 0,
@@ -760,7 +738,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "mobile_no",
    "fieldtype": "Data",
    "hidden": 0,
@@ -793,7 +770,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "birth_date",
    "fieldtype": "Date",
    "hidden": 0,
@@ -827,7 +803,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "location",
    "fieldtype": "Data",
    "hidden": 0,
@@ -859,7 +834,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "banner_image",
    "fieldtype": "Attach Image",
    "hidden": 0,
@@ -892,7 +866,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "column_break_22",
    "fieldtype": "Column Break",
    "hidden": 0,
@@ -923,7 +896,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "interest",
    "fieldtype": "Small Text",
    "hidden": 0,
@@ -956,7 +928,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "bio",
    "fieldtype": "Small Text",
    "hidden": 0,
@@ -988,7 +959,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "mute_sounds",
    "fieldtype": "Check",
    "hidden": 0,
@@ -1022,7 +992,6 @@
    "collapsible": 1,
    "columns": 0,
    "depends_on": "eval:doc.enabled && (!doc.__islocal || !cint(doc.send_welcome_email))",
-   "fetch_if_empty": 0,
    "fieldname": "change_password",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -1054,7 +1023,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "new_password",
    "fieldtype": "Password",
    "hidden": 0,
@@ -1087,7 +1055,6 @@
    "collapsible": 0,
    "columns": 0,
    "depends_on": "eval:!doc.__islocal",
-   "fetch_if_empty": 0,
    "fieldname": "send_password_update_notification",
    "fieldtype": "Check",
    "hidden": 0,
@@ -1121,7 +1088,6 @@
    "collapsible": 0,
    "columns": 0,
    "default": "0",
-   "fetch_if_empty": 0,
    "fieldname": "logout_all_sessions",
    "fieldtype": "Check",
    "hidden": 0,
@@ -1154,7 +1120,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "reset_password_key",
    "fieldtype": "Data",
    "hidden": 1,
@@ -1186,7 +1151,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "redirect_url",
    "fieldtype": "Small Text",
    "hidden": 1,
@@ -1220,7 +1184,6 @@
    "collapsible": 1,
    "columns": 0,
    "depends_on": "",
-   "fetch_if_empty": 0,
    "fieldname": "document_follow_notifications_section",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -1253,7 +1216,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "document_follow_notify",
    "fieldtype": "Check",
    "hidden": 0,
@@ -1289,7 +1251,6 @@
    "columns": 0,
    "default": "Daily",
    "depends_on": "eval:(doc.document_follow_notify== 1)",
-   "fetch_if_empty": 0,
    "fieldname": "document_follow_frequency",
    "fieldtype": "Select",
    "hidden": 0,
@@ -1324,7 +1285,6 @@
    "collapsible": 1,
    "columns": 0,
    "depends_on": "enabled",
-   "fetch_if_empty": 0,
    "fieldname": "email_settings",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -1358,7 +1318,6 @@
    "collapsible": 0,
    "columns": 0,
    "default": "1",
-   "fetch_if_empty": 0,
    "fieldname": "thread_notify",
    "fieldtype": "Check",
    "hidden": 0,
@@ -1391,7 +1350,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "send_me_a_copy",
    "fieldtype": "Check",
    "hidden": 0,
@@ -1425,7 +1383,6 @@
    "collapsible": 0,
    "columns": 0,
    "default": "1",
-   "fetch_if_empty": 0,
    "fieldname": "allowed_in_mentions",
    "fieldtype": "Check",
    "hidden": 0,
@@ -1458,7 +1415,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "email_signature",
    "fieldtype": "Small Text",
    "hidden": 0,
@@ -1490,7 +1446,6 @@
    "bold": 0,
    "collapsible": 1,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "email_inbox",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -1524,7 +1479,6 @@
    "collapsible": 0,
    "columns": 0,
    "description": "",
-   "fetch_if_empty": 0,
    "fieldname": "user_emails",
    "fieldtype": "Table",
    "hidden": 0,
@@ -1559,7 +1513,6 @@
    "collapsible": 1,
    "columns": 0,
    "depends_on": "enabled",
-   "fetch_if_empty": 0,
    "fieldname": "background",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -1592,7 +1545,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "background_image",
    "fieldtype": "Attach",
    "hidden": 0,
@@ -1625,7 +1577,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "background_style",
    "fieldtype": "Select",
    "hidden": 0,
@@ -1661,7 +1612,6 @@
    "columns": 0,
    "default": "",
    "description": "",
-   "fetch_if_empty": 0,
    "fieldname": "sb_allow_modules",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -1694,7 +1644,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "modules_html",
    "fieldtype": "HTML",
    "hidden": 0,
@@ -1727,7 +1676,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "block_modules",
    "fieldtype": "Table",
    "hidden": 1,
@@ -1762,7 +1710,6 @@
    "collapsible": 0,
    "columns": 0,
    "default": "",
-   "fetch_if_empty": 0,
    "fieldname": "home_settings",
    "fieldtype": "Code",
    "hidden": 0,
@@ -1796,7 +1743,6 @@
    "collapsible": 0,
    "columns": 0,
    "description": "These values will be automatically updated in transactions and also will be useful to restrict permissions for this user on transactions containing these values.",
-   "fetch_if_empty": 0,
    "fieldname": "sb2",
    "fieldtype": "Section Break",
    "hidden": 1,
@@ -1832,7 +1778,6 @@
    "collapsible": 0,
    "columns": 0,
    "description": "Enter default value fields (keys) and values. If you add multiple values for a field, the first one will be picked. These defaults are also used to set \"match\" permission rules. To see list of fields, go to \"Customize Form\".",
-   "fetch_if_empty": 0,
    "fieldname": "defaults",
    "fieldtype": "Table",
    "hidden": 1,
@@ -1866,7 +1811,6 @@
    "collapsible": 1,
    "columns": 0,
    "depends_on": "enabled",
-   "fetch_if_empty": 0,
    "fieldname": "sb3",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -1900,7 +1844,6 @@
    "collapsible": 0,
    "columns": 0,
    "default": "1",
-   "fetch_if_empty": 0,
    "fieldname": "simultaneous_sessions",
    "fieldtype": "Int",
    "hidden": 0,
@@ -1935,7 +1878,6 @@
    "columns": 0,
    "default": "System User",
    "description": "If the user has any role checked, then the user becomes a \"System User\". \"System User\" has access to the desktop",
-   "fetch_if_empty": 0,
    "fieldname": "user_type",
    "fieldtype": "Select",
    "hidden": 0,
@@ -1971,7 +1913,6 @@
    "collapsible": 0,
    "columns": 0,
    "description": "Allow user to login only after this hour (0-24)",
-   "fetch_if_empty": 0,
    "fieldname": "login_after",
    "fieldtype": "Int",
    "hidden": 0,
@@ -2004,7 +1945,6 @@
    "collapsible": 0,
    "columns": 0,
    "description": "Allow user to login only before this hour (0-24)",
-   "fetch_if_empty": 0,
    "fieldname": "login_before",
    "fieldtype": "Int",
    "hidden": 0,
@@ -2037,7 +1977,6 @@
    "collapsible": 0,
    "columns": 0,
    "description": "Restrict user from this IP address only. Multiple IP addresses can be added by separating with commas. Also accepts partial IP addresses like (111.111.111)",
-   "fetch_if_empty": 0,
    "fieldname": "restrict_ip",
    "fieldtype": "Data",
    "hidden": 0,
@@ -2071,7 +2010,6 @@
    "columns": 0,
    "depends_on": "eval:doc.restrict_ip && doc.restrict_ip.length",
    "description": "If enabled,  user can login from any IP Address using Two Factor Auth, this can also be set for all users in System Settings",
-   "fetch_if_empty": 0,
    "fieldname": "bypass_restrict_ip_check_if_2fa_enabled",
    "fieldtype": "Check",
    "hidden": 0,
@@ -2104,7 +2042,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "column_break1",
    "fieldtype": "Column Break",
    "hidden": 0,
@@ -2138,7 +2075,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "last_login",
    "fieldtype": "Read Only",
    "hidden": 0,
@@ -2172,7 +2108,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "last_ip",
    "fieldtype": "Read Only",
    "hidden": 0,
@@ -2206,7 +2141,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "last_active",
    "fieldtype": "Datetime",
    "hidden": 0,
@@ -2240,7 +2174,6 @@
    "collapsible": 0,
    "columns": 0,
    "description": "Stores the JSON of last known versions of various installed apps. It is used to show release notes.",
-   "fetch_if_empty": 0,
    "fieldname": "last_known_versions",
    "fieldtype": "Text",
    "hidden": 1,
@@ -2274,7 +2207,6 @@
    "collapsible": 1,
    "columns": 0,
    "depends_on": "enabled",
-   "fetch_if_empty": 0,
    "fieldname": "third_party_authentication",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -2306,7 +2238,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "social_logins",
    "fieldtype": "Table",
    "hidden": 0,
@@ -2340,7 +2271,6 @@
    "bold": 0,
    "collapsible": 1,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "api_access",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -2374,7 +2304,6 @@
    "collapsible": 0,
    "columns": 0,
    "description": "API Key cannot be  regenerated",
-   "fetch_if_empty": 0,
    "fieldname": "api_key",
    "fieldtype": "Data",
    "hidden": 0,
@@ -2407,7 +2336,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "generate_keys",
    "fieldtype": "Button",
    "hidden": 0,
@@ -2440,7 +2368,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "column_break_65",
    "fieldtype": "Column Break",
    "hidden": 0,
@@ -2472,7 +2399,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "api_secret",
    "fieldtype": "Password",
    "hidden": 0,
@@ -2511,8 +2437,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 5,
- "menu_index": 0,
- "modified": "2019-03-21 16:55:34.747934",
+ "modified": "2019-03-03 11:10:06.162541",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "User",

From 1b48f6e6df66d63f3c2d14db07de481de884b49f Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 27 Mar 2019 12:32:37 +0530
Subject: [PATCH 119/256] revert: fix(build): Disable spread transpilation

This reverts commit 7fee2c42f3981b56ad22e622dac9bd5478659da0.
---
 rollup/config.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/rollup/config.js b/rollup/config.js
index 4ed9423a49..f645eae498 100644
--- a/rollup/config.js
+++ b/rollup/config.js
@@ -55,9 +55,7 @@ function get_rollup_options_for_js(output_file, input_files) {
 			objectAssign: 'Object.assign',
 			transforms: {
 				dangerousForOf: true,
-				classes: false,
-				// https://github.com/bublejs/buble/issues/81
-				spreadRest: false
+				classes: false
 			},
 			exclude: [path.resolve(bench_path, '**/*.css'), path.resolve(bench_path, '**/*.less')]
 		}),

From 5a82a5ed8336569053875db41c6f20818ff4cd95 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 27 Mar 2019 14:40:46 +0530
Subject: [PATCH 120/256] fix: Rearrange the order of checks to avoid error

---
 frappe/social/doctype/energy_point_rule/energy_point_rule.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
index ca84ab4e86..66ede87d67 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
@@ -31,7 +31,7 @@ class EnergyPointRule(Document):
 
 
 def process_energy_points(doc, state):
-	if not is_energy_point_enabled() or frappe.flags.in_patch or frappe.flags.in_install:
+	if frappe.flags.in_patch or frappe.flags.in_install or not is_energy_point_enabled():
 		return
 
 	energy_point_doctypes = frappe.cache().get_value('energy_point_doctypes', get_energy_point_doctypes)

From 977126b11617e3f9d3a311c91a07a2df17081293 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 27 Mar 2019 14:54:54 +0530
Subject: [PATCH 121/256] style: Linting Fixes

---
 frappe/core/page/dashboard/dashboard.js                | 1 -
 frappe/core/page/dashboard/dashboard.py                | 1 -
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 1 -
 3 files changed, 3 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 561d2d4104..9ff89693b6 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -1,7 +1,6 @@
 // Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
 // MIT License. See license.txt
 
-frappe.provide("frappe.dashboard_chart_sources");
 
 frappe.pages['dashboard'].on_page_load = function(wrapper) {
 	frappe.ui.make_app_page({
diff --git a/frappe/core/page/dashboard/dashboard.py b/frappe/core/page/dashboard/dashboard.py
index b1f45e0737..85b448981c 100644
--- a/frappe/core/page/dashboard/dashboard.py
+++ b/frappe/core/page/dashboard/dashboard.py
@@ -2,7 +2,6 @@
 # MIT License. See license.txt
 from __future__ import unicode_literals
 import json
-import os
 import frappe
 from frappe.modules import get_module_path
 from frappe.model.utils import render_include
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index b86e6b7d8d..4a8d0212c9 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -1,6 +1,5 @@
 // Copyright (c) 2019, Frappe Technologies and contributors
 // For license information, please see license.txt
-frappe.provide("frappe.dashboard_chart_sources");
 
 frappe.ui.form.on('Dashboard Chart', {
 	refresh: function(frm) {

From 698b0011b1749e8c83871236e50652e876156a36 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Wed, 27 Mar 2019 15:11:12 +0530
Subject: [PATCH 122/256] fix: exported data of report showing blank in the
 excel file (#7141)

---
 frappe/desk/query_report.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py
index ea9b667935..7ec767c227 100644
--- a/frappe/desk/query_report.py
+++ b/frappe/desk/query_report.py
@@ -275,14 +275,14 @@ def build_xlsx_data(columns, data, visible_idx):
 		if i in visible_idx:
 			row_data = []
 
-			if isinstance(row, list):
-				row_data = row
-			elif isinstance(row, dict) and row:
+			if isinstance(row, dict) and row:
 				for idx in range(len(data.columns)):
 					label = columns[idx]["label"]
 					fieldname = columns[idx]["fieldname"]
 
 					row_data.append(row.get(fieldname, row.get(label, "")))
+			else:
+				row_data = row
 
 			result.append(row_data)
 

From db39160192e822820647c7e5f734fdfff6fc2acd Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 27 Mar 2019 17:38:25 +0530
Subject: [PATCH 123/256] chore: Remove unused import

---
 frappe/social/doctype/energy_point_rule/energy_point_rule.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
index 66ede87d67..1268694667 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
@@ -5,7 +5,6 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
-from frappe.utils import cint
 from frappe.social.doctype.energy_point_settings.energy_point_settings import is_energy_point_enabled
 from frappe.social.doctype.energy_point_log.energy_point_log import create_energy_points_log
 

From e49cb8f9f32817d1f910423904184f89f4e13747 Mon Sep 17 00:00:00 2001
From: Prateeksha Singh <pratu16x7@gmail.com>
Date: Wed, 27 Mar 2019 18:32:12 +0530
Subject: [PATCH 124/256] fix(set_chart): Don't truncate null labels

---
 frappe/public/js/frappe/views/reports/query_report.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 083c3d21d2..953c690904 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -493,10 +493,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 			const type = chart_type.toLowerCase();
 			const colors = color ? [color] : undefined;
 
-			let labels = get_column_values(x_field)
-				.filter(Boolean)
-				.map(d => d.trim())
-				.filter(Boolean);
+			let labels = get_column_values(x_field);
 
 			let dataset_values = get_column_values(y_field).map(d => Number(d));
 

From 536bf6ce59bae0b321450d24e11b84fbfe64586b Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 27 Mar 2019 19:06:32 +0530
Subject: [PATCH 125/256] style: Linting fixes

---
 frappe/core/page/dashboard/dashboard.css               | 10 +++++++---
 frappe/core/page/dashboard/dashboard.js                |  6 +++---
 frappe/core/page/dashboard/dashboard.py                |  2 --
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js |  2 +-
 .../dashboard_chart_source/dashboard_chart_source.js   |  3 ---
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.css b/frappe/core/page/dashboard/dashboard.css
index e998997f67..48485fd505 100644
--- a/frappe/core/page/dashboard/dashboard.css
+++ b/frappe/core/page/dashboard/dashboard.css
@@ -8,7 +8,7 @@
 .chart-actions {
     position: absolute;
     right: 30px;
-    top: 30px;
+    top: 54px;
 }
 
 .chart-column-container {
@@ -17,7 +17,11 @@
 
 .last-synced-text {
     position: absolute;
-    top: 34px;
+    top: 56px;
     right: 60px;
-    font-size: 10px;
+    font-size: 12px;
+}
+
+.dashboard-graph {
+    padding-top: 15px;
 }
\ No newline at end of file
diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 9ff89693b6..93e9bd86f6 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -19,7 +19,7 @@ class Dashboard {
 	constructor(wrapper) {
 		this.wrapper = $(wrapper);
 		$(`<div class="dashboard">
-			<div class="dashboard-graph" class="row"></div>
+			<div class="dashboard-graph row"></div>
 		</div>`).appendTo(this.wrapper.find(".page-content").empty());
 		this.container = this.wrapper.find(".dashboard-graph");
 		this.page = wrapper.page;
@@ -45,7 +45,7 @@ class Dashboard {
 			this.charts = this.dashboard_doc.charts;
 
 			this.charts.map((chart) => {
-				let chart_container = $("<div><div>");
+				let chart_container = $("<div></div>");
 				chart_container.appendTo(this.container);
 
 				frappe.model.with_doc("Dashboard Chart", chart.chart).then( chart_doc => {
@@ -164,7 +164,7 @@ class DashboardChart {
 			"Bar": "bar",
 		};
 		let chart_args = {
-			title: this.chart_doc.chart_name,
+			title: this.chart_doc.chart_name.bold(),
 			data: this.data,
 			type: chart_type_map[this.chart_doc.type],
 			colors: [this.chart_doc.color || "light-blue"],
diff --git a/frappe/core/page/dashboard/dashboard.py b/frappe/core/page/dashboard/dashboard.py
index 85b448981c..61dafa2a1e 100644
--- a/frappe/core/page/dashboard/dashboard.py
+++ b/frappe/core/page/dashboard/dashboard.py
@@ -3,8 +3,6 @@
 from __future__ import unicode_literals
 import json
 import frappe
-from frappe.modules import get_module_path
-from frappe.model.utils import render_include
 
 
 def cache_source(function):
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 4a8d0212c9..2587445877 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -42,7 +42,7 @@ frappe.ui.form.on('Dashboard Chart', {
 
 		let filters = JSON.parse(frm.doc.filters_json || '{}');
 		fields.map( f => {
-			const filter_row = $(`<tr><td>${f.label}</td><td>${filters[f.fieldname]}</td></tr>`);
+			const filter_row = $(`<tr><td>${f.label}</td><td>${filters[f.fieldname] || ""}</td></tr>`);
 			table.find('tbody').append(filter_row);
 		});
 
diff --git a/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.js b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.js
index 7218f2b86c..96dd40d3c1 100644
--- a/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.js
+++ b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.js
@@ -2,7 +2,4 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Dashboard Chart Source', {
-	refresh: function(frm) {
-
-	}
 });

From 3137e8d631a61260a62f4e44b3f3a3811c64e2e2 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 27 Mar 2019 19:39:27 +0530
Subject: [PATCH 126/256] fix: Add a missing comma to daily hook list

---
 frappe/hooks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/hooks.py b/frappe/hooks.py
index 304db9546d..d66046b87d 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -174,7 +174,7 @@ scheduler_events = {
 		"frappe.core.doctype.feedback_request.feedback_request.delete_feedback_request",
 		"frappe.core.doctype.activity_log.activity_log.clear_authentication_logs",
 		"frappe.website.doctype.personal_data_deletion_request.personal_data_deletion_request.remove_unverified_record",
-		"frappe.desk.form.document_follow.send_daily_updates"
+		"frappe.desk.form.document_follow.send_daily_updates",
 		"frappe.social.doctype.energy_point_settings.energy_point_settings.allocate_review_points"
 	],
 	"daily_long": [

From cb47502fb9075aa0154ec3542d402c9360d78639 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Tue, 26 Mar 2019 16:59:34 +0530
Subject: [PATCH 127/256] chore: add expect to eslintrc

---
 .eslintrc                                  |  1 +
 cypress/integration/control_rating.js      | 61 +++++++++++-----------
 cypress/support/commands.js                |  2 +-
 frappe/public/js/frappe/form/formatters.js |  4 +-
 4 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index ec8d486c1e..cdd6be1c0b 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -137,6 +137,7 @@
 		"Cypress": true,
 		"cy": true,
 		"it": true,
+		"expect": true,
 		"context": true,
 		"before": true,
 		"beforeEach": true
diff --git a/cypress/integration/control_rating.js b/cypress/integration/control_rating.js
index 7098bb9a77..62ddbe3e36 100644
--- a/cypress/integration/control_rating.js
+++ b/cypress/integration/control_rating.js
@@ -1,37 +1,38 @@
 context('Rating Control', () => {
 	beforeEach(() => {
 		cy.login('Administrator', 'qwe');
-    });
+	});
 
-    it('click on the star rating to record value', () => {
-        cy.visit('/desk')
-        cy.dialog('Rating', {
-            'fieldname': 'rate', 'fieldtype': 'Rating',
-        }).as('dialog');
+	it('click on the star rating to record value', () => {
+		cy.visit('/desk')
+		cy.dialog('Rating', {
+			'fieldname': 'rate',
+			'fieldtype': 'Rating',
+		}).as('dialog');
 
-        cy.get('div.rating')
-            .children('i.fa')
-            .first()
-            .click()
-            .should('have.class', 'star-click');
-        cy.get('@dialog').then(dialog => {
-            var value = dialog.get_value('rate');
-            expect(value).to.equal(1)
-        })
-    });
-
-    it('hover on the star', () => {
-        cy.visit('/desk')
-        cy.dialog('Rating', {
-            'fieldname': 'rate', 'fieldtype': 'Rating',
-        })
-        cy.get('div.rating')
-            .children('i.fa')
-            .first()
-            .invoke('trigger', 'mouseenter')
-            .should('have.class', 'star-hover')
-            .invoke('trigger', 'mouseleave')
-            .should('not.have.class', 'star-hover');
-    });
+		cy.get('div.rating')
+			.children('i.fa')
+			.first()
+			.click()
+			.should('have.class', 'star-click');
+		cy.get('@dialog').then(dialog => {
+			var value = dialog.get_value('rate');
+			expect(value).to.equal(1);
+		})
+	});
 
+	it('hover on the star', () => {
+		cy.visit('/desk')
+		cy.dialog('Rating', {
+			'fieldname': 'rate',
+			'fieldtype': 'Rating',
+		})
+		cy.get('div.rating')
+			.children('i.fa')
+			.first()
+			.invoke('trigger', 'mouseenter')
+			.should('have.class', 'star-hover')
+			.invoke('trigger', 'mouseleave')
+			.should('not.have.class', 'star-hover');
+	});
 });
\ No newline at end of file
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 007d0d9f3e..ed81c182a6 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -74,6 +74,6 @@ Cypress.Commands.add('dialog', (title, fields) => {
 			}
 		});
 		d.show();
-		return d
+		return d;
 	});
 });
diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index 34966b5eb5..23f9b932dc 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -52,12 +52,12 @@ frappe.form.formatters = {
 	Percent: function(value, docfield, options) {
 		return frappe.form.formatters._right(flt(value, 2) + "%", options)
 	},
-	Rating: function(value, docfield, options, doc) {
+	Rating: function(value, docfield, options) {
 		return `
 			<div class="rating">
 				${Array.from(new Array(5)).map((_, i) =>
 					`<i class="fa fa-fw fa-star ${i < (value || 0) ? "star-click": "" } star-icon" data-idx="${(i+1)}"></i>`
-					).join('')}
+				).join('')}
 			</div>
 		`;
 	},

From 848943896cfaef95d4db15baceea06d6e24fd362 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Wed, 27 Mar 2019 18:31:59 +0530
Subject: [PATCH 128/256] fix: change from input only wrapper to input area
 wrapper

---
 .../public/js/frappe/form/controls/rating.js  | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/rating.js b/frappe/public/js/frappe/form/controls/rating.js
index 505e08f21f..b9f4df0687 100644
--- a/frappe/public/js/frappe/form/controls/rating.js
+++ b/frappe/public/js/frappe/form/controls/rating.js
@@ -2,18 +2,18 @@ frappe.ui.form.ControlRating  = frappe.ui.form.ControlInt.extend({
 	make_input() {
 		this._super();
 		const star_template = `
-		<div class = "rating">
-			<i class="fa fa-fw fa-star" data-idx=1></i>
-			<i class="fa fa-fw fa-star" data-idx=2></i>
-			<i class="fa fa-fw fa-star" data-idx=3></i>
-			<i class="fa fa-fw fa-star" data-idx=4></i>
-			<i class="fa fa-fw fa-star" data-idx=5></i>
-		</div>
+			<div class="rating">
+				<i class="fa fa-fw fa-star" data-idx=1></i>
+				<i class="fa fa-fw fa-star" data-idx=2></i>
+				<i class="fa fa-fw fa-star" data-idx=3></i>
+				<i class="fa fa-fw fa-star" data-idx=4></i>
+				<i class="fa fa-fw fa-star" data-idx=5></i>
+			</div>
 		`;
 
-		this.$input_wrapper.html(star_template);
+		$(this.input_area).html(star_template);
 
-		this.$input_wrapper.find('i').hover((ev) => {
+		$(this.input_area).find('i').hover((ev) => {
 			const el = $(ev.currentTarget);
 			let star_value = el.data('idx');
 			el.parent().children('i.fa').each( function(e){
@@ -30,7 +30,7 @@ frappe.ui.form.ControlRating  = frappe.ui.form.ControlInt.extend({
 				});
 		});
 
-		this.$input_wrapper.find('i').click((ev) => {
+		$(this.input_area).find('i').click((ev) => {
 			const el = $(ev.currentTarget);
 			let star_value = el.data('idx');
 			el.parent().children('i.fa').each( function(e) {
@@ -40,18 +40,24 @@ frappe.ui.form.ControlRating  = frappe.ui.form.ControlInt.extend({
 					$(this).removeClass('star-click');
 				}
 			});
-			this.set_value(star_value);
+			this.validate_and_set_in_model(star_value, ev);
+			if (this.doctype && this.docname) {
+				this.set_input(star_value);
+			}
 		});
 	},
 	get_value() {
-		return this.value ? this.value : 0;
+		return cint(this.value);
 	},
 	set_formatted_input(value) {
-		let el = this.$input_wrapper.find('i');
+		let el = $(this.input_area).find('i');
 		el.children('i.fa').prevObject.each( function(e) {
-			if (e < value){
+			if (e < value) {
 				$(this).addClass('star-click');
 			}
+			else {
+				$(this).removeClass('star-click');
+			}
 		});
 	}
 });
\ No newline at end of file

From cd3923b8255a203c66c00783ab19d5369bece9ce Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Wed, 27 Mar 2019 18:33:51 +0530
Subject: [PATCH 129/256] fix: add inline filter format

---
 frappe/public/js/frappe/form/controls/base_input.js | 2 +-
 frappe/public/js/frappe/form/formatters.js          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/base_input.js b/frappe/public/js/frappe/form/controls/base_input.js
index e82690de30..9223aad630 100644
--- a/frappe/public/js/frappe/form/controls/base_input.js
+++ b/frappe/public/js/frappe/form/controls/base_input.js
@@ -178,4 +178,4 @@ frappe.ui.form.ControlInput = frappe.ui.form.Control.extend({
 			$(this.disp_area).toggleClass("bold", !!(this.df.bold || this.df.reqd));
 		}
 	}
-});
+});
\ No newline at end of file
diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index 23f9b932dc..66ba0afdba 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -52,13 +52,13 @@ frappe.form.formatters = {
 	Percent: function(value, docfield, options) {
 		return frappe.form.formatters._right(flt(value, 2) + "%", options)
 	},
-	Rating: function(value, docfield, options) {
+	Rating: function(value) {
 		return `
-			<div class="rating">
+			<span class="rating">
 				${Array.from(new Array(5)).map((_, i) =>
 					`<i class="fa fa-fw fa-star ${i < (value || 0) ? "star-click": "" } star-icon" data-idx="${(i+1)}"></i>`
 				).join('')}
-			</div>
+			</span>
 		`;
 	},
 	Currency: function (value, docfield, options, doc) {

From a43d89db8202649b386a8f04309bbe3383a66b21 Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Tue, 19 Mar 2019 15:09:56 +0530
Subject: [PATCH 130/256] fix: Improvements to "Assigned To" dropdown

---
 frappe/desk/listview.py                       | 14 +++++++----
 .../public/js/frappe/list/list_sidebar.html   |  6 ++++-
 frappe/public/js/frappe/list/list_sidebar.js  | 23 +++++++++++++------
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/frappe/desk/listview.py b/frappe/desk/listview.py
index a05a3e7f04..d4f0d1f04a 100644
--- a/frappe/desk/listview.py
+++ b/frappe/desk/listview.py
@@ -26,8 +26,14 @@ def set_list_settings(doctype, values):
 	doc.save()
 
 @frappe.whitelist()
-def get_user_assignments_and_count():
-	user_list = frappe.get_list("User", filters={"user_type": "System User"})
-	assignment_data = sorted([{"count":frappe.db.count('ToDo', filters = {'reference_type': 'Issue', 'owner': user['name'], 'status': 'Open'}),
+def get_user_assignments_and_count(doctype, current_filters):
+	filtered_list = frappe.get_all(doctype,
+		filters=current_filters)
+	names = list(map(lambda x: x.name, filtered_list))
+	user_list = frappe.get_all("User", filters={"user_type": "System User"})
+	if names:
+		assignment_data = sorted([{"count":frappe.db.count('ToDo', filters = {'owner': user['name'], 'status': 'Open', 'reference_name': ('in', names)}),
 						"name": user['name']} for user in user_list], key=lambda k: k['count'], reverse = True)
-	return assignment_data
\ No newline at end of file
+		return assignment_data
+	else: 
+		return []
\ No newline at end of file
diff --git a/frappe/public/js/frappe/list/list_sidebar.html b/frappe/public/js/frappe/list/list_sidebar.html
index 619fa66277..8cb7c1e0c0 100644
--- a/frappe/public/js/frappe/list/list_sidebar.html
+++ b/frappe/public/js/frappe/list/list_sidebar.html
@@ -45,11 +45,15 @@
 			</ul>
 		</div>
 	</li>
-	<li class="assigned-to">
+	<li class="assigned-to" style="display: none">
 		<a class = "dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 			{%= __("Assigned To") %} <span class="caret"></span>
 		</a>
 		<ul class="dropdown-menu assigned-dropdown" style="max-height: 300px; overflow-y: auto;">
+			<li><div class="list-loading text-center assigned-loading" style="color: #8d99a6">
+				{%= (__("Loading") + "..." ) %}
+			</div>
+			</li>
 		</ul>
 	</li>
 	{% if(frappe.help.has_help(doctype)) { %}
diff --git a/frappe/public/js/frappe/list/list_sidebar.js b/frappe/public/js/frappe/list/list_sidebar.js
index 9f5ebfb2a7..7f280a38a2 100644
--- a/frappe/public/js/frappe/list/list_sidebar.js
+++ b/frappe/public/js/frappe/list/list_sidebar.js
@@ -26,7 +26,6 @@ frappe.views.ListSidebar = class ListSidebar {
 
 		this.setup_reports();
 		this.setup_list_filter();
-		this.setup_assigned_to();
 		this.setup_views();
 		this.setup_kanban_boards();
 		this.setup_calendar_view();
@@ -37,6 +36,14 @@ frappe.views.ListSidebar = class ListSidebar {
 		if (limits.upgrade_url && limits.expiry && !frappe.flags.upgrade_dismissed) {
 			this.setup_upgrade_box();
 		}
+
+		if(this.doctype !== 'ToDo') {
+			$('.assigned-to').show();
+		}
+		$('.assigned-to').on('click', () => {
+			this.setup_assigned_to();
+		});
+
 	}
 
 	setup_views() {
@@ -217,14 +224,16 @@ frappe.views.ListSidebar = class ListSidebar {
 	}
 
 	setup_assigned_to() {
+		$('.assigned').remove();
+		$('.assigned-loading').show();
 		let dropdown = this.page.sidebar.find('.assigned-dropdown');
-		if(this.doctype === 'ToDo') {
-			$('.assigned-to').remove();
-		}
-		frappe.call('frappe.desk.listview.get_user_assignments_and_count').then((data) => {
+		let current_filters = this.list_view.get_filters_for_args();
+
+		frappe.call('frappe.desk.listview.get_user_assignments_and_count', {doctype: this.doctype, current_filters: current_filters}).then((data) => {
+			$('.assigned-loading').hide();
 			let current_user_count = data.message.find(user => user.name === frappe.session.user).count;
 			this.get_html_for_assigned(frappe.session.user, current_user_count).appendTo(dropdown);
-			let user_list = data.message.filter(user => !['Guest', frappe.session.user, 'Administrator'].includes(user.name));
+			let user_list = data.message.filter(user => !['Guest', frappe.session.user, 'Administrator'].includes(user.name) && user.count!==0 );
 			user_list.forEach((user) => {
 				this.get_html_for_assigned(user.name, user.count).appendTo(dropdown);
 			});
@@ -239,7 +248,7 @@ frappe.views.ListSidebar = class ListSidebar {
 
 	get_html_for_assigned(name, count) {
 		if (name === frappe.session.user) name='Me';
-		if (count > 99) count='99+';
+		if (count > 50) count='50+';
 		let html = $('<li class="assigned"><a class="badge-hover" role="assigned-item"><span class="assigned-user">' 
 					+ name + '</span><span class="badge pull-right" style="position:relative">' + count + '</span></a></li>');
 		return html;

From 7a81f26780e2949579e1cea0d3babfc80e9a2bf7 Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Mon, 25 Mar 2019 21:22:33 +0530
Subject: [PATCH 131/256] fix: Improve query for assignment count

---
 frappe/desk/listview.py                        | 18 ++++++++++++------
 frappe/public/js/frappe/list/list_sidebar.html |  2 +-
 frappe/public/js/frappe/list/list_sidebar.js   |  7 +++++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/frappe/desk/listview.py b/frappe/desk/listview.py
index d4f0d1f04a..fae3e6d52f 100644
--- a/frappe/desk/listview.py
+++ b/frappe/desk/listview.py
@@ -29,11 +29,17 @@ def set_list_settings(doctype, values):
 def get_user_assignments_and_count(doctype, current_filters):
 	filtered_list = frappe.get_all(doctype,
 		filters=current_filters)
-	names = list(map(lambda x: x.name, filtered_list))
-	user_list = frappe.get_all("User", filters={"user_type": "System User"})
+	names = "'"+"','".join(list(map(lambda x: x.name, filtered_list)))+"'"
+
 	if names:
-		assignment_data = sorted([{"count":frappe.db.count('ToDo', filters = {'owner': user['name'], 'status': 'Open', 'reference_name': ('in', names)}),
-						"name": user['name']} for user in user_list], key=lambda k: k['count'], reverse = True)
-		return assignment_data
-	else: 
+		todo_list = sorted(frappe.db.sql("""select tabToDo.owner as name, count(*) as count from tabToDo, tabUser
+										where
+										tabToDo.status='open' and
+										tabToDo.owner = tabUser.name and
+										tabUser.user_type = 'System User' and
+										tabToDo.reference_name in ({names})
+										group by tabToDo.owner
+										""".format(doctype = doctype, names = names), as_dict=True), key=lambda k: k['count'], reverse = True)
+		return todo_list
+	else:
 		return []
\ No newline at end of file
diff --git a/frappe/public/js/frappe/list/list_sidebar.html b/frappe/public/js/frappe/list/list_sidebar.html
index 8cb7c1e0c0..502968e967 100644
--- a/frappe/public/js/frappe/list/list_sidebar.html
+++ b/frappe/public/js/frappe/list/list_sidebar.html
@@ -50,7 +50,7 @@
 			{%= __("Assigned To") %} <span class="caret"></span>
 		</a>
 		<ul class="dropdown-menu assigned-dropdown" style="max-height: 300px; overflow-y: auto;">
-			<li><div class="list-loading text-center assigned-loading" style="color: #8d99a6">
+			<li><div class="list-loading text-center assigned-loading text-muted">
 				{%= (__("Loading") + "..." ) %}
 			</div>
 			</li>
diff --git a/frappe/public/js/frappe/list/list_sidebar.js b/frappe/public/js/frappe/list/list_sidebar.js
index 7f280a38a2..ab5e052420 100644
--- a/frappe/public/js/frappe/list/list_sidebar.js
+++ b/frappe/public/js/frappe/list/list_sidebar.js
@@ -231,8 +231,11 @@ frappe.views.ListSidebar = class ListSidebar {
 
 		frappe.call('frappe.desk.listview.get_user_assignments_and_count', {doctype: this.doctype, current_filters: current_filters}).then((data) => {
 			$('.assigned-loading').hide();
-			let current_user_count = data.message.find(user => user.name === frappe.session.user).count;
-			this.get_html_for_assigned(frappe.session.user, current_user_count).appendTo(dropdown);
+			let current_user  = data.message.find(user => user.name === frappe.session.user);
+			if(current_user) {
+				let current_user_count = current_user.count;
+				this.get_html_for_assigned(frappe.session.user, current_user_count).appendTo(dropdown);
+			}
 			let user_list = data.message.filter(user => !['Guest', frappe.session.user, 'Administrator'].includes(user.name) && user.count!==0 );
 			user_list.forEach((user) => {
 				this.get_html_for_assigned(user.name, user.count).appendTo(dropdown);

From 8a4bfb142978955d4de236d14fee5144d148c35c Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Tue, 26 Mar 2019 12:06:50 +0530
Subject: [PATCH 132/256] Improve query for assignment count and add test

---
 frappe/desk/listview.py                      | 37 ++++++++------
 frappe/model/db_query.py                     | 10 +++-
 frappe/public/js/frappe/list/list_sidebar.js |  4 +-
 frappe/tests/test_assign.py                  | 52 +++++++++++++++++---
 4 files changed, 78 insertions(+), 25 deletions(-)

diff --git a/frappe/desk/listview.py b/frappe/desk/listview.py
index fae3e6d52f..59d9108730 100644
--- a/frappe/desk/listview.py
+++ b/frappe/desk/listview.py
@@ -27,19 +27,26 @@ def set_list_settings(doctype, values):
 
 @frappe.whitelist()
 def get_user_assignments_and_count(doctype, current_filters):
-	filtered_list = frappe.get_all(doctype,
-		filters=current_filters)
-	names = "'"+"','".join(list(map(lambda x: x.name, filtered_list)))+"'"
 
-	if names:
-		todo_list = sorted(frappe.db.sql("""select tabToDo.owner as name, count(*) as count from tabToDo, tabUser
-										where
-										tabToDo.status='open' and
-										tabToDo.owner = tabUser.name and
-										tabUser.user_type = 'System User' and
-										tabToDo.reference_name in ({names})
-										group by tabToDo.owner
-										""".format(doctype = doctype, names = names), as_dict=True), key=lambda k: k['count'], reverse = True)
-		return todo_list
-	else:
-		return []
\ No newline at end of file
+	subquery_condition = ''
+	if current_filters:
+		# get the subquery
+		subquery = frappe.get_all(doctype,
+			filters=current_filters, return_query = True)
+		subquery_condition = ' and tabToDo.reference_name in ({subquery})'.format(subquery = subquery)
+
+	todo_list = frappe.db.sql("""select tabToDo.owner as name, count(*) as count
+		from
+			tabToDo, tabUser
+		where
+			tabToDo.status='open' and
+			tabToDo.owner = tabUser.name and
+			tabUser.user_type = 'System User' 
+			{subquery_condition}
+		group by
+			tabToDo.owner
+		order by
+			count desc
+		limit 50""".format(subquery_condition = subquery_condition), as_dict=True)
+
+	return todo_list
\ No newline at end of file
diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py
index 9a02bd9f1f..53a1c6c13d 100644
--- a/frappe/model/db_query.py
+++ b/frappe/model/db_query.py
@@ -36,7 +36,7 @@ class DatabaseQuery(object):
 		ignore_permissions=False, user=None, with_comment_count=False,
 		join='left join', distinct=False, start=None, page_length=None, limit=None,
 		ignore_ifnull=False, save_user_settings=False, save_user_settings_fields=False,
-		update=None, add_total_row=None, user_settings=None, reference_doctype=None):
+		update=None, add_total_row=None, user_settings=None, reference_doctype=None, return_query=False):
 		if not ignore_permissions and not frappe.has_permission(self.doctype, "read", user=user):
 			frappe.flags.error_message = _('Insufficient Permission for {0}').format(frappe.bold(self.doctype))
 			raise frappe.PermissionError(self.doctype)
@@ -79,6 +79,7 @@ class DatabaseQuery(object):
 		self.user = user or frappe.session.user
 		self.update = update
 		self.user_settings_fields = copy.deepcopy(self.fields)
+		self.return_query = return_query
 
 		# for contextual user permission check
 		# to determine which user permission is applicable on link field of specific doctype
@@ -91,6 +92,8 @@ class DatabaseQuery(object):
 			result = self.run_custom_query(query)
 		else:
 			result = self.build_and_run()
+			if return_query:
+				return result
 
 		if with_comment_count and not as_list and self.doctype:
 			self.add_comment_count(result)
@@ -115,7 +118,10 @@ class DatabaseQuery(object):
 		query = """select %(fields)s from %(tables)s %(conditions)s
 			%(group_by)s %(order_by)s %(limit)s""" % args
 
-		return frappe.db.sql(query, as_dict=not self.as_list, debug=self.debug, update=self.update)
+		if self.return_query:
+			return query
+		else:
+			return frappe.db.sql(query, as_dict=not self.as_list, debug=self.debug, update=self.update)
 
 	def prepare_args(self):
 		self.parse_args()
diff --git a/frappe/public/js/frappe/list/list_sidebar.js b/frappe/public/js/frappe/list/list_sidebar.js
index ab5e052420..e69726f36e 100644
--- a/frappe/public/js/frappe/list/list_sidebar.js
+++ b/frappe/public/js/frappe/list/list_sidebar.js
@@ -41,6 +41,7 @@ frappe.views.ListSidebar = class ListSidebar {
 			$('.assigned-to').show();
 		}
 		$('.assigned-to').on('click', () => {
+			$('.assigned').remove();
 			this.setup_assigned_to();
 		});
 
@@ -224,7 +225,6 @@ frappe.views.ListSidebar = class ListSidebar {
 	}
 
 	setup_assigned_to() {
-		$('.assigned').remove();
 		$('.assigned-loading').show();
 		let dropdown = this.page.sidebar.find('.assigned-dropdown');
 		let current_filters = this.list_view.get_filters_for_args();
@@ -251,7 +251,7 @@ frappe.views.ListSidebar = class ListSidebar {
 
 	get_html_for_assigned(name, count) {
 		if (name === frappe.session.user) name='Me';
-		if (count > 50) count='50+';
+		if (count > 99) count='99+';
 		let html = $('<li class="assigned"><a class="badge-hover" role="assigned-item"><span class="assigned-user">' 
 					+ name + '</span><span class="badge pull-right" style="position:relative">' + count + '</span></a></li>');
 		return html;
diff --git a/frappe/tests/test_assign.py b/frappe/tests/test_assign.py
index ed47f07dda..247489b0f9 100644
--- a/frappe/tests/test_assign.py
+++ b/frappe/tests/test_assign.py
@@ -4,6 +4,8 @@ from __future__ import unicode_literals
 
 import frappe, unittest
 import frappe.desk.form.assign_to
+from frappe.desk.listview import get_user_assignments_and_count
+from frappe.automation.doctype.assignment_rule.test_assignment_rule import make_note
 
 class TestAssign(unittest.TestCase):
 	def test_assign(self):
@@ -11,12 +13,7 @@ class TestAssign(unittest.TestCase):
 		if not frappe.db.exists("User", "test@example.com"):
 			frappe.get_doc({"doctype":"User", "email":"test@example.com", "first_name":"Test"}).insert()
 
-		added = frappe.desk.form.assign_to.add({
-			"assign_to": "test@example.com",
-			"doctype": todo.doctype,
-			"name": todo.name,
-			"description": todo.description,
-		})
+		added = assign(todo, "test@example.com")
 
 		self.assertTrue("test@example.com" in [d.owner for d in added])
 
@@ -25,3 +22,46 @@ class TestAssign(unittest.TestCase):
 		# assignment is cleared
 		assignments = frappe.desk.form.assign_to.get(dict(doctype = todo.doctype, name=todo.name))
 		self.assertEqual(len(assignments), 0)
+
+	def test_assignment_count(self):
+		frappe.db.sql('delete from tabToDo')
+
+		if not frappe.db.exists("User", "test_assign1@example.com"):
+			frappe.get_doc({"doctype":"User", "email":"test_assign1@example.com", "first_name":"Test", "roles": [{"role": "System Manager"}]}).insert()
+
+		if not frappe.db.exists("User", "test_assign2@example.com"):
+			frappe.get_doc({"doctype":"User", "email":"test_assign2@example.com", "first_name":"Test", "roles": [{"role": "System Manager"}]}).insert()
+
+		note = make_note()
+		assign(note, "test_assign1@example.com")
+
+		note = make_note(dict(public=1))
+		assign(note, "test_assign2@example.com")
+
+		note = make_note(dict(public=1))
+		assign(note, "test_assign2@example.com")
+
+		note = make_note()
+		assign(note, "test_assign2@example.com")
+
+		data = {d.name: d.count for d in get_user_assignments_and_count('Note', [])}
+
+		self.assertTrue('test_assign1@example.com' in data)
+		self.assertEqual(data['test_assign1@example.com'], 1)
+		self.assertEqual(data['test_assign2@example.com'], 3)
+
+		data = {d.name: d.count for d in get_user_assignments_and_count('Note', [{'public': 1}])}
+
+		self.assertFalse('test_assign1@example.com' in data)
+		self.assertEqual(data['test_assign2@example.com'], 2)
+
+		frappe.db.rollback()
+
+
+def assign(doc, user):
+	return frappe.desk.form.assign_to.add({
+		"assign_to": user,
+		"doctype": doc.doctype,
+		"name": doc.name,
+		"description": 'test',
+	})

From 3725ebf7c3fd0ece18abcc7bf3c617a1c01592c8 Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Wed, 27 Mar 2019 22:40:43 +0530
Subject: [PATCH 133/256] fix: Wrap quotes around columns and column names in
 query

---
 frappe/desk/listview.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/frappe/desk/listview.py b/frappe/desk/listview.py
index 59d9108730..745e021efe 100644
--- a/frappe/desk/listview.py
+++ b/frappe/desk/listview.py
@@ -33,18 +33,18 @@ def get_user_assignments_and_count(doctype, current_filters):
 		# get the subquery
 		subquery = frappe.get_all(doctype,
 			filters=current_filters, return_query = True)
-		subquery_condition = ' and tabToDo.reference_name in ({subquery})'.format(subquery = subquery)
+		subquery_condition = ' and `tabToDo`.reference_name in ({subquery})'.format(subquery = subquery)
 
-	todo_list = frappe.db.sql("""select tabToDo.owner as name, count(*) as count
+	todo_list = frappe.db.sql("""select `tabToDo`.owner as name, count(*) as count
 		from
-			tabToDo, tabUser
+			`tabToDo`, `tabUser`
 		where
-			tabToDo.status='open' and
-			tabToDo.owner = tabUser.name and
-			tabUser.user_type = 'System User' 
+			`tabToDo`.status='open' and
+			`tabToDo`.owner = `tabUser`.name and
+			`tabUser`.user_type = 'System User' 
 			{subquery_condition}
 		group by
-			tabToDo.owner
+			`tabToDo`.owner
 		order by
 			count desc
 		limit 50""".format(subquery_condition = subquery_condition), as_dict=True)

From eff958da5254105bd74a07c899c0a88bdce18ad8 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 27 Mar 2019 23:54:14 +0530
Subject: [PATCH 134/256] perf: Index frequently queried fields in Energy Point
 Log

---
 .../doctype/energy_point_log/energy_point_log.json  | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.json b/frappe/social/doctype/energy_point_log/energy_point_log.json
index 32e6938b0c..aa5d5946cf 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.json
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.json
@@ -42,7 +42,7 @@
    "remember_last_selected_value": 0,
    "report_hide": 0,
    "reqd": 0,
-   "search_index": 0,
+   "search_index": 1,
    "set_only_once": 0,
    "translatable": 0,
    "unique": 0
@@ -76,7 +76,7 @@
    "remember_last_selected_value": 0,
    "report_hide": 0,
    "reqd": 0,
-   "search_index": 0,
+   "search_index": 1,
    "set_only_once": 0,
    "translatable": 0,
    "unique": 0
@@ -144,7 +144,7 @@
    "remember_last_selected_value": 0,
    "report_hide": 0,
    "reqd": 0,
-   "search_index": 0,
+   "search_index": 1,
    "set_only_once": 0,
    "translatable": 0,
    "unique": 0
@@ -178,7 +178,7 @@
    "remember_last_selected_value": 0,
    "report_hide": 0,
    "reqd": 0,
-   "search_index": 0,
+   "search_index": 1,
    "set_only_once": 0,
    "translatable": 0,
    "unique": 0
@@ -251,17 +251,15 @@
   }
  ],
  "has_web_view": 0,
- "hide_heading": 0,
  "hide_toolbar": 0,
  "idx": 0,
- "image_view": 0,
  "in_create": 1,
  "is_submittable": 0,
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
  "menu_index": 0,
- "modified": "2019-03-19 17:32:50.497762",
+ "modified": "2019-03-27 23:49:54.841493",
  "modified_by": "Administrator",
  "module": "Social",
  "name": "Energy Point Log",
@@ -290,7 +288,6 @@
  ],
  "quick_entry": 0,
  "read_only": 1,
- "read_only_onload": 0,
  "show_name_in_global_search": 0,
  "sort_field": "modified",
  "sort_order": "DESC",

From 843d6cc69a55f7590b1ce2d7a09547bfe102fac9 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 27 Mar 2019 23:57:39 +0530
Subject: [PATCH 135/256] test: fix code to get energy_point from points dict

---
 .../social/doctype/energy_point_log/test_energy_point_log.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frappe/social/doctype/energy_point_log/test_energy_point_log.py b/frappe/social/doctype/energy_point_log/test_energy_point_log.py
index 465c2cd360..f1482bce52 100644
--- a/frappe/social/doctype/energy_point_log/test_energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/test_energy_point_log.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
 
 import frappe
 import unittest
-from .energy_point_log import get_energy_points
+from .energy_point_log import get_energy_points as _get_energy_points
 from frappe.utils.testutils import add_custom_field, clear_custom_fields
 
 class TestEnergyPointLog(unittest.TestCase):
@@ -102,4 +102,5 @@ def create_a_todo():
 	}).insert()
 
 
-# test for multiplier
+def get_energy_points(user):
+	return _get_energy_points(user).energy_points or 0
\ No newline at end of file

From 355b8e386868d9c09e7f9af14b9df3f4e2748782 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 27 Mar 2019 23:58:44 +0530
Subject: [PATCH 136/256] fix: Comment out caching code to fix test

- Remove debug flag
---
 .../social/doctype/energy_point_log/energy_point_log.py   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index c71959b74d..71585678dd 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -64,8 +64,10 @@ def create_review_points_log(user, points, reason=None):
 
 @frappe.whitelist()
 def get_energy_points(user):
-	points = frappe.cache().hget('energy_points', user,
-		lambda: get_user_energy_and_review_points(user))
+	# points = frappe.cache().hget('energy_points', user,
+	# 	lambda: get_user_energy_and_review_points(user))
+	# TODO: cache properly
+	points = get_user_energy_and_review_points(user)
 	return frappe._dict(points.get(user, {}))
 
 @frappe.whitelist()
@@ -84,7 +86,7 @@ def get_user_energy_and_review_points(user=None):
 		FROM `tabEnergy Point Log`
 		{where_user}
 		GROUP BY `user`
-	""".format(where_user=where_user), values=[user] if user else (), debug=1, as_dict=1)
+	""".format(where_user=where_user), values=user or (), as_dict=1)
 
 	dict_to_return = frappe._dict()
 	for d in points_list:

From e6c6aeb98ee3c257f42691c03ee0fd1724b5f005 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 28 Mar 2019 00:55:58 +0530
Subject: [PATCH 137/256] style: change rating formatter

---
 cypress/integration/control_rating.js           |  8 ++++----
 frappe/public/js/frappe/form/controls/rating.js | 11 +++++------
 frappe/public/js/frappe/form/formatters.js      | 12 +++++-------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/cypress/integration/control_rating.js b/cypress/integration/control_rating.js
index 62ddbe3e36..463807f143 100644
--- a/cypress/integration/control_rating.js
+++ b/cypress/integration/control_rating.js
@@ -4,7 +4,7 @@ context('Rating Control', () => {
 	});
 
 	it('click on the star rating to record value', () => {
-		cy.visit('/desk')
+		cy.visit('/desk');
 		cy.dialog('Rating', {
 			'fieldname': 'rate',
 			'fieldtype': 'Rating',
@@ -18,15 +18,15 @@ context('Rating Control', () => {
 		cy.get('@dialog').then(dialog => {
 			var value = dialog.get_value('rate');
 			expect(value).to.equal(1);
-		})
+		});
 	});
 
 	it('hover on the star', () => {
-		cy.visit('/desk')
+		cy.visit('/desk');
 		cy.dialog('Rating', {
 			'fieldname': 'rate',
 			'fieldtype': 'Rating',
-		})
+		});
 		cy.get('div.rating')
 			.children('i.fa')
 			.first()
diff --git a/frappe/public/js/frappe/form/controls/rating.js b/frappe/public/js/frappe/form/controls/rating.js
index b9f4df0687..844e932665 100644
--- a/frappe/public/js/frappe/form/controls/rating.js
+++ b/frappe/public/js/frappe/form/controls/rating.js
@@ -24,10 +24,10 @@ frappe.ui.form.ControlRating  = frappe.ui.form.ControlInt.extend({
 				}
 			});
 		}, (ev) => {
-				const el = $(ev.currentTarget);
-				el.parent().children('i.fa').each( function() {
-					$(this).removeClass('star-hover');
-				});
+			const el = $(ev.currentTarget);
+			el.parent().children('i.fa').each( function() {
+				$(this).removeClass('star-hover');
+			});
 		});
 
 		$(this.input_area).find('i').click((ev) => {
@@ -54,8 +54,7 @@ frappe.ui.form.ControlRating  = frappe.ui.form.ControlInt.extend({
 		el.children('i.fa').prevObject.each( function(e) {
 			if (e < value) {
 				$(this).addClass('star-click');
-			}
-			else {
+			} else {
 				$(this).removeClass('star-click');
 			}
 		});
diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index 66ba0afdba..c8afb6466a 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -53,13 +53,11 @@ frappe.form.formatters = {
 		return frappe.form.formatters._right(flt(value, 2) + "%", options)
 	},
 	Rating: function(value) {
-		return `
-			<span class="rating">
-				${Array.from(new Array(5)).map((_, i) =>
-					`<i class="fa fa-fw fa-star ${i < (value || 0) ? "star-click": "" } star-icon" data-idx="${(i+1)}"></i>`
-				).join('')}
-			</span>
-		`;
+		return `<span class="rating">
+	${Array.from(new Array(5)).map((_, i) =>
+		`<i class="fa fa-fw fa-star ${i < (value || 0) ? "star-click": "" } star-icon" data-idx="${(i+1)}"></i>`
+	).join('')}
+		</span>`;
 	},
 	Currency: function (value, docfield, options, doc) {
 		var currency  = frappe.meta.get_field_currency(docfield, doc);

From 9ef406bf31fdf217418972c401567c8e2b1fca84 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 28 Mar 2019 07:38:11 +0530
Subject: [PATCH 138/256] test: Reset current user as admin in teardown

---
 frappe/social/doctype/energy_point_log/test_energy_point_log.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/social/doctype/energy_point_log/test_energy_point_log.py b/frappe/social/doctype/energy_point_log/test_energy_point_log.py
index f1482bce52..720ef4cfb9 100644
--- a/frappe/social/doctype/energy_point_log/test_energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/test_energy_point_log.py
@@ -10,6 +10,7 @@ from frappe.utils.testutils import add_custom_field, clear_custom_fields
 
 class TestEnergyPointLog(unittest.TestCase):
 	def tearDown(self):
+		frappe.set_user('Administrator')
 		frappe.db.sql('DELETE FROM `tabEnergy Point Log`')
 		frappe.db.sql('DELETE FROM `tabEnergy Point Rule`')
 

From 56dfe365edfc0dc6e93ca34717d23032ae16a185 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 28 Mar 2019 10:27:50 +0530
Subject: [PATCH 139/256] fix: Add missing is_column_missing method (#7150)

---
 frappe/database/database.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frappe/database/database.py b/frappe/database/database.py
index c9b184cbd1..d3b44913fc 100644
--- a/frappe/database/database.py
+++ b/frappe/database/database.py
@@ -879,6 +879,10 @@ class Database(object):
 		# implemented in specific class
 		pass
 
+	@staticmethod
+	def is_column_missing(e):
+		return frappe.db.is_missing_column(e)
+
 	def get_descendants(self, doctype, name):
 		'''Return descendants of the current record'''
 		node_location_indexes = self.get_value(doctype, name, ('lft', 'rgt'))

From 091b7c0ad1c5171e3a99c9d11ebe8be6442ff6a1 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 28 Mar 2019 10:35:36 +0530
Subject: [PATCH 140/256] feat: Improve alert message

- Add document link
- Separate get_alert_message code
---
 .../energy_point_log/energy_point_log.py      | 41 +++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index 71585678dd..171a34c954 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -7,7 +7,7 @@ import frappe
 from frappe import _
 import json
 from frappe.model.document import Document
-from frappe.utils import cint
+from frappe.utils import cint, get_fullname
 
 class EnergyPointLog(Document):
 	def validate(self):
@@ -15,26 +15,33 @@ class EnergyPointLog(Document):
 			frappe.throw(_('You cannot give review points to yourself'))
 
 	def after_insert(self):
-		message = ''
-		if self.type == 'Auto':
-			message=_('You gained <b>{}</b> points').format(self.points)
-		elif self.type == 'Appreciation':
-			message = _('{} appreciated your work on {} with {} points'.format(
-				self.owner,
-				self.reference_name,
-				self.points
-			))
-		elif self.type == 'Criticism':
-			message = _('{} criticized your work on {} with {} points'.format(
-				self.owner,
-				self.reference_name,
-				self.points
-			))
+		message = get_alert_message(self)
 		if message:
-			frappe.publish_realtime('energy_point_alert', message=message , user=self.user)
+			frappe.publish_realtime('energy_point_alert', message=message, user=self.user)
 
 		frappe.cache().hdel('energy_points', self.user)
 
+def get_alert_message(doc):
+	message = ''
+	owner_name = get_fullname(doc.owner)
+	doc_link = frappe.get_desk_link(doc.reference_doctype, doc.reference_name)
+	points = frappe.bold(doc.points)
+	if doc.type == 'Auto':
+		message=_('You gained {} points').format(points)
+	elif doc.type == 'Appreciation':
+		message = _('{} appreciated your work on {} with {} points'.format(
+			owner_name,
+			doc_link,
+			points
+		))
+	elif doc.type == 'Criticism':
+		message = _('{} criticized your work on {} with {} points'.format(
+			owner_name,
+			doc_link,
+			points
+		))
+	return message
+
 def create_energy_points_log(ref_doctype, ref_name, doc):
 	doc = frappe._dict(doc)
 	log_exists = frappe.db.exists('Energy Point Log', {

From 207749c3da4527d070a3720240e509aeae73b74a Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 28 Mar 2019 10:41:42 +0530
Subject: [PATCH 141/256] fix: Default for user selection in Review Dialog

- Fix message
---
 frappe/public/js/frappe/form/review.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/frappe/public/js/frappe/form/review.js b/frappe/public/js/frappe/form/review.js
index 27c1452c29..966ff975d8 100644
--- a/frappe/public/js/frappe/form/review.js
+++ b/frappe/public/js/frappe/form/review.js
@@ -65,14 +65,16 @@ frappe.ui.form.Review = class Review {
 			.filter(Boolean);
 	}
 	show() {
+		const user_options = this.get_involved_users();
+		const doc_owner = this.frm.doc.owner;
 		const review_dialog = new frappe.ui.Dialog({
 			'title': __('Add Review'),
 			'fields': [{
 				fieldname: 'to_user',
-				fieldtype: 'Autocomplete',
+				fieldtype: 'Select',
 				label: __('To User'),
-				options: this.get_involved_users(),
-				default: this.frm.doc.owner
+				options: user_options,
+				default: user_options.includes(doc_owner) ? doc_owner : user_options[0]
 			}, {
 				fieldname: 'review_type',
 				fieldtype: 'Select',
@@ -142,20 +144,20 @@ frappe.ui.form.Review = class Review {
 	}
 	setup_detail_popover(el, data) {
 		let subject = '';
-		let fullname = frappe.user_info(data.user).fullname;
+		let fullname = frappe.user.full_name(data.user);
 		let timestamp = `<span class="text-muted">${frappe.datetime.comment_when(data.creation)}</span>`;
 		let message_parts = [Math.abs(data.points), fullname, timestamp];
 		if (data.type === 'Appreciation') {
 			if (data.points == 1) {
-				subject = __('{0} appreciation point to {1} {2}', message_parts);
+				subject = __('{0} appreciation point for {1} {2}', message_parts);
 			} else {
-				subject = __('{0} appreciation points to {1} {2}', message_parts);
+				subject = __('{0} appreciation points for {1} {2}', message_parts);
 			}
 		} else {
 			if (data.points == -1) {
-				subject = __('{0} criticism point to {1} {2}', message_parts);
+				subject = __('{0} criticism point for {1} {2}', message_parts);
 			} else {
-				subject = __('{0} criticism points to {1} {2}', message_parts);
+				subject = __('{0} criticism points for {1} {2}', message_parts);
 			}
 		}
 		el.popover({

From b4bea4e09b27d5585e8927f69479d1c2462f8c5f Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 28 Mar 2019 10:44:20 +0530
Subject: [PATCH 142/256] feat: Add description for user field of review dialog

---
 frappe/public/js/frappe/form/review.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/review.js b/frappe/public/js/frappe/form/review.js
index 966ff975d8..fc646c5209 100644
--- a/frappe/public/js/frappe/form/review.js
+++ b/frappe/public/js/frappe/form/review.js
@@ -74,7 +74,8 @@ frappe.ui.form.Review = class Review {
 				fieldtype: 'Select',
 				label: __('To User'),
 				options: user_options,
-				default: user_options.includes(doc_owner) ? doc_owner : user_options[0]
+				default: user_options.includes(doc_owner) ? doc_owner : user_options[0],
+				description: __('Only users involved in the document are listed')
 			}, {
 				fieldname: 'review_type',
 				fieldtype: 'Select',

From 3a60bc79ce76e59f02eab0f80978d7ff188a6577 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 28 Mar 2019 11:38:33 +0530
Subject: [PATCH 143/256] fix: Use local copy of socketio

---
 frappe/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/templates/base.html b/frappe/templates/base.html
index 9c68254e2f..44ff873656 100644
--- a/frappe/templates/base.html
+++ b/frappe/templates/base.html
@@ -80,7 +80,7 @@
 	<!-- js should be loaded in body! -->
 	<script type="text/javascript"
 		src="/assets/frappe/js/lib/jquery/jquery.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.0.4/socket.io.slim.js"></script>
+	<script src="/assets/frappe/js/lib/socket.io.min.js"></script>
 	<script type="text/javascript"
 		src="/assets/js/frappe-web.min.js"></script>
 	<script type="text/javascript"

From 664bc680bd004fdb4846852209ed5519ad07811f Mon Sep 17 00:00:00 2001
From: Kenneth Sequeira <33246109+kennethsequeira@users.noreply.github.com>
Date: Thu, 28 Mar 2019 11:44:19 +0530
Subject: [PATCH 144/256] fix: Add Currency Yemeni Rial (#7131)

Closes issue https://github.com/frappe/erpnext/issues/16956
---
 frappe/geo/country_info.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/geo/country_info.json b/frappe/geo/country_info.json
index ae0a8d8b59..a3f039ca17 100644
--- a/frappe/geo/country_info.json
+++ b/frappe/geo/country_info.json
@@ -2690,8 +2690,11 @@
  },
  "Yemen": {
   "code": "ye",
+  "currency": "YER",
   "currency_fraction": "Fils",
   "currency_fraction_units": 100,
+  "smallest_currency_fraction_value": 0.01,
+  "currency_name": "Yemeni Rial",
   "currency_symbol": "\ufdfc",
   "number_format": "#,###.##",
   "timezones": [

From 73c1f531e8b31aacd6242d9b4f7e2415074d7498 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 28 Mar 2019 11:46:51 +0530
Subject: [PATCH 145/256] fix: Set default only if the dependent field is set
 (#7130)

Client side fix
https://github.com/frappe/frappe/pull/7004
---
 frappe/model/create_new.py    | 17 +++++++++++++----
 frappe/tests/test_document.py | 18 ++++++++++++++++++
 frappe/utils/testutils.py     |  6 ++++--
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/frappe/model/create_new.py b/frappe/model/create_new.py
index b48f279a5e..8bb1356bd9 100644
--- a/frappe/model/create_new.py
+++ b/frappe/model/create_new.py
@@ -60,15 +60,24 @@ def set_user_and_static_default_values(doc):
 			allowed_records = get_allowed_docs_for_doctype(doctype_user_permissions, df.parent)
 
 			user_default_value = get_user_default_value(df, defaults, doctype_user_permissions, allowed_records)
-			if user_default_value is not None:
-				doc.set(df.fieldname, user_default_value)
-
+			if user_default_value != None:
+				# do not set default if the field on which current field is dependent is not set
+				if is_dependent_field_set(df.depends_on, doc):
+					doc.set(df.fieldname, user_default_value)
 			else:
 				if df.fieldname != doc.meta.title_field:
 					static_default_value = get_static_default_value(df, doctype_user_permissions, allowed_records)
-					if static_default_value is not None:
+					if static_default_value != None and is_dependent_field_set(df.depends_on, doc):
 						doc.set(df.fieldname, static_default_value)
 
+
+def is_dependent_field_set(fieldname, doc):
+	value_dict = doc.as_dict()
+	if not fieldname: return True
+	# to check if fieldname passed is valid
+	if fieldname not in value_dict: return True
+	return value_dict[fieldname]
+
 def get_user_default_value(df, defaults, doctype_user_permissions, allowed_records):
 	# don't set defaults for "User" link field using User Permissions!
 	if df.fieldtype == "Link" and df.options != "User":
diff --git a/frappe/tests/test_document.py b/frappe/tests/test_document.py
index f261641567..180e1b0307 100644
--- a/frappe/tests/test_document.py
+++ b/frappe/tests/test_document.py
@@ -5,6 +5,7 @@ from __future__ import unicode_literals
 import frappe, unittest, os
 from frappe.utils import cint
 from frappe.model.naming import revert_series_if_last, make_autoname, parse_naming_series
+from frappe.utils.testutils import add_custom_field, clear_custom_fields
 
 class TestDocument(unittest.TestCase):
 	def test_get_return_empty_list_for_table_field_if_none(self):
@@ -235,3 +236,20 @@ class TestDocument(unittest.TestCase):
 			new_current = cint(frappe.db.get_value('Series', prefix, "current", order_by="name"))
 
 			self.assertEqual(cint(old_current) - 1, new_current)
+
+	def test_default_of_dependent_field(self):
+		add_custom_field('ToDo', 'parent_field', 'Data')
+
+		add_custom_field('ToDo', 'dependent_field', 'Data',
+			default='Some Data', depends_on='parent_field')
+
+		add_custom_field('ToDo', 'independent_field', 'Data',
+			default='Some Data')
+
+
+		doc = frappe.new_doc('ToDo')
+
+		self.assertFalse(doc.get('dependent_field'))
+		self.assertEqual(doc.get('independent_field'), 'Some Data')
+
+		clear_custom_fields('ToDo')
\ No newline at end of file
diff --git a/frappe/utils/testutils.py b/frappe/utils/testutils.py
index 4af3ad647c..e47cf3d90f 100644
--- a/frappe/utils/testutils.py
+++ b/frappe/utils/testutils.py
@@ -4,13 +4,15 @@ from __future__ import unicode_literals
 
 import frappe
 
-def add_custom_field(doctype, fieldname, fieldtype='Data', options=None):
+def add_custom_field(doctype, fieldname, fieldtype='Data', options=None, default=None, depends_on=None):
 	frappe.get_doc({
 		"doctype": "Custom Field",
 		"dt": doctype,
 		"fieldname": fieldname,
 		"fieldtype": fieldtype,
-		"options": options
+		"options": options,
+		"default": default,
+		"depends_on": depends_on
 	}).insert()
 
 def clear_custom_fields(doctype):

From 49b6b81a0f0fdfee874b180fd3e8f36e0e47a8eb Mon Sep 17 00:00:00 2001
From: Raffael Meyer <meyer.raffael@gmail.com>
Date: Thu, 28 Mar 2019 07:18:57 +0100
Subject: [PATCH 146/256] fix(integrations): complete file-api migration
 (#7132)

---
 .../gsuite_templates/gsuite_templates.py       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/frappe/integrations/doctype/gsuite_templates/gsuite_templates.py b/frappe/integrations/doctype/gsuite_templates/gsuite_templates.py
index 83f379ee29..ad9f8145de 100644
--- a/frappe/integrations/doctype/gsuite_templates/gsuite_templates.py
+++ b/frappe/integrations/doctype/gsuite_templates/gsuite_templates.py
@@ -22,11 +22,11 @@ def create_gsuite_doc(doctype, docname, gs_template=None):
 	json_data = doc.as_dict()
 	filename = templ.document_name.format(**json_data)
 
-	r = run_gsuite_script('new', filename, templ.template_id, templ.destination_id, json_data)
+	response = run_gsuite_script('new', filename, templ.template_id, templ.destination_id, json_data)
 
 	_file = frappe.get_doc({
 		"doctype": "File",
-		"file_url": r['url'],
+		"file_url": response['url'],
 		"file_name": filename,
 		"attached_to_doctype": doctype,
 		"attached_to_name": docname,
@@ -36,15 +36,15 @@ def create_gsuite_doc(doctype, docname, gs_template=None):
 
 	comment = frappe.get_doc(doctype, docname).add_comment("Attachment",
 		_("added {0}").format("<a href='{file_url}' target='_blank'>{file_name}</a>{icon}".format(**{
-			"icon": ' <i class="fa fa-lock text-warning"></i>' if filedata.is_private else "",
-			"file_url": filedata.file_url.replace("#", "%23") if filedata.file_name else filedata.file_url,
-			"file_name": filedata.file_name or filedata.file_url
+			"icon": ' <i class="fa fa-lock text-warning"></i>' if _file.is_private else "",
+			"file_url": _file.file_url.replace("#", "%23") if _file.file_name else _file.file_url,
+			"file_name": _file.file_name or _file.file_url
 		})))
 
 	return {
-		"name": filedata.name,
-		"file_name": filedata.file_name,
-		"file_url": filedata.file_url,
-		"is_private": filedata.is_private,
+		"name": _file.name,
+		"file_name": _file.file_name,
+		"file_url": _file.file_url,
+		"is_private": _file.is_private,
 		"comment": comment.as_dict() if comment else {}
 		}

From 4da80bae914d6e6b07b1ebc3e292d7934a0f790f Mon Sep 17 00:00:00 2001
From: Himanshu Mishra <sigmablazer@gmail.com>
Date: Thu, 28 Mar 2019 11:57:15 +0530
Subject: [PATCH 147/256] fix: doctype passed but not used (#7112)

---
 frappe/model/naming.py      | 4 ++--
 frappe/tests/test_naming.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/model/naming.py b/frappe/model/naming.py
index f38758ca9c..43c11da01d 100644
--- a/frappe/model/naming.py
+++ b/frappe/model/naming.py
@@ -129,7 +129,7 @@ def parse_naming_series(parts, doctype='', doc=''):
 		if e.startswith('#'):
 			if not series_set:
 				digits = len(e)
-				part = getseries(n, digits, doctype)
+				part = getseries(n, digits)
 				series_set = True
 		elif e == 'YY':
 			part = today.strftime('%y')
@@ -152,7 +152,7 @@ def parse_naming_series(parts, doctype='', doc=''):
 	return n
 
 
-def getseries(key, digits, doctype=''):
+def getseries(key, digits):
 	# series created ?
 	current = frappe.db.sql("SELECT `current` FROM `tabSeries` WHERE `name`=%s FOR UPDATE", (key,))
 	if current and current[0][0] is not None:
diff --git a/frappe/tests/test_naming.py b/frappe/tests/test_naming.py
index 1b1f0ac98c..90ab6a6a94 100644
--- a/frappe/tests/test_naming.py
+++ b/frappe/tests/test_naming.py
@@ -51,7 +51,7 @@ class TestNaming(unittest.TestCase):
 		todo.description = description
 		todo.insert()
 
-		series = getseries('', 2, doctype)
+		series = getseries('', 2)
 
 		series = str(int(series)-1)
 
@@ -93,4 +93,4 @@ class TestNaming(unittest.TestCase):
 		count = frappe.db.sql("""SELECT current from `tabSeries` where name = %s""", series, as_dict=True)[0]
 
 		self.assertEqual(count.get('current'), 2)
-		frappe.db.sql("""delete from `tabSeries` where name = %s""", series)
\ No newline at end of file
+		frappe.db.sql("""delete from `tabSeries` where name = %s""", series)

From b5d1a3aa1867b004a9ca7d049a96fba789de8525 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 28 Mar 2019 12:05:31 +0530
Subject: [PATCH 148/256] fix: pass fields as array in cypress dialog

---
 cypress/integration/control_rating.js | 8 ++++----
 cypress/support/commands.js           | 4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/cypress/integration/control_rating.js b/cypress/integration/control_rating.js
index 463807f143..a367a82273 100644
--- a/cypress/integration/control_rating.js
+++ b/cypress/integration/control_rating.js
@@ -5,10 +5,10 @@ context('Rating Control', () => {
 
 	it('click on the star rating to record value', () => {
 		cy.visit('/desk');
-		cy.dialog('Rating', {
+		cy.dialog('Rating', [{
 			'fieldname': 'rate',
 			'fieldtype': 'Rating',
-		}).as('dialog');
+		}]).as('dialog');
 
 		cy.get('div.rating')
 			.children('i.fa')
@@ -23,10 +23,10 @@ context('Rating Control', () => {
 
 	it('hover on the star', () => {
 		cy.visit('/desk');
-		cy.dialog('Rating', {
+		cy.dialog('Rating', [{
 			'fieldname': 'rate',
 			'fieldtype': 'Rating',
-		});
+		}]);
 		cy.get('div.rating')
 			.children('i.fa')
 			.first()
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index ed81c182a6..8c2156e9f4 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -66,9 +66,7 @@ Cypress.Commands.add('dialog', (title, fields) => {
 	cy.window().then(win => {
 		var d = new win.frappe.ui.Dialog({
 			title: title,
-			fields: [
-				fields
-			],
+			fields: fields,
 			primary_action: function(){
 				d.hide();
 			}

From 015ba0417c90084a865534ec48dacb1650f4f227 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 28 Mar 2019 12:37:48 +0530
Subject: [PATCH 149/256] feat: Add leaderboard link to desktop

---
 frappe/config/desktop.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/frappe/config/desktop.py b/frappe/config/desktop.py
index 628c531e70..7e309fb0df 100644
--- a/frappe/config/desktop.py
+++ b/frappe/config/desktop.py
@@ -99,4 +99,15 @@ def get_data():
 			'idx': 15,
 			"description": "Build your profile and share posts with other users."
 		},
+		{
+			"module_name": 'leaderboard',
+			"category": "Places",
+			"label": _('Leaderboard'),
+			"icon": "octicon octicon-list-ordered",
+			"type": "link",
+			"link": "#social/users",
+			"color": '#FF4136',
+			'standard': 1,
+			'idx': 16
+		},
 	]

From bfb96d7639928a607904ac660a6812adf40f9f20 Mon Sep 17 00:00:00 2001
From: Sahil Khan <sahil@erpnext.com>
Date: Thu, 28 Mar 2019 13:42:14 +0550
Subject: [PATCH 150/256] bumped to version 11.1.17

---
 frappe/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index d9b3b8d7b5..7238cc6d47 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -24,7 +24,7 @@ if sys.version[0] == '2':
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '11.1.16'
+__version__ = '11.1.17'
 __title__ = "Frappe Framework"
 
 local = Local()

From 70246946b2835a8c526e44fdd2d4d53b97e3ad76 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 28 Mar 2019 15:05:23 +0530
Subject: [PATCH 151/256] fix: Dont escape tracebacks in errprint

---
 frappe/__init__.py    | 3 +--
 frappe/utils/jinja.py | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 7238cc6d47..c1bf81ab52 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -274,8 +274,7 @@ def errprint(msg):
 	if not request or (not "cmd" in local.form_dict) or conf.developer_mode:
 		print(msg.encode('utf-8'))
 
-	from .utils import escape_html
-	error_log.append({"exc": escape_html(msg), "locals": get_frame_locals()})
+	error_log.append({"exc": msg, "locals": get_frame_locals()})
 
 def log(msg):
 	"""Add to `debug_log`.
diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py
index b8a41e53cc..abc788e9ed 100644
--- a/frappe/utils/jinja.py
+++ b/frappe/utils/jinja.py
@@ -60,7 +60,6 @@ def render_template(template, context, is_path=None, safe_render=True):
 	'''
 
 	from frappe import get_traceback, throw
-	from frappe.utils import escape_html
 	from jinja2 import TemplateError
 
 	if not template:
@@ -77,7 +76,7 @@ def render_template(template, context, is_path=None, safe_render=True):
 		try:
 			return get_jenv().from_string(template).render(context)
 		except TemplateError:
-			throw(title="Jinja Template Error", msg="<pre>{template}</pre><pre>{tb}</pre>".format(template=template, tb=escape_html(get_traceback())))
+			throw(title="Jinja Template Error", msg="<pre>{template}</pre><pre>{tb}</pre>".format(template=template, tb=get_traceback()))
 
 
 def get_allowed_functions_for_jenv():

From 6958c46d6ed55fa98654a5e8f8f5253ab6f6589d Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 28 Mar 2019 17:21:38 +0530
Subject: [PATCH 152/256] chore: Add print statements to check the reason for
 test failure

---
 frappe/social/doctype/energy_point_log/energy_point_log.py   | 1 +
 frappe/social/doctype/energy_point_rule/energy_point_rule.py | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index 171a34c954..a24f05bea3 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -44,6 +44,7 @@ def get_alert_message(doc):
 
 def create_energy_points_log(ref_doctype, ref_name, doc):
 	doc = frappe._dict(doc)
+	print('apply', ref_doctype, ref_name, doc.user, doc.rule)
 	log_exists = frappe.db.exists('Energy Point Log', {
 		'user': doc.user,
 		'rule': doc.rule,
diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
index 1268694667..d6a76c1009 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
@@ -10,6 +10,7 @@ from frappe.social.doctype.energy_point_log.energy_point_log import create_energ
 
 class EnergyPointRule(Document):
 	def apply(self, doc):
+		print('apply', doc.as_dict().name)
 		if frappe.safe_eval(self.condition, None, {'doc': doc.as_dict()}):
 			multiplier = 1
 
@@ -30,6 +31,8 @@ class EnergyPointRule(Document):
 
 
 def process_energy_points(doc, state):
+	if doc.doctype == 'ToDo':
+		print(frappe.flags.in_patch, frappe.flags.in_install, is_energy_point_enabled(), '----------------------------')
 	if frappe.flags.in_patch or frappe.flags.in_install or not is_energy_point_enabled():
 		return
 

From 85fb946392e4035d0d7349679e5f43548652f72a Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Thu, 28 Mar 2019 18:29:12 +0530
Subject: [PATCH 153/256] fix(Assigned To): fix "Assigned To" query for
 postgres (#7154)

---
 frappe/desk/listview.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/listview.py b/frappe/desk/listview.py
index 745e021efe..f31aae401e 100644
--- a/frappe/desk/listview.py
+++ b/frappe/desk/listview.py
@@ -39,7 +39,7 @@ def get_user_assignments_and_count(doctype, current_filters):
 		from
 			`tabToDo`, `tabUser`
 		where
-			`tabToDo`.status='open' and
+			`tabToDo`.status='Open' and
 			`tabToDo`.owner = `tabUser`.name and
 			`tabUser`.user_type = 'System User' 
 			{subquery_condition}

From aaf046f23f9daf6cf11cd8d1369f48454f98129d Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 29 Mar 2019 07:45:49 +0530
Subject: [PATCH 154/256] fix: comment out caching code

---
 .../energy_point_rule/energy_point_rule.py       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
index d6a76c1009..d71d5160cb 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
@@ -36,15 +36,15 @@ def process_energy_points(doc, state):
 	if frappe.flags.in_patch or frappe.flags.in_install or not is_energy_point_enabled():
 		return
 
-	energy_point_doctypes = frappe.cache().get_value('energy_point_doctypes', get_energy_point_doctypes)
+	# energy_point_doctypes = frappe.cache().get_value('energy_point_doctypes', get_energy_point_doctypes)
 
-	if doc.doctype in energy_point_doctypes:
-		rules = frappe.get_all('Energy Point Rule', filters={
-			'reference_doctype': doc.doctype,
-			'enabled': 1
-		})
-		for d in rules:
-			frappe.get_doc('Energy Point Rule', d.name).apply(doc)
+	# if doc.doctype in energy_point_doctypes:
+	rules = frappe.get_all('Energy Point Rule', filters={
+		'reference_doctype': doc.doctype,
+		'enabled': 1
+	})
+	for d in rules:
+		frappe.get_doc('Energy Point Rule', d.name).apply(doc)
 
 def get_energy_point_doctypes():
 	return [

From 14a41936daeaeac6dc806ce2bc228f7bd12945db Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 29 Mar 2019 08:28:30 +0530
Subject: [PATCH 155/256] fix: Remove unwanted code

- Fixes "undefined pts" on user master
---
 frappe/core/doctype/user/user.js | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/frappe/core/doctype/user/user.js b/frappe/core/doctype/user/user.js
index 015e1c4f00..82ecdbddca 100644
--- a/frappe/core/doctype/user/user.js
+++ b/frappe/core/doctype/user/user.js
@@ -60,15 +60,7 @@ frappe.ui.form.on('User', {
 			frm.reload_doc();
 			return;
 		}
-		if (frappe.boot.energy_points_enabled && !frm.points ) {
-			frm.points = frm.sidebar.image_section.append(`
-				<ul class="list-unstyled sidebar-menu">
-					<li align="center" class="bold text-muted">
-						<span class="text-large">${frappe.boot.energy_points}</span> points
-					</li>
-				</ul>
-			`);
-		}
+
 		if(doc.name===frappe.session.user && !doc.__unsaved
 			&& frappe.all_timezones
 			&& (doc.language || frappe.boot.user.language)

From b385d91fb0270a2117a6b3cce15711685e97151a Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 29 Mar 2019 08:38:25 +0530
Subject: [PATCH 156/256] style: fix formatting - remove print statements

---
 frappe/public/js/frappe/form/review.js        | 26 +++++++++++--------
 .../energy_point_log/energy_point_log.py      |  1 -
 .../energy_point_rule/energy_point_rule.py    |  6 +----
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/frappe/public/js/frappe/form/review.js b/frappe/public/js/frappe/form/review.js
index fc646c5209..13cf55848e 100644
--- a/frappe/public/js/frappe/form/review.js
+++ b/frappe/public/js/frappe/form/review.js
@@ -166,19 +166,23 @@ frappe.ui.form.Review = class Review {
 			trigger: 'hover',
 			delay: 500,
 			placement: 'top',
-			template:`<div class="review-popover popover">
-				<div class="arrow"></div>
-				<div class="popover-content"></div>
-			</div>`,
+			template:`
+				<div class="review-popover popover">
+					<div class="arrow"></div>
+					<div class="popover-content"></div>
+				</div>
+			`,
 			content: () => {
-				return `<div class="text-medium">
-					<div class="subject">
-						${subject}
+				return `
+					<div class="text-medium">
+						<div class="subject">
+							${subject}
+						</div>
+						<div class="body">
+							<div>${data.reason}</div>
+						</div>
 					</div>
-					<div class="body">
-						<div>${data.reason}</div>
-					</div>
-				</div>`;
+				`;
 			},
 			html: true,
 			container: 'body'
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index a24f05bea3..171a34c954 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -44,7 +44,6 @@ def get_alert_message(doc):
 
 def create_energy_points_log(ref_doctype, ref_name, doc):
 	doc = frappe._dict(doc)
-	print('apply', ref_doctype, ref_name, doc.user, doc.rule)
 	log_exists = frappe.db.exists('Energy Point Log', {
 		'user': doc.user,
 		'rule': doc.rule,
diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
index d71d5160cb..2d3412905c 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
@@ -10,7 +10,6 @@ from frappe.social.doctype.energy_point_log.energy_point_log import create_energ
 
 class EnergyPointRule(Document):
 	def apply(self, doc):
-		print('apply', doc.as_dict().name)
 		if frappe.safe_eval(self.condition, None, {'doc': doc.as_dict()}):
 			multiplier = 1
 
@@ -31,13 +30,10 @@ class EnergyPointRule(Document):
 
 
 def process_energy_points(doc, state):
-	if doc.doctype == 'ToDo':
-		print(frappe.flags.in_patch, frappe.flags.in_install, is_energy_point_enabled(), '----------------------------')
 	if frappe.flags.in_patch or frappe.flags.in_install or not is_energy_point_enabled():
 		return
-
+	# TODO: cache properly
 	# energy_point_doctypes = frappe.cache().get_value('energy_point_doctypes', get_energy_point_doctypes)
-
 	# if doc.doctype in energy_point_doctypes:
 	rules = frappe.get_all('Energy Point Rule', filters={
 		'reference_doctype': doc.doctype,

From bef48d42688658f989893302362cc5fa33594914 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 29 Mar 2019 09:28:20 +0530
Subject: [PATCH 157/256] fix: Use as_dict of doc if exist

- User can send doc instance instead of object
---
 frappe/social/doctype/energy_point_log/energy_point_log.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index 171a34c954..4ab5920d52 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -104,7 +104,7 @@ def get_user_energy_and_review_points(user=None):
 @frappe.whitelist()
 def review(doc, points, to_user, reason, review_type='Appreciation'):
 	current_review_points = get_energy_points(frappe.session.user).review_points
-	doc = frappe._dict(json.loads(doc))
+	doc = doc.as_dict() if hasattr(doc, 'as_dict') else frappe._dict(json.loads(doc))
 	points = abs(cint(points))
 	if current_review_points < points:
 		frappe.msgprint(_('You do not have enough review points'))

From c79ab1279de8552986671a2051babb1a20f0cae9 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 29 Mar 2019 09:28:37 +0530
Subject: [PATCH 158/256] test: Add test for review

---
 .../energy_point_log/test_energy_point_log.py | 52 +++++++++++++++----
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/frappe/social/doctype/energy_point_log/test_energy_point_log.py b/frappe/social/doctype/energy_point_log/test_energy_point_log.py
index 720ef4cfb9..ad46fefcec 100644
--- a/frappe/social/doctype/energy_point_log/test_energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/test_energy_point_log.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
 
 import frappe
 import unittest
-from .energy_point_log import get_energy_points as _get_energy_points
+from .energy_point_log import get_energy_points as _get_energy_points, create_review_points_log, review
 from frappe.utils.testutils import add_custom_field, clear_custom_fields
 
 class TestEnergyPointLog(unittest.TestCase):
@@ -17,19 +17,19 @@ class TestEnergyPointLog(unittest.TestCase):
 	def test_user_energy_point(self):
 		frappe.set_user('test@example.com')
 		todo_point_rule = create_energy_point_rule_for_todo()
-		energy_point_of_user = get_energy_points('test@example.com')
+		energy_point_of_user = get_points('test@example.com')
 
 		created_todo = create_a_todo()
 
 		created_todo.status = 'Closed'
 		created_todo.save()
 
-		points_after_closing_todo = get_energy_points('test@example.com')
+		points_after_closing_todo = get_points('test@example.com')
 
 		self.assertEquals(points_after_closing_todo, energy_point_of_user + todo_point_rule.points)
 
 		created_todo.save()
-		points_after_double_save = get_energy_points('test@example.com')
+		points_after_double_save = get_points('test@example.com')
 
 		# point should not be awarded more than once for same doc
 		self.assertEquals(points_after_double_save, energy_point_of_user + todo_point_rule.points)
@@ -40,15 +40,15 @@ class TestEnergyPointLog(unittest.TestCase):
 		multiplier_value = 2
 
 		todo_point_rule = create_energy_point_rule_for_todo('multiplier')
-		energy_point_of_user = get_energy_points('test@example.com')
+		energy_point_of_user = get_points('test@example.com')
 
 		created_todo = create_a_todo()
-		points_after_closing_todo = get_energy_points('test@example.com')
+		points_after_closing_todo = get_points('test@example.com')
 		created_todo.status = 'Closed'
 		created_todo.multiplier = multiplier_value
 		created_todo.save()
 
-		points_after_closing_todo = get_energy_points('test@example.com')
+		points_after_closing_todo = get_points('test@example.com')
 
 		self.assertEquals(points_after_closing_todo, energy_point_of_user + (todo_point_rule.points * multiplier_value))
 		clear_custom_fields('ToDo')
@@ -60,14 +60,14 @@ class TestEnergyPointLog(unittest.TestCase):
 
 		frappe.set_user('test@example.com')
 		create_energy_point_rule_for_todo()
-		energy_point_of_user = get_energy_points('test@example.com')
+		energy_point_of_user = get_points('test@example.com')
 
 		created_todo = create_a_todo()
 
 		created_todo.status = 'Closed'
 		created_todo.save()
 
-		points_after_closing_todo = get_energy_points('test@example.com')
+		points_after_closing_todo = get_points('test@example.com')
 
 		# no change in points
 		self.assertEquals(points_after_closing_todo, energy_point_of_user)
@@ -75,6 +75,36 @@ class TestEnergyPointLog(unittest.TestCase):
 		settings.enabled = 1
 		settings.save()
 
+	def test_review(self):
+		created_todo = create_a_todo()
+		review_points = 20
+		create_review_points_log('test2@example.com', review_points)
+
+		# reviewer
+		frappe.set_user('test2@example.com')
+
+		review_points_before_review = get_points('test2@example.com', 'review_points')
+		self.assertEquals(review_points_before_review, review_points)
+
+		# for appreciation
+		appreciation_points = 5
+		energy_points_before_review = get_points('test@example.com')
+		review(created_todo, appreciation_points, 'test@example.com', 'good job')
+		energy_points_after_review = get_points('test@example.com')
+		review_points_after_review = get_points('test2@example.com', 'review_points')
+		self.assertEquals(energy_points_after_review, energy_points_before_review + appreciation_points)
+		self.assertEquals(review_points_after_review, review_points_before_review - appreciation_points)
+
+		# for criticism
+		criticism_points = 2
+		energy_points_before_review = energy_points_after_review
+		review_points_before_review = review_points_after_review
+		review(created_todo, criticism_points, 'test@example.com', 'You could have done better.', 'Criticism')
+		energy_points_after_review = get_points('test@example.com')
+		review_points_after_review = get_points('test2@example.com', 'review_points')
+		self.assertEquals(energy_points_after_review, energy_points_before_review - criticism_points)
+		self.assertEquals(review_points_after_review, review_points_before_review - criticism_points)
+
 def create_energy_point_rule_for_todo(multiplier_field=None):
 	name = 'ToDo Closed'
 	point_rule = frappe.db.get_all(
@@ -103,5 +133,5 @@ def create_a_todo():
 	}).insert()
 
 
-def get_energy_points(user):
-	return _get_energy_points(user).energy_points or 0
\ No newline at end of file
+def get_points(user, point_type='energy_points'):
+	return _get_energy_points(user).get(point_type) or 0
\ No newline at end of file

From fd9d1142c32ea39d1f88d9178128a1bd3c9c2135 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 29 Mar 2019 10:57:26 +0530
Subject: [PATCH 159/256] feat: Allow float multipliers

---
 frappe/social/doctype/energy_point_rule/energy_point_rule.js | 2 +-
 frappe/social/doctype/energy_point_rule/energy_point_rule.py | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.js b/frappe/social/doctype/energy_point_rule/energy_point_rule.js
index 5e813694b2..31b043d384 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.js
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.js
@@ -19,7 +19,7 @@ frappe.ui.form.on('Energy Point Rule', {
 				.map(map_for_options)
 				.concat([{label: __('Owner'), value: 'owner'}]);
 
-			const multiplier_fields = fields.filter(df => df.fieldtype === 'Int')
+			const multiplier_fields = fields.filter(df => ['Int', 'Float'].includes(df.fieldtype))
 				.map(map_for_options);
 
 			frm.set_df_property('user_field', 'options', user_fields);
diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
index 2d3412905c..2795ceb249 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
@@ -16,12 +16,15 @@ class EnergyPointRule(Document):
 			if self.multiplier_field:
 				multiplier = doc.get(self.multiplier_field, 1)
 
-			points = self.points * multiplier
+			points = round(self.points * multiplier)
 			reference_doctype = doc.doctype
 			reference_name = doc.name
 			user = doc.get(self.user_field)
 			rule = self.name
 
+			# incase of zero as result after roundoff
+			if not points: return
+
 			create_energy_points_log(reference_doctype, reference_name, {
 				'points': points,
 				'user': user,

From afceb1f99d5cd1fb24ad90faea167a1ae9d320f9 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 29 Mar 2019 10:58:04 +0530
Subject: [PATCH 160/256] test: Fix test for float multiplier

---
 .../doctype/energy_point_log/test_energy_point_log.py       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/social/doctype/energy_point_log/test_energy_point_log.py b/frappe/social/doctype/energy_point_log/test_energy_point_log.py
index ad46fefcec..c8b3dc913e 100644
--- a/frappe/social/doctype/energy_point_log/test_energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/test_energy_point_log.py
@@ -36,8 +36,8 @@ class TestEnergyPointLog(unittest.TestCase):
 
 	def test_points_based_on_multiplier_field(self):
 		frappe.set_user('test@example.com')
-		add_custom_field('ToDo', 'multiplier', 'Int')
-		multiplier_value = 2
+		add_custom_field('ToDo', 'multiplier', 'Float')
+		multiplier_value = 0.51
 
 		todo_point_rule = create_energy_point_rule_for_todo('multiplier')
 		energy_point_of_user = get_points('test@example.com')
@@ -50,7 +50,7 @@ class TestEnergyPointLog(unittest.TestCase):
 
 		points_after_closing_todo = get_points('test@example.com')
 
-		self.assertEquals(points_after_closing_todo, energy_point_of_user + (todo_point_rule.points * multiplier_value))
+		self.assertEquals(points_after_closing_todo, energy_point_of_user + round(todo_point_rule.points * multiplier_value))
 		clear_custom_fields('ToDo')
 
 	def test_disabled_energy_points(self):

From c578df534792ecadf213df2af68acd1b9a081d82 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 29 Mar 2019 11:01:58 +0530
Subject: [PATCH 161/256] feat: Link review log with the energy point log
 created during review

- This will help us to track the reason for review point deduction
---
 .../energy_point_log/energy_point_log.py      | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index 4ab5920d52..f3ed9d0eac 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -60,13 +60,15 @@ def create_energy_points_log(ref_doctype, ref_name, doc):
 	_doc.insert(ignore_permissions=True)
 	return _doc
 
-def create_review_points_log(user, points, reason=None):
+def create_review_points_log(user, points, reason=None, doctype=None, docname=None):
 	return frappe.get_doc({
 		'doctype': 'Energy Point Log',
 		'points': points,
 		'type': 'Review',
 		'user': user,
-		'reason': reason
+		'reason': reason,
+		'reference_doctype': doctype,
+		'reference_name': docname
 	}).insert(ignore_permissions=True)
 
 @frappe.whitelist()
@@ -110,20 +112,22 @@ def review(doc, points, to_user, reason, review_type='Appreciation'):
 		frappe.msgprint(_('You do not have enough review points'))
 		return
 
-	# deduct review points from reviewer
-	create_review_points_log(
-		user=frappe.session.user,
-		points=-points,
-		reason=reason
-	)
-
-	create_energy_points_log(doc.doctype, doc.name, {
+	review_doc = create_energy_points_log(doc.doctype, doc.name, {
 		'type': review_type,
 		'reason': reason,
 		'points': points if review_type == 'Appreciation' else -points,
 		'user': to_user
 	})
 
+	# deduct review points from reviewer
+	create_review_points_log(
+		user=frappe.session.user,
+		points=-points,
+		reason=reason,
+		doctype=review_doc.doctype,
+		docname=review_doc.name
+	)
+
 @frappe.whitelist()
 def get_reviews(doctype, docname):
 	return frappe.get_all('Energy Point Log', filters={

From 17e424707c5ca79df3554ec2e65a8175b67af032 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 29 Mar 2019 11:04:14 +0530
Subject: [PATCH 162/256] feat: Ability to directly give review points from
 settings

---
 .../energy_point_log/energy_point_log.py      |  5 +++
 .../energy_point_settings.js                  | 40 +++++++++++++++++--
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index f3ed9d0eac..31b425231e 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -71,6 +71,11 @@ def create_review_points_log(user, points, reason=None, doctype=None, docname=No
 		'reference_name': docname
 	}).insert(ignore_permissions=True)
 
+@frappe.whitelist()
+def add_review_points(user, points):
+	frappe.only_for('System Manager')
+	create_review_points_log(user, points)
+
 @frappe.whitelist()
 def get_energy_points(user):
 	# points = frappe.cache().hget('energy_points', user,
diff --git a/frappe/social/doctype/energy_point_settings/energy_point_settings.js b/frappe/social/doctype/energy_point_settings/energy_point_settings.js
index 26b53aa400..f061f4d74e 100644
--- a/frappe/social/doctype/energy_point_settings/energy_point_settings.js
+++ b/frappe/social/doctype/energy_point_settings/energy_point_settings.js
@@ -2,7 +2,41 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Energy Point Settings', {
-	// refresh: function(frm) {
-
-	// }
+	refresh: function(frm) {
+		frm.add_custom_button(__('Give Review Points'), show_review_points_dialog);
+	}
 });
+
+function show_review_points_dialog() {
+	const dialog = new frappe.ui.Dialog({
+		title: __('Give Review Points'),
+		fields: [
+			{
+				"label" : "User",
+				"fieldname": "user",
+				"fieldtype": "Link",
+				"options": "User",
+				"reqd": 1
+			},
+			{
+				"label" : "Points",
+				"fieldname": "points",
+				"fieldtype": "Int",
+				"reqd": 1
+			}
+		],
+		primary_action: function(values) {
+			frappe.xcall("frappe.social.doctype.energy_point_log.energy_point_log.add_review_points", {
+				user: values.user,
+				points: values.points,
+			}).then(() => {
+				frappe.show_alert({
+					message: __('Successfully Done'),
+					indicator: 'green'
+				});
+			}).finally(() => dialog.hide());
+		},
+		primary_action_label: __('Submit')
+	});
+	dialog.show();
+}
\ No newline at end of file

From 65484367bd0ef4c8e5e3080c1453db45fa333fec Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Fri, 29 Mar 2019 13:16:11 +0530
Subject: [PATCH 163/256] fix: Desktop

- Customize Shortcuts dialog
- Show / Hide cards dialog
- MultiSelect UI Pills
---
 frappe/boot.py                                |   1 -
 frappe/desk/moduleview.py                     |  38 +--
 frappe/patches.txt                            |   1 +
 frappe/patches/v12_0/reset_home_settings.py   |   8 +
 .../js/frappe/form/controls/multiselect.js    | 131 +++++++---
 .../frappe/views/components/DeskModuleBox.vue |  65 ++---
 .../frappe/views/components/DeskSection.vue   | 245 +++---------------
 .../js/frappe/views/components/Desktop.vue    | 176 ++++++++-----
 .../js/frappe/views/components/Dropdown.vue   |   7 +-
 frappe/public/less/controls.less              |   5 +
 10 files changed, 293 insertions(+), 384 deletions(-)
 create mode 100644 frappe/patches/v12_0/reset_home_settings.py

diff --git a/frappe/boot.py b/frappe/boot.py
index 05117acb7a..043c1b0361 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -98,7 +98,6 @@ def load_conf_settings(bootinfo):
 def load_desktop_icons(bootinfo):
 	from frappe.config import get_modules_from_all_apps_for_user
 	bootinfo.allowed_modules = get_modules_from_all_apps_for_user()
-	bootinfo.home_settings = frappe.db.get_value("User", frappe.session.user, 'home_settings','')
 
 def get_allowed_pages():
 	return get_user_pages_or_reports('Page')
diff --git a/frappe/desk/moduleview.py b/frappe/desk/moduleview.py
index 5978bc7ef0..a9a460b124 100644
--- a/frappe/desk/moduleview.py
+++ b/frappe/desk/moduleview.py
@@ -302,30 +302,30 @@ def get_links(app, module):
 			link_names.append(item.get("label"))
 	return link_names
 
+@frappe.whitelist()
+def hide_modules_from_desktop(modules):
+	modules = frappe.parse_json(modules)
+	home_settings = frappe.db.get_value("User", frappe.session.user, 'home_settings')
+	home_settings = frappe.parse_json(home_settings or '{}')
+
+	home_settings['hidden_modules'] = modules
+	frappe.db.set_value('User', frappe.session.user, 'home_settings', json.dumps(home_settings))
+
+	return home_settings
+
+
 
 @frappe.whitelist()
-def update_desk_section_settings(desk_section, new_settings):
+def update_links_for_module(module_name, links):
 	home_settings = frappe.db.get_value("User", frappe.session.user, 'home_settings')
-	if home_settings:
-		home_settings = json.loads(home_settings)
-	else:
-		return {}
+	home_settings = frappe.parse_json(home_settings or '{}')
 
-	new_settings = json.loads(new_settings)
+	home_settings.setdefault('links', {})
+	home_settings['links'].setdefault(module_name, None)
+	home_settings['links'][module_name] = links
+	frappe.db.set_value('User', frappe.session.user, 'home_settings', json.dumps(home_settings))
 
-	for module, data in new_settings.items():
-		if data.get("links"):
-			data["links"] = get_module_link_items_from_list(data["app"], module, data.get("links"))
-		data.pop("app", None)
-
-	home_settings[desk_section] = new_settings
-	settings_json_str = json.dumps(home_settings)
-	# # This didn't work
-	# frappe.db.set_value("User", frappe.session.user, 'home_settings', json.dumps(home_settings))
-	frappe.db.sql("""update tabUser set home_settings = %s""", (settings_json_str), debug=True)
-	frappe.db.commit()
-
-	return new_settings
+	return home_settings
 
 
 def get_module_link_items_from_list(app, module, list_of_link_names):
diff --git a/frappe/patches.txt b/frappe/patches.txt
index 43d0699647..d3b3ca02f1 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -238,3 +238,4 @@ frappe.patches.v11_0.set_default_letter_head_source
 frappe.patches.v12_0.setup_comments_from_communications
 frappe.patches.v12_0.init_desk_settings #11-03-2019
 frappe.patches.v12_0.replace_null_values_in_tables
+frappe.patches.v12_0.reset_home_settings
\ No newline at end of file
diff --git a/frappe/patches/v12_0/reset_home_settings.py b/frappe/patches/v12_0/reset_home_settings.py
new file mode 100644
index 0000000000..db16c31f15
--- /dev/null
+++ b/frappe/patches/v12_0/reset_home_settings.py
@@ -0,0 +1,8 @@
+import frappe
+
+def execute():
+	frappe.db.sql('''
+		UPDATE `tabUser`
+		SET `home_settings` = ''
+		WHERE `user_type` = 'System User'
+	''')
diff --git a/frappe/public/js/frappe/form/controls/multiselect.js b/frappe/public/js/frappe/form/controls/multiselect.js
index 64ca4fc83d..93bcd2ca15 100644
--- a/frappe/public/js/frappe/form/controls/multiselect.js
+++ b/frappe/public/js/frappe/form/controls/multiselect.js
@@ -1,6 +1,93 @@
 import Awesomplete from 'awesomplete';
 
 frappe.ui.form.ControlMultiSelect = frappe.ui.form.ControlAutocomplete.extend({
+	make_input() {
+		this._super();
+		this.$input_area = $(this.input_area);
+		this.$input_area.addClass('form-control table-multiselect');
+		this.$input.removeClass('form-control');
+
+		this.$input.on("awesomplete-selectcomplete", () => {
+			this.$input.val('').focus();
+		});
+
+		// used as an internal model to store values
+		this.rows = [];
+
+		this.$input_area.on('click', '.btn-remove', (e) => {
+			const $target = $(e.currentTarget);
+			const $value = $target.closest('.tb-selected-value');
+
+			const value = decodeURIComponent($value.data().value);
+			this.rows = this.rows.filter(val => val !== value);
+
+			this.parse_validate_and_set_in_model('');
+		});
+
+		this.$input.on('keydown', e => {
+			// if backspace key pressed on empty input, delete last value
+			if (e.keyCode == frappe.ui.keyCode.BACKSPACE && e.target.value === '') {
+				this.rows = this.rows.slice(0, this.rows.length - 1);
+				this.parse_validate_and_set_in_model('');
+			}
+		});
+	},
+
+	parse(value) {
+		if (value) {
+			this.rows.push(value);
+		}
+
+		return this.rows;
+	},
+
+	validate(value) {
+		const rows = (value || []).slice();
+
+		if (rows.length === 0) {
+			return rows;
+		}
+
+		const all_rows_except_last = rows.slice(0, rows.length - 1);
+		const last_value = rows[rows.length - 1];
+
+		// falsy value
+		if (!last_value) {
+			return all_rows_except_last;
+		}
+
+		// duplicate value
+		if (all_rows_except_last.includes(last_value)) {
+			return all_rows_except_last;
+		}
+
+		return rows;
+	},
+
+	set_formatted_input(value) {
+		this.rows = value || [];
+		this.set_pill_html(this.rows);
+	},
+
+	set_pill_html(values) {
+		const html = values
+			.map(value => this.get_pill_html(value))
+			.join('');
+
+		this.$input_area.find('.tb-selected-value').remove();
+		this.$input_area.prepend(html);
+	},
+
+	get_pill_html(value) {
+		const encoded_value = encodeURIComponent(value);
+		return `<div class="btn-group tb-selected-value" data-value="${encoded_value}">
+			<button class="btn btn-default btn-xs btn-link-to-form">${__(value)}</button>
+			<button class="btn btn-default btn-xs btn-remove">
+				<i class="fa fa-remove text-muted"></i>
+			</button>
+		</div>`;
+	},
+
 	get_awesomplete_settings() {
 		const settings = this._super();
 
@@ -23,59 +110,37 @@ frappe.ui.form.ControlMultiSelect = frappe.ui.form.ControlAutocomplete.extend({
 				}
 
 				return v;
-			},
-
-			replace: function(text) {
-				const before = this.input.value.match(/^.+,\s*|/)[0];
-				this.input.value = before + text + ", ";
 			}
 		});
 	},
 
 	get_value() {
-		let data = this._super();
-		// find value of label from option list and return actual value string
-		if (this.df.options && this.df.options.length && this.df.options[0].label) {
-			data = data.split(',').map(op => op.trim());
-			data = data.map(val => {
-				let option = this.df.options.find(op => op.label === val);
-				return option ? option.value : null;
-			}).filter(n => n != null).join(', ');
-		}
-		return data;
-	},
-
-	set_formatted_input(value) {
-		if (!value) return;
-		// find label of value from option list and set from it as input
-		if (this.df.options && this.df.options.length && this.df.options[0].label) {
-			value = value.split(',').map(d => d.trim()).map(val => {
-				let option = this.df.options.find(op => op.value === val);
-				return option ? option.label : val;
-			}).filter(n => n != null).join(', ');
-		}
-		this._super(value);
+		return this.rows;
 	},
 
 	get_values() {
-		const value = this.get_value() || '';
-		const values = value.split(/\s*,\s*/).filter(d => d);
-
-		return values;
+		return this.rows;
 	},
 
 	get_data() {
 		let data;
 		if(this.df.get_data) {
 			data = this.df.get_data();
-			this.set_data(data);
+			if (data && data.then) {
+				data.then((r) => {
+					this.set_data(r);
+				});
+				data = this.get_value();
+			} else {
+				this.set_data(data);
+			}
 		} else {
 			data = this._super();
 		}
 		const values = this.get_values() || [];
 
 		// return values which are not already selected
-		if(data) data.filter(d => !values.includes(d));
+		if (data) data.filter(d => !values.includes(d));
 		return data;
 	}
 });
diff --git a/frappe/public/js/frappe/views/components/DeskModuleBox.vue b/frappe/public/js/frappe/views/components/DeskModuleBox.vue
index 245b47d147..3589b3ea12 100644
--- a/frappe/public/js/frappe/views/components/DeskModuleBox.vue
+++ b/frappe/public/js/frappe/views/components/DeskModuleBox.vue
@@ -3,11 +3,6 @@
     v-if="!hidden"
     class="border module-box"
     :class="{ 'hovered-box': hovered }"
-    :draggable="true"
-    @dragstart="on_dragstart"
-    @dragend="on_dragend"
-    @dragenter="on_enter"
-    @drop="on_drop"
   >
     <div class="flush-top">
       <div class="module-box-content">
@@ -20,23 +15,12 @@
               </div>
             </h4>
           </a>
-          <dropdown v-if="links && links.length" :items="links">
+          <dropdown v-if="dropdown_links && dropdown_links.length" :items="dropdown_links">
             <span class="pull-right">
-              <i class="octicon octicon-chevron-down"></i>
+              <i class="octicon octicon-chevron-down text-muted"></i>
             </span>
           </dropdown>
-          <!-- <span class="drag-handle octicon octicon-three-bars text-extra-muted"></span> -->
         </div>
-        <!-- <p v-if="links && links.length" class="small text-muted">
-          <a
-            v-for="shortcut in links"
-            :key="(shortcut.name || shortcut.label) + shortcut.type"
-            :href="shortcut.route"
-            class="btn btn-default btn-xs shortcut-tag"
-            title="toggle Tag"
-            >{{ shortcut.label }}</a
-          >
-        </p>-->
       </div>
     </div>
   </div>
@@ -50,6 +34,7 @@ export default {
     "index",
     "name",
     "label",
+    "category",
     "type",
     "module_name",
     "link",
@@ -75,32 +60,21 @@ export default {
       } else {
         return "octicon octicon-file-text";
       }
-    }
+	},
+	dropdown_links() {
+		return this.links
+			.filter(link => !link.hidden)
+			.concat([
+				{ label: __('Customize'), action: () => this.$emit('customize'), class: 'border-top' }
+			]);
+	}
   },
-  methods: {
-    on_dragstart() {
-      this.$emit("box-dragstart", this.index);
-      return 0;
-    },
-    on_dragend() {
-      this.$emit("box-dragend", this.index);
-      return 0;
-    },
-    on_enter() {
-      this.$emit("box-enter", this.index);
-      // this.hovered = 1;
-    },
-    on_drop() {
-      this.$emit("box-drop", this.index);
-    },
-    on_exit() {
-      // this.hovered = 0;
-    }
-  }
 };
 </script>
 
 <style lang="less" scoped>
+@import "frappe/public/less/variables";
+
 .module-box {
   border-radius: 4px;
   padding: 5px 15px;
@@ -109,16 +83,21 @@ export default {
 }
 
 .module-box:hover {
-  box-shadow: 0 3px 4px 0 rgba(18, 18, 19, 0.08);
+	border-color: @text-muted;
 }
 
 .hovered-box {
-  background-color: #fafbfc;
+  background-color: @light-bg;
 }
 
 .octicon-chevron-down {
-  font-size: 24px;
-  padding: 5px;
+  font-size: 14px;
+  padding: 4px 6px 2px 6px;
+  border-radius: 4px;
+
+  &:hover {
+	background: @btn-bg;
+  }
 }
 
 .octicon-chevron-down:hover {
diff --git a/frappe/public/js/frappe/views/components/DeskSection.vue b/frappe/public/js/frappe/views/components/DeskSection.vue
index 3a9ec45e9c..3c5dcd9af0 100644
--- a/frappe/public/js/frappe/views/components/DeskSection.vue
+++ b/frappe/public/js/frappe/views/components/DeskSection.vue
@@ -2,22 +2,15 @@
   <div>
     <div class="section-header level text-muted">
       <div class="module-category h6 uppercase">{{ category }}</div>
-
-      <div>
-        <a class="small text-muted" @click="show_customize_dialog">{{ __("Customize") }}</a>
-      </div>
     </div>
 
     <div class="modules-container">
       <desk-module-box
-        v-for="(module, index) in modules.filter(m => !m.hidden)"
+        v-for="(module, index) in modules"
         :key="module.name"
         :index="index"
         v-bind="module"
-        @box-dragstart="box_dragstart($event)"
-        @box-dragend="box_dragend($event)"
-        @box-enter="box_enter($event)"
-        @box-drop="box_drop($event)"
+		@customize="show_module_card_customize_dialog(module)"
       ></desk-module-box>
     </div>
   </div>
@@ -25,228 +18,49 @@
 
 <script>
 import DeskModuleBox from "./DeskModuleBox.vue";
-import { generate_route } from "./utils.js";
 
 export default {
-	props: ['category', 'all_modules', 'customization_settings'],
+	props: ['category', 'modules'],
 	components: {
 		DeskModuleBox
 	},
-	data() {
-		let default_modules = this.all_modules;
-		let modules = this.get_customized_modules(default_modules, this.customization_settings);
-
-		return {
-			default_modules: default_modules,
-			modules: modules,
-			new_settings: {},
-			dragged_index: -1,
-			hovered_index: -1,
-		}
-	},
 	methods: {
-		show_customize_dialog() {
-			if(!this.dialog) {
-				const fields = this.make_fields();
-				this.make_and_show_dialog(fields);
-			} else {
-				this.dialog.show();
-			}
-		},
-		make_fields() {
-			let fields = [];
-			this.modules.forEach(module => {
-				fields.push(this.get_module_select_field(module));
-
-				if(module.links) {
-					fields.push(this.get_links_multiselect_field(module));
-				}
-			});
-			return fields;
-		},
-		make_and_show_dialog(fields) {
-			this.dialog = new frappe.ui.Dialog({
-				title: __("Customize " + this.category),
-				fields: fields,
-				primary_action_label: __("Update"),
-				primary_action: (values) => {
-					this.update_settings(values);
-				}
-			});
-
-			this.dialog.modal_body.find('.clearfix').css({'display': 'none'});
-			this.dialog.modal_body.find('.frappe-control*[data-fieldtype="MultiSelect"]').css({'margin-bottom': '30px'});
-
-			this.dialog.show();
-		},
-
-		update_settings(values) {
-			// Figure out the diff from the default settings known from modules
-			let new_settings = {};
-			const checkbox_fields = Object.keys(values).filter(f => !f.includes('links'));
-
-			checkbox_fields.forEach(module_name => {
-				const default_module = this.default_modules.filter(f => f.module_name === module_name)[0];
-
-				// Check if hidden changed
-				const default_hidden = default_module.hidden ? 1 : 0;
-				const new_hidden = !values[module_name] ? 1 : 0;
-				const hidden_changed = new_hidden != default_hidden;
-
-				// Check if links changed
-				let links_changed = 0;
-				let new_links = [];
-
-				if(!new_hidden) {
-					const default_links = default_module.links.map(l => (l.name || l.label));
-					const new_links_str = values[module_name + '_links'] || '';
-					new_links = new_links_str ? new_links_str.split(",") : [];
-					links_changed = !this.are_arrays_equal(new_links, default_links);
-				}
-
-				// Make new settings
-				let new_module_settings;
-
-				if(hidden_changed || links_changed) {
-					new_module_settings = {};
-					if(hidden_changed) {
-						new_module_settings.hidden = new_hidden;
-					}
-					if(links_changed) {
-						new_module_settings.links = new_links;
-					}
-				}
-
-				if(new_module_settings) {
-					new_module_settings.app = this.default_modules.filter(m => m.module_name === module_name)[0].app;
-					new_settings[module_name] = new_module_settings;
-				}
-			});
-
-			if(Object.keys(new_settings)) {
-				frappe.call({
-					type: "GET",
-					method:'frappe.desk.moduleview.update_desk_section_settings',
-					freeze: true,
-					args: {
-						desk_section: this.category,
-						new_settings: new_settings
-					},
-					callback: (r) => {
-						let new_settings_with_link_objects = r.message;
-						let home_settings = JSON.parse(frappe.boot.home_settings);
-						home_settings[this.category] = new_settings_with_link_objects;
-						frappe.boot.home_settings = JSON.stringify(home_settings);
-
-						this.modules = this.get_customized_modules(this.default_modules, new_settings_with_link_objects);
-						this.dialog.hide();
-					}
-				});
-			} else {
-				this.dialog.hide();
-			};
-		},
-
-		get_customized_modules(default_modules, customization_settings={}) {
-			return default_modules.map(module => {
-				let customized_module = JSON.parse(JSON.stringify(module));
-
-				const module_settings = customization_settings[module.module_name];
-				if(module_settings) {
-					if(module_settings.links) {
-						customized_module.links = module_settings.links;
-					}
-					customized_module.hidden = module_settings ? module_settings.hidden : 0;
-				}
-
-				if(customized_module.links) {
-					customized_module.links.forEach(link => {
-						link.route = generate_route(link);
-					});
-				}
-
-				return customized_module;
-			});
-		},
-
-		get_module_select_field(module) {
-			return {
-				label: __(module.module_name),
-				fieldname: module.module_name,
-				fieldtype: "Check",
-				default: module.hidden ? 0 : 1
-			}
-		},
-
-		get_links_multiselect_field(module) {
-			return {
-				label: __(""),
-				fieldname: module.module_name + "_links",
-				fieldtype: "MultiSelect",
-				get_data: function() {
-					let data = [];
-
-					frappe.call({
-						type: "GET",
-						method:'frappe.desk.moduleview.get_links',
-						async: false,
-						no_spinner: true,
-						args: {
-							app: module.app,
-							module: module.module_name,
+		show_module_card_customize_dialog(module) {
+			const d = new frappe.ui.Dialog({
+				title: __('Customize Shortcuts'),
+				fields: [
+					{
+						label: __('Shortcuts'),
+						fieldname: 'links',
+						fieldtype: 'MultiSelect',
+						get_data() {
+							return frappe.call('frappe.desk.moduleview.get_links', {
+								app: module.app,
+								module: module.module_name,
+							}).then(r => r.message);
 						},
-						callback: function(r) {
-							data = r.message;
-						}
+						default: module.links.filter(l => !l.hidden).map(l => l.name)
+					}
+				],
+				primary_action_label: __('Save'),
+				primary_action: ({ links }) => {
+					frappe.call('frappe.desk.moduleview.update_links_for_module', {
+						module_name: module.module_name,
+						links
+					}).then(r => {
+						this.$emit('update_home_settings', r.message);
 					});
-					return data;
-				},
-				default: module.links.map(l => (l.name || l.label)),
-				depends_on: module.module_name
-			};
-		},
-
-		are_arrays_equal(arr1, arr2) {
-			if(arr1.length !== arr2.length) return false;
-			let areEqual = true;
-			arr1.map((d, i) => {
-				if(arr2[i] !== d) areEqual = false;
+					d.hide();
+				}
 			});
-			return areEqual;
-		},
 
-		box_dragstart(index) {
-			this.dragged_index = index;
-		},
-
-		box_dragend(index) {
-			this.dragged_index = -1;
-			this.hovered_index = -1;
-		},
-
-		box_enter(index) {
-			this.hovered_index = index;
-		},
-
-		box_drop(index) {
-			let d = this.dragged_index;
-			let h = this.hovered_index;
-			if (d < h) {
-				this.modules.splice(h, 0, this.modules[d]);
-				this.modules.splice(d, 1);
-			}
+			d.show();
 		},
 	}
 }
 </script>
 
 <style lang="less" scoped>
-.section-header {
-  margin-top: 30px;
-  margin-bottom: 15px;
-  border-bottom: 1px solid #d0d8dd;
-}
-
 .modules-container {
   display: grid;
   grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
@@ -256,4 +70,3 @@ export default {
   align-items: center;
 }
 </style>
-
diff --git a/frappe/public/js/frappe/views/components/Desktop.vue b/frappe/public/js/frappe/views/components/Desktop.vue
index 74d3cc6622..240f3511a8 100644
--- a/frappe/public/js/frappe/views/components/Desktop.vue
+++ b/frappe/public/js/frappe/views/components/Desktop.vue
@@ -1,24 +1,30 @@
 <template>
-	<div class="modules-page-container">
-		<div class="toolbar-underlay"></div>
-		<div v-for="category in module_categories"
-			:key="category">
-
+	<div class="modules-page-container" v-if="home_settings_fetched">
+		<div
+			class="modules-section"
+			v-for="(category, i) in module_categories" :key="category"
+		>
+			<a
+				v-if="i === 0"
+				class="btn-show-hide text-muted text-medium"
+				@click="show_hide_cards_dialog"
+			>
+				{{ __('Show / Hide Cards') }}
+			</a>
 			<desk-section
-				v-if="modules.filter(m => m.category === category).length"
+				v-if="get_modules_for_category(category)"
 				:category="category"
-				:all_modules="modules.filter(m => m.category === category)"
-				:customization_settings="home_settings ? home_settings[category] : {}"
+				:modules="get_modules_for_category(category)"
+				@update_home_settings="hs => update_modules_with_home_settings(hs)"
 			>
 			</desk-section>
-
 		</div>
-
 	</div>
 </template>
 
 <script>
 import DeskSection from './DeskSection.vue';
+import { generate_route } from './utils';
 
 export default {
 	components: {
@@ -26,77 +32,98 @@ export default {
 	},
 	data() {
 		let modules_list = frappe.boot.allowed_modules
-			.filter(d => (d.type==='module' || d.category==='Places') && !d.blocked);
-
-		modules_list.forEach(module => {
-			module.count = this.get_module_count(module.module_name);
-		});
-
-		const home_settings = frappe.boot.home_settings || '{}';
+			.filter(d => (d.type==='module' || d.category==='Places') && !d.blocked)
+			.map(d => {
+				d.links = (d.links || []).map(link => {
+					link.route = generate_route(link);
+					return link;
+				});
+				return d;
+			});
 
 		return {
-			route_str: frappe.get_route()[1],
-			module_label: '',
-			module_categories: ["Modules", "Domains", "Places", "Administration"],
+			module_categories: ['Modules', 'Domains', 'Places', 'Administration'],
 			modules: modules_list,
-
-			// // Desk customizations. Format of user settings:
-
-			// home_settings = {				// <--- Settings
-			// 	"Domains": {   				// <--- Category (Desk Section)
-			// 		"Manufacturing": {		// <--- Module
-			// 			"index": 3,
-			// 			"links": [],
-			// 			"hidden": 1,
-			// 		},
-
-			// 	},
-			// }
-
-			home_settings: JSON.parse(home_settings)
+			home_settings_fetched: false
 		};
 	},
+	created() {
+		this.fetch_home_settings();
+	},
 	methods: {
-		get_settings() {
+		fetch_home_settings() {
 			return frappe.db.get_value('User', user, 'home_settings')
-				.then(resp => {
-					this.all_settings = JSON.parse(resp.message['home_settings']);
-					this.settings = this.all_settings[this.category];
+				.then(r => {
+					let home_settings = JSON.parse(r.message.home_settings || '{}');
+					this.update_modules_with_home_settings(home_settings);
+					this.home_settings_fetched = true;
 				});
 		},
-		get_module_count(module_name) {
-			var module_doctypes = frappe.boot.notification_info.module_doctypes[module_name];
-			var sum = 0;
+		update_modules_with_home_settings(home_settings) {
+			this.modules = this.modules.map(m => {
+				let hidden_modules = home_settings.hidden_modules || [];
+				m.hidden = hidden_modules.includes(m.module_name);
 
-			if(module_doctypes && frappe.boot.notification_info.open_count_doctype) {
-				// sum all doctypes for a module
-				for (var j=0, k=module_doctypes.length; j < k; j++) {
-					var doctype = module_doctypes[j];
-					let count = (frappe.boot.notification_info.open_count_doctype[doctype] || 0);
-					count = typeof count == "string" ? parseInt(count) : count;
-					sum += count;
+				let links = home_settings.links && home_settings.links[m.module_name];
+
+				if (links) {
+					links = JSON.parse(links);
+
+					let default_links = m.links.map(link => link.name);
+					m.links = m.links.map(link => {
+						link.hidden = !links.includes(link.name);
+						return link;
+					});
+					let new_links = links
+						.filter(link => !default_links.includes(link))
+						.filter(Boolean)
+						.map(link => {
+							let new_link = { name: link, label: link, type: 'doctype' };
+							new_link.route = generate_route(new_link);
+							return new_link;
+						});
+					m.links = m.links.concat(new_links);
 				}
-			}
 
-			if(frappe.boot.notification_info.open_count_doctype
-				&& frappe.boot.notification_info.open_count_doctype[module_name]!=null) {
-				// notification count explicitly for doctype
-				let count = frappe.boot.notification_info.open_count_doctype[module_name] || 0;
-				count = typeof count == "string" ? parseInt(count) : count;
-				sum += count;
-			}
+				return m;
+			});
+		},
+		get_modules_for_category(category) {
+			return this.modules.filter(m => m.category === category && !m.hidden);
+		},
+		show_hide_cards_dialog() {
+			let fields = this.module_categories.map(category => {
+				let modules = this.modules.filter(m => m.category === category);
+				let options = modules.map(
+					m => ({ label: m.label, value: m.module_name, checked: !m.hidden })
+				);
+				return {
+					label: category,
+					fieldname: category,
+					fieldtype: 'MultiCheck',
+					options,
+					columns: 2
+				}
+			});
+			const d = new frappe.ui.Dialog({
+				title: __('Show / Hide Cards'),
+				fields,
+				primary_action_label: __('Save'),
+				primary_action: (values) => {
+					let all_modules = this.modules.map(m => m.module_name);
+					let modules_to_show = Object.keys(values).map(k => values[k]).flatMap(m => m);
+					let modules_to_hide = all_modules.filter(m => !modules_to_show.includes(m));
+					d.hide();
 
-			if(frappe.boot.notification_info.open_count_module
-				&& frappe.boot.notification_info.open_count_module[module_name]!=null) {
-				// notification count explicitly for module
-				let count = frappe.boot.notification_info.open_count_module[module_name] || 0;
-				count = typeof count == "string" ? parseInt(count) : count;
-				sum += count;
-			}
+					frappe.call('frappe.desk.moduleview.hide_modules_from_desktop', {
+						modules: modules_to_hide
+					})
+						.then(r => r.message)
+						.then(hs => this.update_modules_with_home_settings(hs));
+				}
+			});
 
-			sum = sum > 99 ? "99+" : sum;
-
-			return sum;
+			d.show();
 		}
 	}
 }
@@ -104,12 +131,23 @@ export default {
 
 <style lang="less" scoped>
 .modules-page-container {
+	margin-top: 40px;
 	margin-bottom: 30px;
 }
 
-.toolbar-underlay{
-	margin: 70px;
+.modules-section {
+	position: relative;
+	padding-top: 30px;
 }
 
+.btn-show-hide {
+	position: absolute;
+	right: 0;
+	top: 36px;
+}
+
+.toolbar-underlay {
+	margin: 70px;
+}
 </style>
 
diff --git a/frappe/public/js/frappe/views/components/Dropdown.vue b/frappe/public/js/frappe/views/components/Dropdown.vue
index 8d9c2b561f..4792c79955 100644
--- a/frappe/public/js/frappe/views/components/Dropdown.vue
+++ b/frappe/public/js/frappe/views/components/Dropdown.vue
@@ -1,9 +1,10 @@
 <template>
   <Popover :align="align">
     <slot></slot>
-    <ul slot="popover-content" class="list-reset">
-      <li v-for="item of dropdownItems" :key="item.label">
-        <a class="list-item" :href="item.route">{{ item.label }}</a>
+    <ul slot="popover-content" class="list-reset border">
+      <li v-for="item of dropdownItems" :key="item.label" :class="item.class || null">
+        <a v-if="item.route" class="list-item" :href="item.route">{{ item.label }}</a>
+        <div v-else class="list-item" @click="item.action">{{ item.label }}</div>
       </li>
     </ul>
   </Popover>
diff --git a/frappe/public/less/controls.less b/frappe/public/less/controls.less
index a5c91d4fdc..acf109b5a5 100644
--- a/frappe/public/less/controls.less
+++ b/frappe/public/less/controls.less
@@ -66,12 +66,17 @@
 }
 
 .table-multiselect.form-control input {
+	display: inline-block;
 	outline: none;
 	border: none;
 	padding: 0;
 	font-size: @text-medium;
 }
 
+.table-multiselect .awesomplete {
+	display: inline;
+}
+
 .tb-selected-value {
 	display: inline-block;
 	margin-right: 5px;

From 7517a4ca0f1b67bea5dec22f542861f94af547f9 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 29 Mar 2019 19:05:05 +0530
Subject: [PATCH 164/256] fix: wrapper for '.__'

---
 frappe/model/document.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frappe/model/document.py b/frappe/model/document.py
index 156a8b85af..c71e8e1a16 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -1183,6 +1183,12 @@ class Document(BaseDocument):
 			self.set("__onload", frappe._dict())
 		self.get("__onload")[key] = value
 
+	def get_onload(self, key=None):
+		if not key:
+			return self.get("__onload", frappe._dict())
+
+		return self.get('__onload')[key]
+
 	def update_timeline_doc(self):
 		if frappe.flags.in_install or not self.meta.get("timeline_field"):
 			return

From 80b78c576f9d354e7c77280a683151eb59f11242 Mon Sep 17 00:00:00 2001
From: Kenneth Sequeira <33246109+kennethsequeira@users.noreply.github.com>
Date: Fri, 29 Mar 2019 19:23:39 +0530
Subject: [PATCH 165/256] feat: View Password On Login Page (#7148)

---
 frappe/templates/includes/login/login.css |  9 ++++++++-
 frappe/templates/includes/login/login.js  | 10 ++++++++++
 frappe/www/login.html                     |  9 ++++++---
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/frappe/templates/includes/login/login.css b/frappe/templates/includes/login/login.css
index dc9f487659..21dee49010 100644
--- a/frappe/templates/includes/login/login.css
+++ b/frappe/templates/includes/login/login.css
@@ -129,4 +129,11 @@ p {
 	border: 1px solid  #d1d8dd;
 	padding: 10px;
 	border-radius: 4px;
-}
\ No newline at end of file
+}
+
+.toggle-password {
+  right: 9px;
+  top: 9px;
+  position: absolute;
+  z-index: 2;
+}
diff --git a/frappe/templates/includes/login/login.js b/frappe/templates/includes/login/login.js
index f478263bf7..dd0f57eb4c 100644
--- a/frappe/templates/includes/login/login.js
+++ b/frappe/templates/includes/login/login.js
@@ -56,6 +56,16 @@ login.bind_events = function() {
 		return false;
 	});
 
+	$(".toggle-password").click(function() {
+		$(this).toggleClass("fa-eye fa-eye-slash");
+		var input = $($(this).attr("toggle"));
+		if (input.attr("type") == "password") {
+			input.attr("type", "text");
+		} else {
+			input.attr("type", "password");
+		}
+	});
+
 	{% if ldap_settings %}
 		$(".btn-ldap-login").on("click", function(){
 			var args = {};
diff --git a/frappe/www/login.html b/frappe/www/login.html
index f2c162ceb8..c9d0667bee 100644
--- a/frappe/www/login.html
+++ b/frappe/www/login.html
@@ -21,9 +21,12 @@
 				placeholder="{% if login_name_placeholder %}{{ login_name_placeholder  }}{% else %}{{ _("Email address") }}{% endif %}"
 				required autofocus>
 
-
-			<input type="password" id="login_password"
-				class="form-control" placeholder="{{ _('Password') }}" required>
+			<div class="password-field" style="position: relative;">
+				<input type="password" id="login_password"
+					class="form-control" placeholder="{{ _('Password') }}" required>
+				
+				<span toggle="#login_password" class="fa fa-fw fa-eye toggle-password"></span>
+			</div>
 
 			<button class="btn btn-sm btn-primary btn-block btn-login" type="submit">
 				{{ _("Sign in") }}</button>

From b0f9001c72a147921a118e868bb69158d2db969a Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Fri, 29 Mar 2019 20:05:16 +0530
Subject: [PATCH 166/256] fix: Ignore symlinks during bench build (#7162)

---
 frappe/build.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/build.py b/frappe/build.py
index c3f4bfb47b..265a8c3976 100644
--- a/frappe/build.py
+++ b/frappe/build.py
@@ -117,7 +117,10 @@ def make_asset_dirs(make_copy=False, restore=False):
 							os.unlink(target)
 						else:
 							shutil.rmtree(target)
-					os.symlink(source, target)
+					try:
+						os.symlink(source, target)
+					except OSError:
+						print('Cannot link {} to {}'.format(source, target))
 			else:
 				# warnings.warn('Source {source} does not exist.'.format(source = source))
 				pass

From bca0573373f19aa712a81e61aa0785187b2f5f18 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Fri, 29 Mar 2019 20:13:56 +0530
Subject: [PATCH 167/256] fix: Handle row which can be dict while printing
 (#7161)

---
 .../js/frappe/views/reports/report_view.js      | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 30e254736b..e259309b10 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -859,13 +859,18 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			align,
 			compareValue: compareFn,
 			format: (value, row, column, data) => {
-				const d = row.reduce((acc, curr) => {
-					if (!curr.column.docfield) return acc;
-					acc[curr.column.docfield.fieldname] = curr.content;
-					return acc;
-				}, {});
+				let doc = null;
+				if (Array.isArray(row)) {
+					doc = row.reduce((acc, curr) => {
+						if (!curr.column.docfield) return acc;
+						acc[curr.column.docfield.fieldname] = curr.content;
+						return acc;
+					}, {});
+				} else {
+					doc = row;
+				}
 
-				return frappe.format(value, column.docfield, { always_show_decimals: true }, d);
+				return frappe.format(value, column.docfield, { always_show_decimals: true }, doc);
 			}
 		};
 	}

From a0e7f28438862add4cbbaf06b907fba00a930132 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Fri, 29 Mar 2019 20:17:37 +0530
Subject: [PATCH 168/256] wip

---
 frappe/public/js/frappe/views/components/DeskModuleBox.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/views/components/DeskModuleBox.vue b/frappe/public/js/frappe/views/components/DeskModuleBox.vue
index 3589b3ea12..e57b128033 100644
--- a/frappe/public/js/frappe/views/components/DeskModuleBox.vue
+++ b/frappe/public/js/frappe/views/components/DeskModuleBox.vue
@@ -62,11 +62,11 @@ export default {
       }
 	},
 	dropdown_links() {
-		return this.links
+		return this.links.length > 0 ? this.links
 			.filter(link => !link.hidden)
 			.concat([
 				{ label: __('Customize'), action: () => this.$emit('customize'), class: 'border-top' }
-			]);
+			]) : [];
 	}
   },
 };

From 4a5536c12f3c9f954a174a00ae459dc9a3835dcd Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Fri, 29 Mar 2019 20:21:40 +0530
Subject: [PATCH 169/256] fix: 'wrapper for __onload' (#7160)

---
 frappe/model/document.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frappe/model/document.py b/frappe/model/document.py
index 1d14079866..4b0225bc50 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -1181,6 +1181,12 @@ class Document(BaseDocument):
 			self.set("__onload", frappe._dict())
 		self.get("__onload")[key] = value
 
+	def get_onload(self, key=None):
+		if not key:
+			return self.get("__onload", frappe._dict())
+
+		return self.get('__onload')[key]
+
 	def update_timeline_doc(self):
 		if frappe.flags.in_install or not self.meta.get("timeline_field"):
 			return

From b48755a9a1856bd5428fac89dc2e00ab9c471c29 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Fri, 29 Mar 2019 23:03:42 +0530
Subject: [PATCH 170/256] fix: Handle row which can be dict while printing
 (#7163)

---
 .../js/frappe/views/reports/report_view.js      | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 6e6e4e92ac..0da81fad54 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -859,13 +859,18 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			align,
 			compareValue: compareFn,
 			format: (value, row, column, data) => {
-				const d = row.reduce((acc, curr) => {
-					if (!curr.column.docfield) return acc;
-					acc[curr.column.docfield.fieldname] = curr.content;
-					return acc;
-				}, {});
+				let doc = null;
+				if (Array.isArray(row)) {
+					doc = row.reduce((acc, curr) => {
+						if (!curr.column.docfield) return acc;
+						acc[curr.column.docfield.fieldname] = curr.content;
+						return acc;
+					}, {});
+				} else {
+					doc = row;
+				}
 
-				return frappe.format(value, column.docfield, { always_show_decimals: true }, d);
+				return frappe.format(value, column.docfield, { always_show_decimals: true }, doc);
 			}
 		};
 	}

From 2fa19c25066ed17478d683666895e3266936aee6 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Sat, 30 Mar 2019 11:55:57 +0530
Subject: [PATCH 171/256] fix(blog): Fix possible reflected XSS attack vector

---
 frappe/website/doctype/blog_post/blog_post.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py
index a20e9fa128..e4c757e64b 100644
--- a/frappe/website/doctype/blog_post/blog_post.py
+++ b/frappe/website/doctype/blog_post/blog_post.py
@@ -7,7 +7,7 @@ import frappe
 from frappe import _
 from frappe.website.website_generator import WebsiteGenerator
 from frappe.website.render import clear_cache
-from frappe.utils import today, cint, global_date_format, get_fullname, strip_html_tags, markdown
+from frappe.utils import today, cint, global_date_format, get_fullname, strip_html_tags, markdown, sanitize_html
 from frappe.website.utils import find_first_image, get_comment_list
 
 class BlogPost(WebsiteGenerator):
@@ -95,7 +95,7 @@ def get_list_context(context=None):
 		title = _('Blog')
 	)
 
-	category = frappe.local.form_dict.blog_category or frappe.local.form_dict.category
+	category = sanitize_html(frappe.local.form_dict.blog_category or frappe.local.form_dict.category)
 	if category:
 		category_title = get_blog_category(category)
 		list_context.sub_title = _("Posts filed under {0}").format(category_title)
@@ -107,7 +107,7 @@ def get_list_context(context=None):
 		list_context.title = blogger
 
 	elif frappe.local.form_dict.txt:
-		list_context.sub_title = _('Filtered by "{0}"').format(frappe.local.form_dict.txt)
+		list_context.sub_title = _('Filtered by "{0}"').format(sanitize_html(frappe.local.form_dict.txt))
 
 	if list_context.sub_title:
 		list_context.parents = [{"name": _("Home"), "route": "/"},

From 4a67163e2d12954b1ee44c0606c5e1f94f4b9490 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Sat, 30 Mar 2019 11:55:57 +0530
Subject: [PATCH 172/256] fix(blog): Fix possible reflected XSS attack vector

---
 frappe/website/doctype/blog_post/blog_post.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py
index be1b3201ed..a6758b6b64 100644
--- a/frappe/website/doctype/blog_post/blog_post.py
+++ b/frappe/website/doctype/blog_post/blog_post.py
@@ -7,7 +7,7 @@ import frappe
 from frappe import _
 from frappe.website.website_generator import WebsiteGenerator
 from frappe.website.render import clear_cache
-from frappe.utils import today, cint, global_date_format, get_fullname, strip_html_tags, markdown
+from frappe.utils import today, cint, global_date_format, get_fullname, strip_html_tags, markdown, sanitize_html
 from frappe.website.utils import (find_first_image, get_html_content_based_on_type,
 	get_comment_list)
 
@@ -102,7 +102,7 @@ def get_list_context(context=None):
 		title = _('Blog')
 	)
 
-	category = frappe.local.form_dict.blog_category or frappe.local.form_dict.category
+	category = sanitize_html(frappe.local.form_dict.blog_category or frappe.local.form_dict.category)
 	if category:
 		category_title = get_blog_category(category)
 		list_context.sub_title = _("Posts filed under {0}").format(category_title)
@@ -114,7 +114,7 @@ def get_list_context(context=None):
 		list_context.title = blogger
 
 	elif frappe.local.form_dict.txt:
-		list_context.sub_title = _('Filtered by "{0}"').format(frappe.local.form_dict.txt)
+		list_context.sub_title = _('Filtered by "{0}"').format(sanitize_html(frappe.local.form_dict.txt))
 
 	if list_context.sub_title:
 		list_context.parents = [{"name": _("Home"), "route": "/"},

From fac0ddf62f02dae07afa80d40c8e7de1df459907 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Sat, 30 Mar 2019 15:29:37 +0600
Subject: [PATCH 173/256] bumped to version 11.1.18

---
 frappe/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index c1bf81ab52..65a7fc818c 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -24,7 +24,7 @@ if sys.version[0] == '2':
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '11.1.17'
+__version__ = '11.1.18'
 __title__ = "Frappe Framework"
 
 local = Local()

From 4ebaf098ee8f20e550c99b69532b26ccb3556d01 Mon Sep 17 00:00:00 2001
From: pipeCh <pipech@gmail.com>
Date: Sat, 30 Mar 2019 16:59:20 +0700
Subject: [PATCH 174/256] fix(workflow): fixed workflow btn doesn't setup
 properly

---
 frappe/public/js/frappe/form/workflow.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/form/workflow.js b/frappe/public/js/frappe/form/workflow.js
index 044d5b53ac..115ad5e702 100644
--- a/frappe/public/js/frappe/form/workflow.js
+++ b/frappe/public/js/frappe/form/workflow.js
@@ -68,8 +68,8 @@ frappe.ui.form.States = Class.extend({
 	},
 
 	show_actions: function() {
-		var added = false,
-			me = this;
+		var added = false;
+		var me = this;
 
 		this.frm.page.clear_actions_menu();
 
@@ -103,10 +103,15 @@ frappe.ui.form.States = Class.extend({
 					});
 				}
 			});
+			this.setup_btn(added);
 		});
 
-		if(added) {
+	},
+
+	setup_btn: function(action_added) {
+		if(action_added) {
 			this.frm.page.btn_primary.addClass("hide");
+			this.frm.page.btn_secondary.addClass("hide");
 			this.frm.toolbar.current_status = "";
 			this.setup_help();
 		}

From da9ae10946bedb7c6679cb1005eb9c2be522e4fc Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sat, 30 Mar 2019 18:37:50 +0530
Subject: [PATCH 175/256] fix: Datatable fixes

- Remove minWidth limit
- Double click to resize to perfect width
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 1914cb0180..bd3d18bef1 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "awesomplete": "^1.1.2",
     "cookie": "^0.3.1",
     "express": "^4.16.2",
-    "frappe-datatable": "^1.8.0",
+    "frappe-datatable": "^1.10.0",
     "frappe-gantt": "^0.1.0",
     "fuse.js": "^3.2.0",
     "highlight.js": "^9.12.0",
diff --git a/yarn.lock b/yarn.lock
index 8ebc20911b..d92865228a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1219,10 +1219,10 @@ forwarded@~0.1.2:
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
   integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
 
-frappe-datatable@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.8.0.tgz#7f789ed77bdf9800143fffb1bb28a24d5dbdc27c"
-  integrity sha512-j3DdmYtTjhcVXCVkYjKHdZOc8tSwZapanlujdx1xzXcL7Ueo+BFiPR5WptWRfH43K3nboh3m7clcAIX7LdQR4g==
+frappe-datatable@^1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.10.0.tgz#915a7a6754cf6b66dbf7b07323a381e760a74221"
+  integrity sha512-xuiFvDUSgKIaG0vZZvQsKLs5LUqFfo5nSE+wzBwEzE5iytBaJfKXzqud71AtqteQ0CCrEe9P/tMD+hZfcnbh/Q==
   dependencies:
     hyperlist "^1.0.0-beta"
     lodash "^4.17.5"

From b23347d0d3c72a807ec839f6360600b5f38af3df Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sat, 30 Mar 2019 23:16:28 +0530
Subject: [PATCH 176/256] fix: Save column widths in Custom Reports

---
 frappe/public/js/frappe/list/base_list.js     |  5 ++
 frappe/public/js/frappe/misc/utils.js         | 60 +++++++++++++++++++
 .../js/frappe/views/reports/report_view.js    | 45 ++++++++++----
 3 files changed, 99 insertions(+), 11 deletions(-)

diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index 00d8d1686f..d702020c52 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -365,6 +365,7 @@ frappe.views.BaseList = class BaseList {
 			this.toggle_result_area();
 			this.before_render();
 			this.render();
+			this.after_render();
 			this.freeze(false);
 		});
 	}
@@ -390,6 +391,10 @@ frappe.views.BaseList = class BaseList {
 
 	}
 
+	after_render() {
+
+	}
+
 	render() {
 		// for child classes
 	}
diff --git a/frappe/public/js/frappe/misc/utils.js b/frappe/public/js/frappe/misc/utils.js
index e038552fe4..655f9f1317 100644
--- a/frappe/public/js/frappe/misc/utils.js
+++ b/frappe/public/js/frappe/misc/utils.js
@@ -668,6 +668,66 @@ Object.assign(frappe.utils, {
 		} else {
 			return null;
 		}
+	},
+
+	deep_equal(a, b) {
+		// https://github.com/epoberezkin/fast-deep-equal/blob/master/index.js
+
+		var isArray = Array.isArray;
+		var keyList = Object.keys;
+		var hasProp = Object.prototype.hasOwnProperty;
+
+		function equal(a, b) {
+			if (a === b) return true;
+
+			if (a && b && typeof a == 'object' && typeof b == 'object') {
+				var arrA = isArray(a)
+				, arrB = isArray(b)
+				, i
+				, length
+				, key;
+
+				if (arrA && arrB) {
+					length = a.length;
+					if (length != b.length) return false;
+					for (i = length; i-- !== 0;)
+						if (!equal(a[i], b[i])) return false;
+					return true;
+				}
+
+				if (arrA != arrB) return false;
+
+				var dateA = a instanceof Date
+				, dateB = b instanceof Date;
+				if (dateA != dateB) return false;
+				if (dateA && dateB) return a.getTime() == b.getTime();
+
+				var regexpA = a instanceof RegExp
+				, regexpB = b instanceof RegExp;
+				if (regexpA != regexpB) return false;
+				if (regexpA && regexpB) return a.toString() == b.toString();
+
+				var keys = keyList(a);
+				length = keys.length;
+
+				if (length !== keyList(b).length)
+					return false;
+
+				for (i = length; i-- !== 0;)
+					if (!hasProp.call(b, keys[i])) return false;
+
+				for (i = length; i-- !== 0;) {
+					key = keys[i];
+					if (!equal(a[key], b[key])) return false;
+				}
+
+				return true;
+			}
+
+			return a!==a && b!==b;
+		};
+
+		return equal(a, b)
 	}
 });
 
diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 30e254736b..5d599e4fb9 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -76,7 +76,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 		return super.before_refresh();
 	}
 
-	before_render() {
+	after_render() {
 		if (this.report_doc) {
 			this.set_dirty_state_for_custom_report();
 		} else {
@@ -85,23 +85,25 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 	}
 
 	set_dirty_state_for_custom_report() {
-		const json = JSON.stringify({
+		let current_settings = {
 			filters: this.filter_area.get(),
 			fields: this.fields,
 			order_by: this.sort_selector.get_sql_string(),
 			add_totals_row: this.add_totals_row,
-			page_length: this.page_length
-		});
+			page_length: this.page_length,
+			column_widths: this.get_column_widths()
+		}
 
-		const report_json = JSON.stringify({
+		let report_settings = {
 			filters: this.report_doc.json.filters,
 			fields: this.report_doc.json.fields,
 			order_by: this.report_doc.json.order_by,
 			add_totals_row: this.report_doc.json.add_totals_row,
-			page_length: this.report_doc.json.page_length
-		});
+			page_length: this.report_doc.json.page_length,
+			column_widths: this.report_doc.json.column_widths
+		}
 
-		if (json != report_json) {
+		if (!frappe.utils.deep_equal(current_settings, report_settings)) {
 			this.page.set_indicator(__('Not Saved'), 'orange');
 		} else {
 			this.page.clear_indicator();
@@ -830,11 +832,16 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			return docfield.fieldtype === 'Date' ? 'right' : 'left';
 		})();
 
-		const width = (docfield ? cint(docfield.width) : null) || null;
-
 		// child table column
 		const id = doctype !== this.doctype ? `${doctype}:${fieldname}` : fieldname;
 
+		let width = (docfield ? cint(docfield.width) : null) || null;
+		if (this.report_doc) {
+			// load the user saved column width
+			let saved_column_widths = this.report_doc.json.column_widths || {};
+			width = saved_column_widths[id] || width;
+		}
+
 		let compareFn = null;
 		if (docfield.fieldtype === 'Date') {
 			compareFn = (cell, keyword) => {
@@ -945,7 +952,8 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 				fields: this.fields,
 				order_by: this.sort_selector.get_sql_string(),
 				add_totals_row: this.add_totals_row,
-				page_length: this.page_length
+				page_length: this.page_length,
+				column_widths: this.get_column_widths()
 			}
 
 			return frappe.call({
@@ -970,6 +978,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 						};
 						this.list_sidebar.setup_reports();
 						frappe.set_route('List', this.doctype, 'Report', r.message);
+						return;
 					}
 
 					// update state
@@ -989,6 +998,20 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 		}
 	}
 
+	get_column_widths() {
+		if (this.datatable) {
+			return this.datatable
+				.datamanager
+				.getColumns(true)
+				.reduce((acc, curr) => {
+					acc[curr.id] = parseInt(curr.width);
+					return acc;
+				}, {});
+		}
+
+		return {};
+	}
+
 	get_report_doc() {
 		return new Promise(resolve => {
 			frappe.model.with_doc('Report', this.report_name, () => {

From fd43685695c9119b20e49a7370b32b7f91de8914 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sat, 30 Mar 2019 18:37:50 +0530
Subject: [PATCH 177/256] fix: Datatable fixes

- Remove minWidth limit
- Double click to resize to perfect width
---
 package.json | 2 +-
 yarn.lock    | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index b3bbda7cef..df8e65167d 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "bootstrap": "^4.3.1",
     "cookie": "^0.3.1",
     "express": "^4.16.2",
-    "frappe-datatable": "^1.8.0",
+    "frappe-datatable": "^1.10.0",
     "frappe-gantt": "^0.1.0",
     "fuse.js": "^3.2.0",
     "highlight.js": "^9.12.0",
diff --git a/yarn.lock b/yarn.lock
index 0f3d84503d..bf1904c5c1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1715,6 +1715,7 @@ forwarded@~0.1.2:
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
   integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
 
+
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
@@ -1722,10 +1723,10 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
-frappe-datatable@^1.8.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.9.0.tgz#63d6f2af0b6ea00f9b66bb3e55606f5d82b5644b"
-  integrity sha512-dEKUc8svDH2AoAlcHT4q3DA8Zo0kU3ihrpe9I2VqYKmmygltLXCH5iw3k3IZBVBy17hH49JtzAKGky0OazINHA==
+frappe-datatable@^1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.10.0.tgz#915a7a6754cf6b66dbf7b07323a381e760a74221"
+  integrity sha512-xuiFvDUSgKIaG0vZZvQsKLs5LUqFfo5nSE+wzBwEzE5iytBaJfKXzqud71AtqteQ0CCrEe9P/tMD+hZfcnbh/Q==
   dependencies:
     hyperlist "^1.0.0-beta"
     lodash "^4.17.5"

From 5d195e4157d31641dc99b7cf3cc80edbdf65a578 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sat, 30 Mar 2019 23:16:28 +0530
Subject: [PATCH 178/256] fix: Save column widths in Custom Reports

---
 frappe/public/js/frappe/list/base_list.js     |  5 ++
 frappe/public/js/frappe/misc/utils.js         | 60 +++++++++++++++++++
 .../js/frappe/views/reports/report_view.js    | 45 ++++++++++----
 3 files changed, 99 insertions(+), 11 deletions(-)

diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index d92ca100ce..0e18993349 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -365,6 +365,7 @@ frappe.views.BaseList = class BaseList {
 			this.toggle_result_area();
 			this.before_render();
 			this.render();
+			this.after_render();
 			this.freeze(false);
 			if (this.settings.refresh) {
 				this.settings.refresh(this);
@@ -393,6 +394,10 @@ frappe.views.BaseList = class BaseList {
 
 	}
 
+	after_render() {
+
+	}
+
 	render() {
 		// for child classes
 	}
diff --git a/frappe/public/js/frappe/misc/utils.js b/frappe/public/js/frappe/misc/utils.js
index 7bbd63a0a8..8bed1e03a2 100644
--- a/frappe/public/js/frappe/misc/utils.js
+++ b/frappe/public/js/frappe/misc/utils.js
@@ -682,6 +682,66 @@ Object.assign(frappe.utils, {
 		} else {
 			return null;
 		}
+	},
+
+	deep_equal(a, b) {
+		// https://github.com/epoberezkin/fast-deep-equal/blob/master/index.js
+
+		var isArray = Array.isArray;
+		var keyList = Object.keys;
+		var hasProp = Object.prototype.hasOwnProperty;
+
+		function equal(a, b) {
+			if (a === b) return true;
+
+			if (a && b && typeof a == 'object' && typeof b == 'object') {
+				var arrA = isArray(a)
+				, arrB = isArray(b)
+				, i
+				, length
+				, key;
+
+				if (arrA && arrB) {
+					length = a.length;
+					if (length != b.length) return false;
+					for (i = length; i-- !== 0;)
+						if (!equal(a[i], b[i])) return false;
+					return true;
+				}
+
+				if (arrA != arrB) return false;
+
+				var dateA = a instanceof Date
+				, dateB = b instanceof Date;
+				if (dateA != dateB) return false;
+				if (dateA && dateB) return a.getTime() == b.getTime();
+
+				var regexpA = a instanceof RegExp
+				, regexpB = b instanceof RegExp;
+				if (regexpA != regexpB) return false;
+				if (regexpA && regexpB) return a.toString() == b.toString();
+
+				var keys = keyList(a);
+				length = keys.length;
+
+				if (length !== keyList(b).length)
+					return false;
+
+				for (i = length; i-- !== 0;)
+					if (!hasProp.call(b, keys[i])) return false;
+
+				for (i = length; i-- !== 0;) {
+					key = keys[i];
+					if (!equal(a[key], b[key])) return false;
+				}
+
+				return true;
+			}
+
+			return a!==a && b!==b;
+		};
+
+		return equal(a, b)
 	}
 });
 
diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 0da81fad54..79b773316d 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -76,7 +76,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 		return super.before_refresh();
 	}
 
-	before_render() {
+	after_render() {
 		if (this.report_doc) {
 			this.set_dirty_state_for_custom_report();
 		} else {
@@ -85,23 +85,25 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 	}
 
 	set_dirty_state_for_custom_report() {
-		const json = JSON.stringify({
+		let current_settings = {
 			filters: this.filter_area.get(),
 			fields: this.fields,
 			order_by: this.sort_selector.get_sql_string(),
 			add_totals_row: this.add_totals_row,
-			page_length: this.page_length
-		});
+			page_length: this.page_length,
+			column_widths: this.get_column_widths()
+		}
 
-		const report_json = JSON.stringify({
+		let report_settings = {
 			filters: this.report_doc.json.filters,
 			fields: this.report_doc.json.fields,
 			order_by: this.report_doc.json.order_by,
 			add_totals_row: this.report_doc.json.add_totals_row,
-			page_length: this.report_doc.json.page_length
-		});
+			page_length: this.report_doc.json.page_length,
+			column_widths: this.report_doc.json.column_widths
+		}
 
-		if (json != report_json) {
+		if (!frappe.utils.deep_equal(current_settings, report_settings)) {
 			this.page.set_indicator(__('Not Saved'), 'orange');
 		} else {
 			this.page.clear_indicator();
@@ -830,11 +832,16 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			return docfield.fieldtype === 'Date' ? 'right' : 'left';
 		})();
 
-		const width = (docfield ? cint(docfield.width) : null) || null;
-
 		// child table column
 		const id = doctype !== this.doctype ? `${doctype}:${fieldname}` : fieldname;
 
+		let width = (docfield ? cint(docfield.width) : null) || null;
+		if (this.report_doc) {
+			// load the user saved column width
+			let saved_column_widths = this.report_doc.json.column_widths || {};
+			width = saved_column_widths[id] || width;
+		}
+
 		let compareFn = null;
 		if (docfield.fieldtype === 'Date') {
 			compareFn = (cell, keyword) => {
@@ -950,7 +957,8 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 				fields: this.fields,
 				order_by: this.sort_selector.get_sql_string(),
 				add_totals_row: this.add_totals_row,
-				page_length: this.page_length
+				page_length: this.page_length,
+				column_widths: this.get_column_widths()
 			}
 
 			return frappe.call({
@@ -975,6 +983,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 						};
 						this.list_sidebar.setup_reports();
 						frappe.set_route('List', this.doctype, 'Report', r.message);
+						return;
 					}
 
 					// update state
@@ -994,6 +1003,20 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 		}
 	}
 
+	get_column_widths() {
+		if (this.datatable) {
+			return this.datatable
+				.datamanager
+				.getColumns(true)
+				.reduce((acc, curr) => {
+					acc[curr.id] = parseInt(curr.width);
+					return acc;
+				}, {});
+		}
+
+		return {};
+	}
+
 	get_report_doc() {
 		return new Promise(resolve => {
 			frappe.model.with_doc('Report', this.report_name, () => {

From 1dc1801cfb10f3dbc49409b6b4181f2f221e6ea8 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sat, 30 Mar 2019 23:29:42 +0530
Subject: [PATCH 179/256] fix: Disable linting on deep_equal util

---
 frappe/public/js/frappe/misc/utils.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/misc/utils.js b/frappe/public/js/frappe/misc/utils.js
index 8bed1e03a2..aa48adc47f 100644
--- a/frappe/public/js/frappe/misc/utils.js
+++ b/frappe/public/js/frappe/misc/utils.js
@@ -686,7 +686,7 @@ Object.assign(frappe.utils, {
 
 	deep_equal(a, b) {
 		// https://github.com/epoberezkin/fast-deep-equal/blob/master/index.js
-
+		/* eslint-disable */
 		var isArray = Array.isArray;
 		var keyList = Object.keys;
 		var hasProp = Object.prototype.hasOwnProperty;
@@ -742,6 +742,7 @@ Object.assign(frappe.utils, {
 		};
 
 		return equal(a, b)
+		/* eslint-enable */
 	}
 });
 

From 1bc8e53d011d7bfa5076b7d6fde2bc7ebac5f411 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sat, 30 Mar 2019 23:29:42 +0530
Subject: [PATCH 180/256] fix: Disable linting on deep_equal util

---
 frappe/public/js/frappe/misc/utils.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/misc/utils.js b/frappe/public/js/frappe/misc/utils.js
index 655f9f1317..f6e5a6e27b 100644
--- a/frappe/public/js/frappe/misc/utils.js
+++ b/frappe/public/js/frappe/misc/utils.js
@@ -672,7 +672,7 @@ Object.assign(frappe.utils, {
 
 	deep_equal(a, b) {
 		// https://github.com/epoberezkin/fast-deep-equal/blob/master/index.js
-
+		/* eslint-disable */
 		var isArray = Array.isArray;
 		var keyList = Object.keys;
 		var hasProp = Object.prototype.hasOwnProperty;
@@ -728,6 +728,7 @@ Object.assign(frappe.utils, {
 		};
 
 		return equal(a, b)
+		/* eslint-enable */
 	}
 });
 

From b7c273f5481c66b91e6f1363bdf2540707c6c311 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Sat, 30 Mar 2019 23:39:47 +0530
Subject: [PATCH 181/256] fix: Over usage of space was not handled (#7123)

- Show a message to buy space if space is overused
---
 frappe/core/page/usage_info/usage_info.html | 11 +-------
 frappe/core/page/usage_info/usage_info.js   | 28 ++++++++++++++++++++-
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/frappe/core/page/usage_info/usage_info.html b/frappe/core/page/usage_info/usage_info.html
index 40efd7a062..e4851d8f63 100644
--- a/frappe/core/page/usage_info/usage_info.html
+++ b/frappe/core/page/usage_info/usage_info.html
@@ -46,10 +46,6 @@
 	<div class="usage-info-section" style="margin: 30px;">
 	    <h4>{{ __("Space") }}</h4>
 
-	    {% var database_percent = ((limits.space_usage.database_size / limits.space) * 100); %}
-	    {% var files_percent = ((limits.space_usage.files_size / limits.space) * 100); %}
-	    {% var backup_percent = ((limits.space_usage.backup_size / limits.space) * 100); %}
-
 	    <div class="progress" style="margin-bottom: 0;">
 	        <div class="progress-bar" style="width: {%= database_percent %}%; background-color: #5e64ff"></div>
 	        <div class="progress-bar" style="width: {%= files_percent %}%; background-color: #743ee2"></div>
@@ -66,12 +62,7 @@
 			{{ __("Backup Size:") }} {%= limits.space_usage.backup_size %} MB
 		</span>
 
-		<p>
-			<span class="{%= ((limits.space - limits.space_usage.total) > 50) ? "" : "text-warning" %}">
-	                    <b>{%= flt(limits.space - limits.space_usage.total, 2) %} MB</b></span>
-			available out of
-			<span><b>{%= limits.space %} MB</b></span>
-		</p>
+		<p>{{ usage_message }}</p>
 	</div>
 	{% endif %}
 </div>
diff --git a/frappe/core/page/usage_info/usage_info.js b/frappe/core/page/usage_info/usage_info.js
index 5137eeac6a..eec5411ca4 100644
--- a/frappe/core/page/usage_info/usage_info.js
+++ b/frappe/core/page/usage_info/usage_info.js
@@ -15,7 +15,33 @@ frappe.pages['usage-info'].on_page_load = function(wrapper) {
 				return;
 			}
 
-			$(frappe.render_template("usage_info", usage_info)).appendTo(page.main);
+			let limits = usage_info.limits;
+			let database_percent = (limits.space_usage.database_size / limits.space) * 100;
+			let files_percent = (limits.space_usage.files_size / limits.space) * 100;
+			let backup_percent = (limits.space_usage.backup_size / limits.space) * 100;
+
+			let total_consumed = database_percent + files_percent + backup_percent;
+
+			let last_part = backup_percent;
+			if (total_consumed > 100) {
+				last_part = backup_percent - (total_consumed - 100);
+			}
+			backup_percent = last_part;
+
+			let usage_message = '';
+			if (limits.space_usage.total > limits.space) {
+				usage_message = __('You have used up all of the space allotted to you. Please buy more space in your subscription.');
+			} else {
+				let available = flt(limits.space - limits.space_usage.total, 2);
+				usage_message = __('{0} available out of {1}', [(available + ' MB').bold(), (limits.space + ' MB').bold()]);
+			}
+
+			$(frappe.render_template("usage_info", Object.assign(usage_info, {
+				database_percent,
+				files_percent,
+				backup_percent,
+				usage_message
+			}))).appendTo(page.main);
 
 			var btn_text = usage_info.limits.users == 1 ? __("Upgrade") : __("Renew / Upgrade");
 			$(page.main).find('.btn-primary').html(btn_text).on('click', () => {

From 6f4ef89fb754fcc15910c3c434b022408b3fe4bb Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Sat, 30 Mar 2019 23:40:14 +0530
Subject: [PATCH 182/256] fix: Over usage of space was not handled (#7124)

- Show a message to buy space if space is overused
---
 frappe/core/page/usage_info/usage_info.html | 11 +-------
 frappe/core/page/usage_info/usage_info.js   | 28 ++++++++++++++++++++-
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/frappe/core/page/usage_info/usage_info.html b/frappe/core/page/usage_info/usage_info.html
index 40efd7a062..e4851d8f63 100644
--- a/frappe/core/page/usage_info/usage_info.html
+++ b/frappe/core/page/usage_info/usage_info.html
@@ -46,10 +46,6 @@
 	<div class="usage-info-section" style="margin: 30px;">
 	    <h4>{{ __("Space") }}</h4>
 
-	    {% var database_percent = ((limits.space_usage.database_size / limits.space) * 100); %}
-	    {% var files_percent = ((limits.space_usage.files_size / limits.space) * 100); %}
-	    {% var backup_percent = ((limits.space_usage.backup_size / limits.space) * 100); %}
-
 	    <div class="progress" style="margin-bottom: 0;">
 	        <div class="progress-bar" style="width: {%= database_percent %}%; background-color: #5e64ff"></div>
 	        <div class="progress-bar" style="width: {%= files_percent %}%; background-color: #743ee2"></div>
@@ -66,12 +62,7 @@
 			{{ __("Backup Size:") }} {%= limits.space_usage.backup_size %} MB
 		</span>
 
-		<p>
-			<span class="{%= ((limits.space - limits.space_usage.total) > 50) ? "" : "text-warning" %}">
-	                    <b>{%= flt(limits.space - limits.space_usage.total, 2) %} MB</b></span>
-			available out of
-			<span><b>{%= limits.space %} MB</b></span>
-		</p>
+		<p>{{ usage_message }}</p>
 	</div>
 	{% endif %}
 </div>
diff --git a/frappe/core/page/usage_info/usage_info.js b/frappe/core/page/usage_info/usage_info.js
index 5137eeac6a..eec5411ca4 100644
--- a/frappe/core/page/usage_info/usage_info.js
+++ b/frappe/core/page/usage_info/usage_info.js
@@ -15,7 +15,33 @@ frappe.pages['usage-info'].on_page_load = function(wrapper) {
 				return;
 			}
 
-			$(frappe.render_template("usage_info", usage_info)).appendTo(page.main);
+			let limits = usage_info.limits;
+			let database_percent = (limits.space_usage.database_size / limits.space) * 100;
+			let files_percent = (limits.space_usage.files_size / limits.space) * 100;
+			let backup_percent = (limits.space_usage.backup_size / limits.space) * 100;
+
+			let total_consumed = database_percent + files_percent + backup_percent;
+
+			let last_part = backup_percent;
+			if (total_consumed > 100) {
+				last_part = backup_percent - (total_consumed - 100);
+			}
+			backup_percent = last_part;
+
+			let usage_message = '';
+			if (limits.space_usage.total > limits.space) {
+				usage_message = __('You have used up all of the space allotted to you. Please buy more space in your subscription.');
+			} else {
+				let available = flt(limits.space - limits.space_usage.total, 2);
+				usage_message = __('{0} available out of {1}', [(available + ' MB').bold(), (limits.space + ' MB').bold()]);
+			}
+
+			$(frappe.render_template("usage_info", Object.assign(usage_info, {
+				database_percent,
+				files_percent,
+				backup_percent,
+				usage_message
+			}))).appendTo(page.main);
 
 			var btn_text = usage_info.limits.users == 1 ? __("Upgrade") : __("Renew / Upgrade");
 			$(page.main).find('.btn-primary').html(btn_text).on('click', () => {

From eae217eaa948c9ec69ef0ffa4985cba28b79cb8b Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sun, 31 Mar 2019 16:42:45 +0530
Subject: [PATCH 183/256] fix: Energy point UX (#7164)

- Make user mandatory
- Allow data fieldtype for user_field
- Change fieldtype of user selection from select to autocomplete
- Put create_energy_points_log inside try catch to avoid document save failure
---
 frappe/public/js/frappe/form/review.js           |  2 +-
 .../energy_point_log/energy_point_log.json       |  4 ++--
 .../energy_point_rule/energy_point_rule.js       |  3 ++-
 .../energy_point_rule/energy_point_rule.py       | 16 +++++++++-------
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/frappe/public/js/frappe/form/review.js b/frappe/public/js/frappe/form/review.js
index 13cf55848e..809c5b1507 100644
--- a/frappe/public/js/frappe/form/review.js
+++ b/frappe/public/js/frappe/form/review.js
@@ -71,7 +71,7 @@ frappe.ui.form.Review = class Review {
 			'title': __('Add Review'),
 			'fields': [{
 				fieldname: 'to_user',
-				fieldtype: 'Select',
+				fieldtype: 'Autocomplete',
 				label: __('To User'),
 				options: user_options,
 				default: user_options.includes(doc_owner) ? doc_owner : user_options[0],
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.json b/frappe/social/doctype/energy_point_log/energy_point_log.json
index aa5d5946cf..1c92fda300 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.json
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.json
@@ -41,7 +41,7 @@
    "read_only": 1,
    "remember_last_selected_value": 0,
    "report_hide": 0,
-   "reqd": 0,
+   "reqd": 1,
    "search_index": 1,
    "set_only_once": 0,
    "translatable": 0,
@@ -259,7 +259,7 @@
  "istable": 0,
  "max_attachments": 0,
  "menu_index": 0,
- "modified": "2019-03-27 23:49:54.841493",
+ "modified": "2019-03-29 20:01:05.503043",
  "modified_by": "Administrator",
  "module": "Social",
  "name": "Energy Point Log",
diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.js b/frappe/social/doctype/energy_point_rule/energy_point_rule.js
index 31b043d384..c67c95f836 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.js
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.js
@@ -15,7 +15,8 @@ frappe.ui.form.on('Energy Point Rule', {
 		frappe.model.with_doctype(reference_doctype, () => {
 			const map_for_options = df => ({ label: df.label, value: df.fieldname });
 			const fields = frappe.meta.get_docfields(frm.doc.reference_doctype);
-			const user_fields = fields.filter(df => df.fieldtype === 'Link' && df.options === 'User')
+			const user_fields = fields.filter(df => (df.fieldtype === 'Link' && df.options === 'User')
+				|| df.fieldtype === 'Data')
 				.map(map_for_options)
 				.concat([{label: __('Owner'), value: 'owner'}]);
 
diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
index 2795ceb249..14dd988b26 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
@@ -14,7 +14,7 @@ class EnergyPointRule(Document):
 			multiplier = 1
 
 			if self.multiplier_field:
-				multiplier = doc.get(self.multiplier_field, 1)
+				multiplier = doc.get(self.multiplier_field) or 1
 
 			points = round(self.points * multiplier)
 			reference_doctype = doc.doctype
@@ -24,12 +24,14 @@ class EnergyPointRule(Document):
 
 			# incase of zero as result after roundoff
 			if not points: return
-
-			create_energy_points_log(reference_doctype, reference_name, {
-				'points': points,
-				'user': user,
-				'rule': rule
-			})
+			try:
+				create_energy_points_log(reference_doctype, reference_name, {
+					'points': points,
+					'user': user,
+					'rule': rule
+				})
+			except Exception as e:
+				frappe.log_error('apply_energy_point', e)
 
 
 def process_energy_points(doc, state):

From f7408d4d1cdb3af2ea3a1cbda5a0a2ffbe404abe Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sun, 31 Mar 2019 17:18:22 +0530
Subject: [PATCH 184/256] fix: Revert Multiselect, add MultiSelectPills

MultiSelect with pills doesn't work well in Report filters. So we
introduce another control which can be used wherever appropriate.
---
 frappe/public/build.json                      |   3 +-
 .../js/frappe/form/controls/multiselect.js    | 131 ++++-----------
 .../frappe/form/controls/multiselect_pills.js | 150 ++++++++++++++++++
 .../frappe/views/components/DeskSection.vue   |   2 +-
 4 files changed, 186 insertions(+), 100 deletions(-)
 create mode 100644 frappe/public/js/frappe/form/controls/multiselect_pills.js

diff --git a/frappe/public/build.json b/frappe/public/build.json
index 73a9fae189..f1b5420f3e 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -93,7 +93,8 @@
 		"public/js/frappe/form/controls/geolocation.js",
 		"public/js/frappe/form/controls/multiselect.js",
 		"public/js/frappe/form/controls/multicheck.js",
-		"public/js/frappe/form/controls/table_multiselect.js"
+		"public/js/frappe/form/controls/table_multiselect.js",
+		"public/js/frappe/form/controls/multiselect_pills.js"
 	],
 	"js/dialog.min.js": [
 		"public/js/frappe/dom.js",
diff --git a/frappe/public/js/frappe/form/controls/multiselect.js b/frappe/public/js/frappe/form/controls/multiselect.js
index 93bcd2ca15..64ca4fc83d 100644
--- a/frappe/public/js/frappe/form/controls/multiselect.js
+++ b/frappe/public/js/frappe/form/controls/multiselect.js
@@ -1,93 +1,6 @@
 import Awesomplete from 'awesomplete';
 
 frappe.ui.form.ControlMultiSelect = frappe.ui.form.ControlAutocomplete.extend({
-	make_input() {
-		this._super();
-		this.$input_area = $(this.input_area);
-		this.$input_area.addClass('form-control table-multiselect');
-		this.$input.removeClass('form-control');
-
-		this.$input.on("awesomplete-selectcomplete", () => {
-			this.$input.val('').focus();
-		});
-
-		// used as an internal model to store values
-		this.rows = [];
-
-		this.$input_area.on('click', '.btn-remove', (e) => {
-			const $target = $(e.currentTarget);
-			const $value = $target.closest('.tb-selected-value');
-
-			const value = decodeURIComponent($value.data().value);
-			this.rows = this.rows.filter(val => val !== value);
-
-			this.parse_validate_and_set_in_model('');
-		});
-
-		this.$input.on('keydown', e => {
-			// if backspace key pressed on empty input, delete last value
-			if (e.keyCode == frappe.ui.keyCode.BACKSPACE && e.target.value === '') {
-				this.rows = this.rows.slice(0, this.rows.length - 1);
-				this.parse_validate_and_set_in_model('');
-			}
-		});
-	},
-
-	parse(value) {
-		if (value) {
-			this.rows.push(value);
-		}
-
-		return this.rows;
-	},
-
-	validate(value) {
-		const rows = (value || []).slice();
-
-		if (rows.length === 0) {
-			return rows;
-		}
-
-		const all_rows_except_last = rows.slice(0, rows.length - 1);
-		const last_value = rows[rows.length - 1];
-
-		// falsy value
-		if (!last_value) {
-			return all_rows_except_last;
-		}
-
-		// duplicate value
-		if (all_rows_except_last.includes(last_value)) {
-			return all_rows_except_last;
-		}
-
-		return rows;
-	},
-
-	set_formatted_input(value) {
-		this.rows = value || [];
-		this.set_pill_html(this.rows);
-	},
-
-	set_pill_html(values) {
-		const html = values
-			.map(value => this.get_pill_html(value))
-			.join('');
-
-		this.$input_area.find('.tb-selected-value').remove();
-		this.$input_area.prepend(html);
-	},
-
-	get_pill_html(value) {
-		const encoded_value = encodeURIComponent(value);
-		return `<div class="btn-group tb-selected-value" data-value="${encoded_value}">
-			<button class="btn btn-default btn-xs btn-link-to-form">${__(value)}</button>
-			<button class="btn btn-default btn-xs btn-remove">
-				<i class="fa fa-remove text-muted"></i>
-			</button>
-		</div>`;
-	},
-
 	get_awesomplete_settings() {
 		const settings = this._super();
 
@@ -110,37 +23,59 @@ frappe.ui.form.ControlMultiSelect = frappe.ui.form.ControlAutocomplete.extend({
 				}
 
 				return v;
+			},
+
+			replace: function(text) {
+				const before = this.input.value.match(/^.+,\s*|/)[0];
+				this.input.value = before + text + ", ";
 			}
 		});
 	},
 
 	get_value() {
-		return this.rows;
+		let data = this._super();
+		// find value of label from option list and return actual value string
+		if (this.df.options && this.df.options.length && this.df.options[0].label) {
+			data = data.split(',').map(op => op.trim());
+			data = data.map(val => {
+				let option = this.df.options.find(op => op.label === val);
+				return option ? option.value : null;
+			}).filter(n => n != null).join(', ');
+		}
+		return data;
+	},
+
+	set_formatted_input(value) {
+		if (!value) return;
+		// find label of value from option list and set from it as input
+		if (this.df.options && this.df.options.length && this.df.options[0].label) {
+			value = value.split(',').map(d => d.trim()).map(val => {
+				let option = this.df.options.find(op => op.value === val);
+				return option ? option.label : val;
+			}).filter(n => n != null).join(', ');
+		}
+		this._super(value);
 	},
 
 	get_values() {
-		return this.rows;
+		const value = this.get_value() || '';
+		const values = value.split(/\s*,\s*/).filter(d => d);
+
+		return values;
 	},
 
 	get_data() {
 		let data;
 		if(this.df.get_data) {
 			data = this.df.get_data();
-			if (data && data.then) {
-				data.then((r) => {
-					this.set_data(r);
-				});
-				data = this.get_value();
-			} else {
-				this.set_data(data);
-			}
+			this.set_data(data);
 		} else {
 			data = this._super();
 		}
 		const values = this.get_values() || [];
 
 		// return values which are not already selected
-		if (data) data.filter(d => !values.includes(d));
+		if(data) data.filter(d => !values.includes(d));
 		return data;
 	}
 });
diff --git a/frappe/public/js/frappe/form/controls/multiselect_pills.js b/frappe/public/js/frappe/form/controls/multiselect_pills.js
new file mode 100644
index 0000000000..8796c95eaa
--- /dev/null
+++ b/frappe/public/js/frappe/form/controls/multiselect_pills.js
@@ -0,0 +1,150 @@
+import Awesomplete from 'awesomplete';
+
+frappe.ui.form.ControlMultiSelectPills = frappe.ui.form.ControlAutocomplete.extend({
+	make_input() {
+		this._super();
+		this.$input_area = $(this.input_area);
+		this.$multiselect_wrapper = $('<div>')
+			.addClass('form-control table-multiselect')
+			.appendTo(this.$input_area);
+
+		this.$input.removeClass('form-control');
+		this.$input_area.find('.awesomplete').appendTo(this.$multiselect_wrapper);
+
+		this.$input.on("awesomplete-selectcomplete", () => {
+			this.$input.val('').focus();
+		});
+
+		// used as an internal model to store values
+		this.rows = [];
+
+		this.$input_area.on('click', '.btn-remove', (e) => {
+			const $target = $(e.currentTarget);
+			const $value = $target.closest('.tb-selected-value');
+
+			const value = decodeURIComponent($value.data().value);
+			this.rows = this.rows.filter(val => val !== value);
+
+			this.parse_validate_and_set_in_model('');
+		});
+
+		this.$input.on('keydown', e => {
+			// if backspace key pressed on empty input, delete last value
+			if (e.keyCode == frappe.ui.keyCode.BACKSPACE && e.target.value === '') {
+				this.rows = this.rows.slice(0, this.rows.length - 1);
+				this.parse_validate_and_set_in_model('');
+			}
+		});
+	},
+
+	parse(value) {
+		if (value) {
+			this.rows.push(value);
+		}
+
+		return this.rows;
+	},
+
+	validate(value) {
+		const rows = (value || []).slice();
+
+		if (rows.length === 0) {
+			return rows;
+		}
+
+		const all_rows_except_last = rows.slice(0, rows.length - 1);
+		const last_value = rows[rows.length - 1];
+
+		// falsy value
+		if (!last_value) {
+			return all_rows_except_last;
+		}
+
+		// duplicate value
+		if (all_rows_except_last.includes(last_value)) {
+			return all_rows_except_last;
+		}
+
+		return rows;
+	},
+
+	set_formatted_input(value) {
+		this.rows = value || [];
+		this.set_pill_html(this.rows);
+	},
+
+	set_pill_html(values) {
+		const html = values
+			.map(value => this.get_pill_html(value))
+			.join('');
+
+		this.$multiselect_wrapper.find('.tb-selected-value').remove();
+		this.$multiselect_wrapper.prepend(html);
+	},
+
+	get_pill_html(value) {
+		const encoded_value = encodeURIComponent(value);
+		return `<div class="btn-group tb-selected-value" data-value="${encoded_value}">
+			<button class="btn btn-default btn-xs btn-link-to-form">${__(value)}</button>
+			<button class="btn btn-default btn-xs btn-remove">
+				<i class="fa fa-remove text-muted"></i>
+			</button>
+		</div>`;
+	},
+
+	get_awesomplete_settings() {
+		const settings = this._super();
+
+		return Object.assign(settings, {
+			filter: function(text, input) {
+				let d = this.get_item(text.value);
+				if(!d) {
+					return Awesomplete.FILTER_CONTAINS(text, input.match(/[^,]*$/)[0]);
+				}
+
+				let getMatch = value => Awesomplete.FILTER_CONTAINS(value, input.match(/[^,]*$/)[0]);
+
+				// match typed input with label or value or description
+				let v = getMatch(d.label);
+				if(!v && d.value) {
+					v = getMatch(d.value);
+				}
+				if(!v && d.description) {
+					v = getMatch(d.description);
+				}
+
+				return v;
+			}
+		});
+	},
+
+	get_value() {
+		return this.rows;
+	},
+
+	get_values() {
+		return this.rows;
+	},
+
+	get_data() {
+		let data;
+		if(this.df.get_data) {
+			data = this.df.get_data();
+			if (data && data.then) {
+				data.then((r) => {
+					this.set_data(r);
+				});
+				data = this.get_value();
+			} else {
+				this.set_data(data);
+			}
+		} else {
+			data = this._super();
+		}
+		const values = this.get_values() || [];
+
+		// return values which are not already selected
+		if (data) data.filter(d => !values.includes(d));
+		return data;
+	}
+});
diff --git a/frappe/public/js/frappe/views/components/DeskSection.vue b/frappe/public/js/frappe/views/components/DeskSection.vue
index 3c5dcd9af0..d7504c7d76 100644
--- a/frappe/public/js/frappe/views/components/DeskSection.vue
+++ b/frappe/public/js/frappe/views/components/DeskSection.vue
@@ -32,7 +32,7 @@ export default {
 					{
 						label: __('Shortcuts'),
 						fieldname: 'links',
-						fieldtype: 'MultiSelect',
+						fieldtype: 'MultiSelectPills',
 						get_data() {
 							return frappe.call('frappe.desk.moduleview.get_links', {
 								app: module.app,

From 15ef216dcb1a26219cf8f658920b55a8ddeca931 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sun, 31 Mar 2019 16:49:18 +0530
Subject: [PATCH 185/256] feat: Update points realtime

---
 frappe/public/js/frappe/social/pages/UserList.vue          | 3 +++
 frappe/social/doctype/energy_point_log/energy_point_log.py | 1 +
 2 files changed, 4 insertions(+)

diff --git a/frappe/public/js/frappe/social/pages/UserList.vue b/frappe/public/js/frappe/social/pages/UserList.vue
index fbe6b836a8..17154542d0 100644
--- a/frappe/public/js/frappe/social/pages/UserList.vue
+++ b/frappe/public/js/frappe/social/pages/UserList.vue
@@ -93,6 +93,9 @@ export default {
 		standard_users.forEach(user => delete this.users[user]);
 		this.users = Object.values(this.users);
 		this.fetch_users_energy_points_and_update_users();
+		frappe.realtime.on('update_points', () => {
+			this.fetch_users_energy_points_and_update_users();
+		});
 	},
 	methods: {
 		get_avatar(user) {
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index 31b425231e..b8d5ef4642 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -20,6 +20,7 @@ class EnergyPointLog(Document):
 			frappe.publish_realtime('energy_point_alert', message=message, user=self.user)
 
 		frappe.cache().hdel('energy_points', self.user)
+		frappe.publish_realtime('update_points')
 
 def get_alert_message(doc):
 	message = ''

From 91926a469813737c5571719dfa01dfb6109b9297 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sun, 31 Mar 2019 16:51:37 +0530
Subject: [PATCH 186/256] feat: Add docperm to make Energy Point Log readable
 to all

---
 .../energy_point_log/energy_point_log.json    | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.json b/frappe/social/doctype/energy_point_log/energy_point_log.json
index 1c92fda300..2b43e99d38 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.json
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.json
@@ -259,7 +259,7 @@
  "istable": 0,
  "max_attachments": 0,
  "menu_index": 0,
- "modified": "2019-03-29 20:01:05.503043",
+ "modified": "2019-03-30 12:25:27.821811",
  "modified_by": "Administrator",
  "module": "Social",
  "name": "Energy Point Log",
@@ -284,6 +284,25 @@
    "share": 0,
    "submit": 0,
    "write": 0
+  },
+  {
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 0,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 0,
+   "read": 1,
+   "report": 0,
+   "role": "All",
+   "set_user_permissions": 0,
+   "share": 0,
+   "submit": 0,
+   "write": 0
   }
  ],
  "quick_entry": 0,

From 1d7fa2bd40d311ebf4a9cc3aa858000fe5aac30b Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sun, 31 Mar 2019 17:20:31 +0530
Subject: [PATCH 187/256] refactor: Abstract get_points code

---
 frappe/public/js/frappe/form/review.js | 4 +---
 frappe/public/js/frappe/misc/utils.js  | 5 +++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/form/review.js b/frappe/public/js/frappe/form/review.js
index 809c5b1507..d579a9253d 100644
--- a/frappe/public/js/frappe/form/review.js
+++ b/frappe/public/js/frappe/form/review.js
@@ -133,9 +133,7 @@ frappe.ui.form.Review = class Review {
 				let review_pill = $(`
 					<span class="review-pill">
 						${frappe.avatar(log.owner)}
-						<span class="bold" style="color: ${log.points > 0 ? '#45A163': '#e42121'}">
-							${log.points > 0 ? '+': ''}${log.points}
-						</span>
+						${frappe.utils.get_points(log.points)}
 					</span>
 				`);
 				this.review_list_wrapper.prepend(review_pill);
diff --git a/frappe/public/js/frappe/misc/utils.js b/frappe/public/js/frappe/misc/utils.js
index 7bbd63a0a8..75805fbea5 100644
--- a/frappe/public/js/frappe/misc/utils.js
+++ b/frappe/public/js/frappe/misc/utils.js
@@ -682,6 +682,11 @@ Object.assign(frappe.utils, {
 		} else {
 			return null;
 		}
+	},
+	get_points(points) {
+		return `<span class='bold' style="color: ${points >= 0 ? '#45A163': '#e42121'}">
+			${points > 0 ? '+': ''}${points}
+		</span>`;
 	}
 });
 

From b62b9b5db24d52d77f21571392c1f242d6e576a4 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sun, 31 Mar 2019 17:21:12 +0530
Subject: [PATCH 188/256] fix: Translate string

---
 frappe/public/js/frappe/social/pages/Profile.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/social/pages/Profile.vue b/frappe/public/js/frappe/social/pages/Profile.vue
index 8b24e6deb8..f0f4c5f8d7 100644
--- a/frappe/public/js/frappe/social/pages/Profile.vue
+++ b/frappe/public/js/frappe/social/pages/Profile.vue
@@ -14,14 +14,14 @@
 						class="option"
 						:class="{'bold': show_list === 'user_posts'}"
 						@click="show_list = 'user_posts'">
-						<span>Posts</span>
+						<span>{{__('Posts')}}</span>
 						<span>({{ user_posts_count }})</span>
 					</div>
 					<div
 						class="option"
 						:class="{'bold': show_list === 'liked_posts'}"
 						@click="show_list = 'liked_posts'">
-						<span>Likes</span>
+						<span>{{__('Likes')}}</span>
 						<span>({{ liked_posts_count }})</span>
 					</div>
 				</div>

From ecae61e35abdc0dd94673d88974845b6c604c90e Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sun, 31 Mar 2019 17:23:51 +0530
Subject: [PATCH 189/256] feat: Add energy point history component

---
 .../social/components/EnergyPointHistory.vue  | 91 +++++++++++++++++++
 .../js/frappe/social/pages/UserList.vue       | 66 +++++++++-----
 2 files changed, 136 insertions(+), 21 deletions(-)
 create mode 100644 frappe/public/js/frappe/social/components/EnergyPointHistory.vue

diff --git a/frappe/public/js/frappe/social/components/EnergyPointHistory.vue b/frappe/public/js/frappe/social/components/EnergyPointHistory.vue
new file mode 100644
index 0000000000..6d15e30633
--- /dev/null
+++ b/frappe/public/js/frappe/social/components/EnergyPointHistory.vue
@@ -0,0 +1,91 @@
+<template>
+	<div>
+		<ul class="log-list">
+			<li class="history-log" v-for="log in history_logs" :key="log.name">
+				<span v-html="frappe.utils.get_points(log.points)"></span>
+				<span v-html="log_body(log)"></span>
+				<span>&nbsp;-&nbsp;</span>
+				<span v-html="frappe.datetime.comment_when(log.creation)"></span>
+			</li>
+			<li v-if="!history_logs.length" class="history-log">
+				{{__('No logs found')}}
+			</li>
+		</ul>
+	</div>
+</template>
+<script>
+export default {
+	props: ['user'],
+	data() {
+		return {
+			history_logs: []
+		}
+	},
+	created() {
+		frappe.db.get_list('Energy Point Log', {
+			filters: {
+				user: this.user,
+				type: ['!=', 'Review']
+			},
+			fields: ['*']
+		}).then(data => {
+			this.history_logs = data;
+		})
+	},
+	methods: {
+		log_body(log) {
+			const doc_link = frappe.utils.get_form_link(log.reference_doctype, log.reference_name, true)
+			const owner_name = frappe.user.full_name(log.owner).bold();
+			if (log.type === 'Appreciation') {
+				return __('{0} appreciated on {1}', [owner_name, doc_link])
+			}
+			if (log.type === 'Criticism') {
+				return __('{0} criticized on {1}', [owner_name, doc_link])
+			}
+			return __('via automatic rule {0} for {1}', [log.rule.bold(), doc_link])
+		}
+	}
+
+}
+</script>
+<style lang="less">
+@import "frappe/public/less/common";
+.log-list {
+	padding: 15px;
+	padding-left: 0px;
+	position: relative;
+}
+.log-list:before {
+	content: " ";
+	border-left: 1px solid @border-color;
+	position: absolute;
+	top: 0px;
+	bottom: 0px;
+	left: 30px;
+	z-index: 0;
+}
+.history-log {
+	.text-muted;
+	.text-medium;
+	list-style: none;
+	padding: 10px;
+	padding-left: 50px;
+	display: flex;
+	span:nth-child(1) {
+		width: 40px;
+		text-align: right;
+		margin-right: 10px;
+	}
+	position: relative;
+}
+.history-log:before {
+	content: " ";
+	width: 7px;
+	height: 7px;
+	background-color: @border-color;
+	position: absolute;
+	border-radius: 50%;
+	left: 27px;
+	top: 16px;
+}
+</style>
\ No newline at end of file
diff --git a/frappe/public/js/frappe/social/pages/UserList.vue b/frappe/public/js/frappe/social/pages/UserList.vue
index 17154542d0..c935d7e830 100644
--- a/frappe/public/js/frappe/social/pages/UserList.vue
+++ b/frappe/public/js/frappe/social/pages/UserList.vue
@@ -16,40 +16,52 @@
 				</span>
 			</li>
 			<li
-				class="user-card"
-				v-for="user in filtered_users" :key="user.name"
-				@click="go_to_profile_page(user.name)">
-				<div class="user-details flex">
-					<span v-html="get_avatar(user.name)"></span>
-					<div>
-						<div>{{ user.fullname }}</div>
-						<div class="text-muted text-medium" :class="{'italic': !user.bio}">
-							{{ frappe.ellipsis(user.bio, 100) || 'No Bio'}}
-						</div>
+				v-for="user in filtered_users"
+				:key="user.name"
+				@click="toggle_log(user.name)">
+				<div class="user-card">
+					<div class="user-details flex">
+						<span v-html="get_avatar(user.name)"></span>
+						<span>
+							<a @click="go_to_profile_page(user.name)">{{ user.fullname }}</a>
+							<div class="text-muted text-medium" :class="{'italic': !user.bio}">
+								{{ frappe.ellipsis(user.bio, 100) || 'No Bio'}}
+							</div>
+						</span>
 					</div>
+					<span class="text-muted text-nowrap user-points">
+						{{ user.energy_points }}
+					</span>
+					<span class="text-muted text-nowrap user-points">
+						{{ user.review_points }}
+					</span>
+					<span class="text-muted text-nowrap user-points">
+						{{ user.given_points }}
+					</span>
 				</div>
-				<span class="text-muted text-nowrap user-points">
-					{{ user.energy_points }}
-				</span>
-				<span class="text-muted text-nowrap user-points">
-					{{ user.review_points }}
-				</span>
-				<span class="text-muted text-nowrap user-points">
-					{{ user.given_points }}
-				</span>
+				<energy-point-history
+					v-if="show_log_for===user.name"
+					class="energy-point-history"
+					:user="user.name">
+				</energy-point-history>
 			</li>
-			<li class="text-muted" v-if="!filtered_users.length">{{__('No user found')}}</li>
+			<li class="user-card text-muted" v-if="!filtered_users.length">{{__('No user found')}}</li>
 		</ul>
 	</div>
 </template>
 <script>
+import EnergyPointHistory from '../components/EnergyPointHistory.vue';
 export default {
+	components: {
+		EnergyPointHistory
+	},
 	data() {
 		return {
 			users: [],
 			filter_users_by: null,
 			sort_users_by: 'energy_points',
 			sort_order: 'desc',
+			show_log_for: null
 		}
 	},
 	computed: {
@@ -117,6 +129,13 @@ export default {
 					return user;
 				});
 			});
+		},
+		toggle_log(user) {
+			if (this.show_log_for === user) {
+				this.show_log_for = null
+			} else {
+				this.show_log_for = user
+			}
 		}
 	}
 }
@@ -133,7 +152,6 @@ export default {
 		cursor: pointer;
 		padding: 12px 15px;
 		border-bottom: 1px solid @border-color;
-
 		.user-details {
 			flex: 1;
 
@@ -165,6 +183,12 @@ export default {
 	width: 100%;
 	left: 0;
 }
+.energy-point-history {
+	border-bottom: 1px solid @border-color;
+	max-height: 300px;
+	overflow: scroll;
+	background-color: @light-bg;
+}
 </style>
 
 

From 3f6183c08791afa43204e0bbaf19c31e8432c282 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sun, 31 Mar 2019 19:31:27 +0530
Subject: [PATCH 190/256] fix: Alignment of points

---
 frappe/public/js/frappe/social/pages/UserList.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/frappe/public/js/frappe/social/pages/UserList.vue b/frappe/public/js/frappe/social/pages/UserList.vue
index c935d7e830..407412c167 100644
--- a/frappe/public/js/frappe/social/pages/UserList.vue
+++ b/frappe/public/js/frappe/social/pages/UserList.vue
@@ -142,11 +142,9 @@ export default {
 </script>
 <style lang="less" scoped>
 @import "frappe/public/less/variables";
-
 .user-list {
 	border-left: 1px solid @border-color;
 	border-right: 1px solid @border-color;
-
 	.user-card {
 		display: flex;
 		cursor: pointer;
@@ -154,23 +152,20 @@ export default {
 		border-bottom: 1px solid @border-color;
 		.user-details {
 			flex: 1;
-
 			.italic {
 				font-style: italic;
 			}
 		}
 	}
 }
-
 .user-points {
 	flex: 0 0 20%;
 	text-align: right;
+	align-self: center;
 }
-
 .user-list-header {
 	background-color: @light-bg;
 }
-
 .search-bar {
 	position: sticky;
 	top: 0;

From 406c829c51f2637d4fe651c6a471fd5d20e27cd3 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 1 Apr 2019 10:37:53 +0530
Subject: [PATCH 191/256] fix: Add fast-deep-equal as a dependency

---
 frappe/public/js/frappe/misc/utils.js | 60 +--------------------------
 package.json                          |  1 +
 yarn.lock                             |  5 +++
 3 files changed, 8 insertions(+), 58 deletions(-)

diff --git a/frappe/public/js/frappe/misc/utils.js b/frappe/public/js/frappe/misc/utils.js
index f6e5a6e27b..7eef74509b 100644
--- a/frappe/public/js/frappe/misc/utils.js
+++ b/frappe/public/js/frappe/misc/utils.js
@@ -1,6 +1,7 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // MIT License. See license.txt
 
+import deep_equal from "fast-deep-equal";
 frappe.provide('frappe.utils');
 
 Object.assign(frappe.utils, {
@@ -671,64 +672,7 @@ Object.assign(frappe.utils, {
 	},
 
 	deep_equal(a, b) {
-		// https://github.com/epoberezkin/fast-deep-equal/blob/master/index.js
-		/* eslint-disable */
-		var isArray = Array.isArray;
-		var keyList = Object.keys;
-		var hasProp = Object.prototype.hasOwnProperty;
-
-		function equal(a, b) {
-			if (a === b) return true;
-
-			if (a && b && typeof a == 'object' && typeof b == 'object') {
-				var arrA = isArray(a)
-				, arrB = isArray(b)
-				, i
-				, length
-				, key;
-
-				if (arrA && arrB) {
-					length = a.length;
-					if (length != b.length) return false;
-					for (i = length; i-- !== 0;)
-						if (!equal(a[i], b[i])) return false;
-					return true;
-				}
-
-				if (arrA != arrB) return false;
-
-				var dateA = a instanceof Date
-				, dateB = b instanceof Date;
-				if (dateA != dateB) return false;
-				if (dateA && dateB) return a.getTime() == b.getTime();
-
-				var regexpA = a instanceof RegExp
-				, regexpB = b instanceof RegExp;
-				if (regexpA != regexpB) return false;
-				if (regexpA && regexpB) return a.toString() == b.toString();
-
-				var keys = keyList(a);
-				length = keys.length;
-
-				if (length !== keyList(b).length)
-					return false;
-
-				for (i = length; i-- !== 0;)
-					if (!hasProp.call(b, keys[i])) return false;
-
-				for (i = length; i-- !== 0;) {
-					key = keys[i];
-					if (!equal(a[key], b[key])) return false;
-				}
-
-				return true;
-			}
-
-			return a!==a && b!==b;
-		};
-
-		return equal(a, b)
-		/* eslint-enable */
+		return deep_equal(a, b);
 	}
 });
 
diff --git a/package.json b/package.json
index bd3d18bef1..93ab845772 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "awesomplete": "^1.1.2",
     "cookie": "^0.3.1",
     "express": "^4.16.2",
+    "fast-deep-equal": "^2.0.1",
     "frappe-datatable": "^1.10.0",
     "frappe-gantt": "^0.1.0",
     "fuse.js": "^3.2.0",
diff --git a/yarn.lock b/yarn.lock
index d92865228a..6bafc5a66d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1110,6 +1110,11 @@ fast-deep-equal@^1.0.0:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
   integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
 
+fast-deep-equal@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
+
 fast-diff@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.2.tgz#4b62c42b8e03de3f848460b639079920695d0154"

From 3415335423af81f3a3f679d961fd03eaf8961d74 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 1 Apr 2019 10:37:53 +0530
Subject: [PATCH 192/256] fix: Add fast-deep-equal as a dependency

---
 frappe/public/js/frappe/misc/utils.js | 62 ++-------------------------
 package.json                          |  1 +
 2 files changed, 4 insertions(+), 59 deletions(-)

diff --git a/frappe/public/js/frappe/misc/utils.js b/frappe/public/js/frappe/misc/utils.js
index 949d8de350..ecbfaa555a 100644
--- a/frappe/public/js/frappe/misc/utils.js
+++ b/frappe/public/js/frappe/misc/utils.js
@@ -1,6 +1,7 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // MIT License. See license.txt
 
+import deep_equal from "fast-deep-equal";
 frappe.provide('frappe.utils');
 
 Object.assign(frappe.utils, {
@@ -685,65 +686,8 @@ Object.assign(frappe.utils, {
 	},
 
 	deep_equal(a, b) {
-		// https://github.com/epoberezkin/fast-deep-equal/blob/master/index.js
-		/* eslint-disable */
-		var isArray = Array.isArray;
-		var keyList = Object.keys;
-		var hasProp = Object.prototype.hasOwnProperty;
-
-		function equal(a, b) {
-			if (a === b) return true;
-
-			if (a && b && typeof a == 'object' && typeof b == 'object') {
-				var arrA = isArray(a)
-				, arrB = isArray(b)
-				, i
-				, length
-				, key;
-
-				if (arrA && arrB) {
-					length = a.length;
-					if (length != b.length) return false;
-					for (i = length; i-- !== 0;)
-						if (!equal(a[i], b[i])) return false;
-					return true;
-				}
-
-				if (arrA != arrB) return false;
-
-				var dateA = a instanceof Date
-				, dateB = b instanceof Date;
-				if (dateA != dateB) return false;
-				if (dateA && dateB) return a.getTime() == b.getTime();
-
-				var regexpA = a instanceof RegExp
-				, regexpB = b instanceof RegExp;
-				if (regexpA != regexpB) return false;
-				if (regexpA && regexpB) return a.toString() == b.toString();
-
-				var keys = keyList(a);
-				length = keys.length;
-
-				if (length !== keyList(b).length)
-					return false;
-
-				for (i = length; i-- !== 0;)
-					if (!hasProp.call(b, keys[i])) return false;
-
-				for (i = length; i-- !== 0;) {
-					key = keys[i];
-					if (!equal(a[key], b[key])) return false;
-				}
-
-				return true;
-			}
-
-			return a!==a && b!==b;
-		};
-
-		return equal(a, b)
-		/* eslint-enable */
-  },
+		return deep_equal(a, b);
+	},
 
 	get_points(points) {
 		return `<span class='bold' style="color: ${points >= 0 ? '#45A163': '#e42121'}">
diff --git a/package.json b/package.json
index df8e65167d..3b5decfc35 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "bootstrap": "^4.3.1",
     "cookie": "^0.3.1",
     "express": "^4.16.2",
+    "fast-deep-equal": "^2.0.1",
     "frappe-datatable": "^1.10.0",
     "frappe-gantt": "^0.1.0",
     "fuse.js": "^3.2.0",

From 9f7aea9a99f1da529a9e1c1f92cb75af40f816b6 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 1 Apr 2019 10:54:58 +0530
Subject: [PATCH 193/256] fix: Preserve state in query report

After navigating back to a query report, the filters were setup again,
we can skip that and do nothing to preserve state.
---
 frappe/public/js/frappe/views/reports/query_report.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 953c690904..e6423bf3c9 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -92,7 +92,8 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 			this.load_report();
 		} else {
 			// same report
-			this.refresh_report();
+			// don't do anything to preserve state
+			// like filters and datatable column widths
 		}
 	}
 

From aff6f71c81fd7d501f7320da704eea7fa32f07ad Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 1 Apr 2019 11:09:08 +0530
Subject: [PATCH 194/256] style: unindent chained .then

---
 frappe/public/js/frappe/views/components/Desktop.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/views/components/Desktop.vue b/frappe/public/js/frappe/views/components/Desktop.vue
index 240f3511a8..f950d04e79 100644
--- a/frappe/public/js/frappe/views/components/Desktop.vue
+++ b/frappe/public/js/frappe/views/components/Desktop.vue
@@ -118,8 +118,8 @@ export default {
 					frappe.call('frappe.desk.moduleview.hide_modules_from_desktop', {
 						modules: modules_to_hide
 					})
-						.then(r => r.message)
-						.then(hs => this.update_modules_with_home_settings(hs));
+					.then(r => r.message)
+					.then(hs => this.update_modules_with_home_settings(hs));
 				}
 			});
 

From b830a327d7024d6a22d34ad23132969e1b077f5d Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 1 Apr 2019 10:54:58 +0530
Subject: [PATCH 195/256] fix: Preserve state in query report

After navigating back to a query report, the filters were setup again,
we can skip that and do nothing to preserve state.
---
 frappe/public/js/frappe/views/reports/query_report.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index c4f4443146..3b8b66a78e 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -92,7 +92,8 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 			this.load_report();
 		} else {
 			// same report
-			this.refresh_report();
+			// don't do anything to preserve state
+			// like filters and datatable column widths
 		}
 	}
 

From b963868f611159f23ee03f14b96e0cc58368c99f Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 1 Apr 2019 16:14:17 +0530
Subject: [PATCH 196/256] fix: Update user activity using ORM

---
 frappe/sessions.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/frappe/sessions.py b/frappe/sessions.py
index aaf40f30e7..81ced8ce95 100644
--- a/frappe/sessions.py
+++ b/frappe/sessions.py
@@ -226,12 +226,11 @@ class Session:
 			self.insert_session_record()
 
 			# update user
-			frappe.db.sql("""UPDATE tabUser SET last_login = %(now)s, last_ip = %(ip)s, last_active = %(now)s
-				where name=%(name)s""", {
-					"now": frappe.utils.now(),
-					"ip": frappe.local.request_ip,
-					"name": self.data['user']
-				})
+			user = frappe.get_doc('User', self.data['user'])
+			user.last_login = frappe.utils.now()
+			user.last_ip = frappe.local.request_ip
+			user.last_active = frappe.utils.now()
+			user.save()
 
 			frappe.db.commit()
 

From f853313a5ac319400409f4e62a08719d526006b0 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Mon, 1 Apr 2019 16:16:35 +0530
Subject: [PATCH 197/256] fix: Update user activity using ORM (#7183)

---
 frappe/sessions.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/frappe/sessions.py b/frappe/sessions.py
index 74bd99c724..190cf7e344 100644
--- a/frappe/sessions.py
+++ b/frappe/sessions.py
@@ -231,12 +231,11 @@ class Session:
 			self.insert_session_record()
 
 			# update user
-			frappe.db.sql("""UPDATE `tabUser` SET `last_login` = %(now)s, `last_ip` = %(ip)s, `last_active` = %(now)s
-				where `name`=%(name)s""", {
-					"now": frappe.utils.now(),
-					"ip": frappe.local.request_ip,
-					"name": self.data['user']
-				})
+			user = frappe.get_doc('User', self.data['user'])
+			user.last_login = frappe.utils.now()
+			user.last_ip = frappe.local.request_ip
+			user.last_active = frappe.utils.now()
+			user.save()
 
 			frappe.db.commit()
 

From 1c8fd3169ebb92f552e2b170cb85a6dbc67f1644 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 1 Apr 2019 18:22:17 +0530
Subject: [PATCH 198/256] fix(permission): use .get to avoid key error (#7187)

Port of https://github.com/frappe/frappe/pull/7184
---
 frappe/permissions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/permissions.py b/frappe/permissions.py
index b4d85f1981..6c3c5b7739 100644
--- a/frappe/permissions.py
+++ b/frappe/permissions.py
@@ -28,7 +28,7 @@ def print_has_permission_check_logs(func):
 		# print only if access denied
 		# and if user is checking his own permission
 		if not result and self_perm_check:
-			msgprint(('<br>').join(frappe.flags['has_permission_check_logs']))
+			msgprint(('<br>').join(frappe.flags.get('has_permission_check_logs')))
 		frappe.flags.pop('has_permission_check_logs', None)
 		return result
 	return inner

From dbd64f0789fa85c42c002937a0c9c7bc6b6c70e9 Mon Sep 17 00:00:00 2001
From: Kenneth Sequeira <kenneth@Kenneths-MacBook-Air.local>
Date: Tue, 2 Apr 2019 00:11:11 +0530
Subject: [PATCH 199/256] added option to view password

---
 frappe/templates/includes/login/login.css |  9 ++++++++-
 frappe/templates/includes/login/login.js  | 10 ++++++++++
 frappe/www/login.html                     | 11 +++++++----
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/frappe/templates/includes/login/login.css b/frappe/templates/includes/login/login.css
index dc9f487659..21dee49010 100644
--- a/frappe/templates/includes/login/login.css
+++ b/frappe/templates/includes/login/login.css
@@ -129,4 +129,11 @@ p {
 	border: 1px solid  #d1d8dd;
 	padding: 10px;
 	border-radius: 4px;
-}
\ No newline at end of file
+}
+
+.toggle-password {
+  right: 9px;
+  top: 9px;
+  position: absolute;
+  z-index: 2;
+}
diff --git a/frappe/templates/includes/login/login.js b/frappe/templates/includes/login/login.js
index f478263bf7..dd0f57eb4c 100644
--- a/frappe/templates/includes/login/login.js
+++ b/frappe/templates/includes/login/login.js
@@ -56,6 +56,16 @@ login.bind_events = function() {
 		return false;
 	});
 
+	$(".toggle-password").click(function() {
+		$(this).toggleClass("fa-eye fa-eye-slash");
+		var input = $($(this).attr("toggle"));
+		if (input.attr("type") == "password") {
+			input.attr("type", "text");
+		} else {
+			input.attr("type", "password");
+		}
+	});
+
 	{% if ldap_settings %}
 		$(".btn-ldap-login").on("click", function(){
 			var args = {};
diff --git a/frappe/www/login.html b/frappe/www/login.html
index 48225c1b36..e2717a7542 100644
--- a/frappe/www/login.html
+++ b/frappe/www/login.html
@@ -21,10 +21,13 @@
 				placeholder="{% if login_name_placeholder %}{{ login_name_placeholder  }}{% else %}{{ _("Email address") }}{% endif %}"
 				required autofocus>
 
-
-			<input type="password" id="login_password"
-				class="form-control" placeholder="{{ _('Password') }}" required>
-
+			<div class="password-field" style="position: relative;">
+				<input type="password" id="login_password"
+						class="form-control" placeholder="{{ _('Password') }}" required>
+					
+				<span toggle="#login_password" class="fa fa-fw fa-eye toggle-password"></span>
+			</div>	
+				
 			<button class="btn btn-sm btn-primary btn-block btn-login" type="submit">
 				{{ _("Login") }}</button>
 

From 790c3ccf40d5ca6bceb132b808e22ca2616d47cb Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Tue, 2 Apr 2019 18:44:33 +0530
Subject: [PATCH 200/256] fix: user ignore permissions not working at server
 side

---
 frappe/model/create_new.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/model/create_new.py b/frappe/model/create_new.py
index d92eaef7d7..a4e50f704c 100644
--- a/frappe/model/create_new.py
+++ b/frappe/model/create_new.py
@@ -83,7 +83,8 @@ def get_user_default_value(df, defaults, doctype_user_permissions, allowed_recor
 	if df.fieldtype == "Link" and df.options != "User":
 		# 1 - look in user permissions only for document_type==Setup
 		# We don't want to include permissions of transactions to be used for defaults.
-		if frappe.get_meta(df.options).document_type=="Setup" and len(allowed_records)==1:
+		if (frappe.get_meta(df.options).document_type=="Setup"
+			and len(allowed_records)==1 and not df.ignore_user_permissions):
 			return allowed_records[0]
 
 		# 2 - Look in user defaults

From 0fa1b9cab462dd246bb649ec416746cf884bdf2d Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Tue, 2 Apr 2019 18:44:33 +0530
Subject: [PATCH 201/256] fix: user ignore permissions not working at server
 side

---
 frappe/model/create_new.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/model/create_new.py b/frappe/model/create_new.py
index 8bb1356bd9..b274cfadad 100644
--- a/frappe/model/create_new.py
+++ b/frappe/model/create_new.py
@@ -83,7 +83,8 @@ def get_user_default_value(df, defaults, doctype_user_permissions, allowed_recor
 	if df.fieldtype == "Link" and df.options != "User":
 		# 1 - look in user permissions only for document_type==Setup
 		# We don't want to include permissions of transactions to be used for defaults.
-		if frappe.get_meta(df.options).document_type=="Setup" and len(allowed_records)==1:
+		if (frappe.get_meta(df.options).document_type=="Setup"
+			and len(allowed_records)==1 and not df.ignore_user_permissions):
 			return allowed_records[0]
 
 		# 2 - Look in user defaults

From 70e569287c37f57526689bff73eb79027a6bca21 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 3 Apr 2019 12:50:06 +0530
Subject: [PATCH 202/256] fix: ignore_permissions while updating user activity
 - Since all users do not have access to user doctype

---
 frappe/sessions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/sessions.py b/frappe/sessions.py
index 190cf7e344..eb28cc4dee 100644
--- a/frappe/sessions.py
+++ b/frappe/sessions.py
@@ -235,7 +235,7 @@ class Session:
 			user.last_login = frappe.utils.now()
 			user.last_ip = frappe.local.request_ip
 			user.last_active = frappe.utils.now()
-			user.save()
+			user.save(ignore_permissions=True)
 
 			frappe.db.commit()
 

From 2e811b16034db5fdeb5d4876b93e30ddcaefa8b8 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 3 Apr 2019 18:12:11 +0530
Subject: [PATCH 203/256] fix: Fetch page title for core pages

---
 frappe/boot.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/frappe/boot.py b/frappe/boot.py
index 90e2b9c22a..f166af91f7 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -113,22 +113,25 @@ def get_user_pages_or_reports(parent):
 	column = get_column(parent)
 
 	# get pages or reports set on custom role
-	custom_roles = frappe.db.sql("""
+	pages_with_custom_roles = frappe.db.sql("""
 		select
 			`tabCustom Role`.{field} as name,
 			`tabCustom Role`.modified,
-			`tabCustom Role`.ref_doctype
-		from `tabCustom Role`, `tabHas Role`
+			`tabCustom Role`.ref_doctype,
+			{column}
+		from `tabCustom Role`, `tabHas Role`, `tab{parent}`
 		where
 			`tabHas Role`.parent = `tabCustom Role`.name
+			and `tab{parent}`.name = `tabCustom Role`.{field}
 			and `tabCustom Role`.{field} is not null
 			and `tabHas Role`.role in ({roles})
-	""".format(field=parent.lower(), roles = ', '.join(['%s']*len(roles))), roles, as_dict=1)
+	""".format(field=parent.lower(), parent=parent, column=column,
+		roles = ', '.join(['%s']*len(roles))), roles, as_dict=1)
 
-	for p in custom_roles:
-		has_role[p.name] = {"modified":p.modified, "title": p.name, "ref_doctype": p.ref_doctype}
+	for p in pages_with_custom_roles:
+		has_role[p.name] = {"modified":p.modified, "title": p.title, "ref_doctype": p.ref_doctype}
 
-	standard_roles = frappe.db.sql("""
+	pages_with_standard_roles = frappe.db.sql("""
 		select distinct
 			`tab{parent}`.name as name,
 			`tab{parent}`.modified,
@@ -145,7 +148,7 @@ def get_user_pages_or_reports(parent):
 			field=parent.lower(), condition="and `tabReport`.disabled=0" if parent == "Report" else ""),
 			roles, as_dict=True)
 
-	for p in standard_roles:
+	for p in pages_with_standard_roles:
 		if p.name not in has_role:
 			has_role[p.name] = {"modified":p.modified, "title": p.title}
 			if parent == "Report":

From 55ba40a71e74e50555dfeaa4e331725d939d7f81 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 3 Apr 2019 23:19:59 +0530
Subject: [PATCH 204/256] feat(DataTable): Add not equals (!=) filter

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 93ab845772..21a2ce0571 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "cookie": "^0.3.1",
     "express": "^4.16.2",
     "fast-deep-equal": "^2.0.1",
-    "frappe-datatable": "^1.10.0",
+    "frappe-datatable": "^1.11.0",
     "frappe-gantt": "^0.1.0",
     "fuse.js": "^3.2.0",
     "highlight.js": "^9.12.0",
diff --git a/yarn.lock b/yarn.lock
index 6bafc5a66d..b7dbbcb81a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1224,10 +1224,10 @@ forwarded@~0.1.2:
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
   integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
 
-frappe-datatable@^1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.10.0.tgz#915a7a6754cf6b66dbf7b07323a381e760a74221"
-  integrity sha512-xuiFvDUSgKIaG0vZZvQsKLs5LUqFfo5nSE+wzBwEzE5iytBaJfKXzqud71AtqteQ0CCrEe9P/tMD+hZfcnbh/Q==
+frappe-datatable@^1.11.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.11.0.tgz#e0f23659e2bb2e635ecd4f3eccadf1ed762a0629"
+  integrity sha512-tXjpNOywq3o6nMru47xhyzrH/sZ3PmrsLLOS+6+VJmqFsVC6TmlJDP1LRxSC+xCSDpumO8jjxfdwcwWWXKfDdw==
   dependencies:
     hyperlist "^1.0.0-beta"
     lodash "^4.17.5"

From cb48feac98aea74e0b1df47e18d9eda71f7314cb Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 4 Apr 2019 10:37:41 +0530
Subject: [PATCH 205/256] fix: Raise exception if apps are on incompatible
 branches (#7175)

---
 frappe/__init__.py   | 3 +++
 frappe/exceptions.py | 1 +
 2 files changed, 4 insertions(+)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index b45658f0ca..584fca2a02 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -188,6 +188,9 @@ def connect(site=None, db_name=None):
 	local.db = get_db(user=db_name or local.conf.db_name)
 	set_user("Administrator")
 
+	for hook in get_hooks("connect") or []:
+		get_attr(hook)()
+
 def connect_read_only():
 	from frappe.database import get_db
 
diff --git a/frappe/exceptions.py b/frappe/exceptions.py
index 857030ff55..ced6b30abc 100644
--- a/frappe/exceptions.py
+++ b/frappe/exceptions.py
@@ -81,3 +81,4 @@ class DocumentLockedError(ValidationError): pass
 class CircularLinkingError(ValidationError): pass
 class SecurityException(Exception): pass
 class InvalidColumnName(ValidationError): pass
+class IncompatibleApp(ValidationError): pass

From 52da1476e3efcf33d20cc389622aea5c944dbdfc Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 4 Apr 2019 10:38:06 +0530
Subject: [PATCH 206/256] fix: Raise exception if apps are on incompatible
 branches (#7177)

---
 frappe/__init__.py   | 3 +++
 frappe/exceptions.py | 1 +
 2 files changed, 4 insertions(+)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 65a7fc818c..11263a831e 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -188,6 +188,9 @@ def connect(site=None, db_name=None):
 	local.db = Database(user=db_name or local.conf.db_name)
 	set_user("Administrator")
 
+	for hook in get_hooks("connect") or []:
+		get_attr(hook)()
+
 def connect_read_only():
 	from frappe.database import Database
 
diff --git a/frappe/exceptions.py b/frappe/exceptions.py
index 3a8548a6e0..a1b4ef2024 100644
--- a/frappe/exceptions.py
+++ b/frappe/exceptions.py
@@ -84,3 +84,4 @@ class RetryBackgroundJobError(Exception): pass
 class DocumentLockedError(ValidationError): pass
 class CircularLinkingError(ValidationError): pass
 class SecurityException(Exception): pass
+class IncompatibleApp(ValidationError): pass

From fc29318c0b6925f2e5e25b921bcb829cd46fe196 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 4 Apr 2019 12:01:35 +0530
Subject: [PATCH 207/256] fix: use .get to avoid key error (#7184)

---
 frappe/permissions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/permissions.py b/frappe/permissions.py
index 46924331f4..3097919723 100644
--- a/frappe/permissions.py
+++ b/frappe/permissions.py
@@ -28,7 +28,7 @@ def print_has_permission_check_logs(func):
 		# print only if access denied
 		# and if user is checking his own permission
 		if not result and self_perm_check:
-			msgprint(('<br>').join(frappe.flags['has_permission_check_logs']))
+			msgprint(('<br>').join(frappe.flags.get('has_permission_check_logs')))
 		frappe.flags.pop('has_permission_check_logs', None)
 		return result
 	return inner

From 6e2c6269f71ef39cb9b04d1ad4bb41816ae2742d Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 4 Apr 2019 12:02:59 +0530
Subject: [PATCH 208/256] fix: Return if user_field is set empty (#7181)

* fix: Return if user_field is set empty

- fix log_error usage

* fix: log complete traceback
---
 .../social/doctype/energy_point_rule/energy_point_rule.py   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
index 14dd988b26..deb1ffa767 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
@@ -24,6 +24,10 @@ class EnergyPointRule(Document):
 
 			# incase of zero as result after roundoff
 			if not points: return
+
+			# if user_field has no value
+			if not user: return
+
 			try:
 				create_energy_points_log(reference_doctype, reference_name, {
 					'points': points,
@@ -31,7 +35,7 @@ class EnergyPointRule(Document):
 					'rule': rule
 				})
 			except Exception as e:
-				frappe.log_error('apply_energy_point', e)
+				frappe.log_error(frappe.get_traceback(), 'apply_energy_point')
 
 
 def process_energy_points(doc, state):

From af7388deb7b801c06bd80a210326e53c67a6c687 Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Thu, 4 Apr 2019 12:55:11 +0530
Subject: [PATCH 209/256] fix: Show progress bar only for multiple files

---
 frappe/public/js/frappe/upload.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frappe/public/js/frappe/upload.js b/frappe/public/js/frappe/upload.js
index e86dd41ae2..219ce08586 100644
--- a/frappe/public/js/frappe/upload.js
+++ b/frappe/public/js/frappe/upload.js
@@ -222,6 +222,11 @@ frappe.upload = {
 	upload_multiple_files: function(files /*FileData array*/, args, opts) {
 		var i = -1;
 		frappe.upload.total_files = files ? files.length : 0;
+
+		if (frappe.upload.total_files == 1){
+			frappe.upload.upload_file(files[0], args, opts);
+			return;
+		}
 		// upload the first file
 		upload_next();
 		// subsequent files will be uploaded after

From d22206a992fd27bebea54407297c45fbe89aea47 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 4 Apr 2019 14:49:52 +0530
Subject: [PATCH 210/256] fix: Fix export customisation (#7198)

convert `sync_on_migrate` and `with_permissions` from string to Int
---
 frappe/modules/utils.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frappe/modules/utils.py b/frappe/modules/utils.py
index 94d726c16b..a45f414ddb 100644
--- a/frappe/modules/utils.py
+++ b/frappe/modules/utils.py
@@ -8,6 +8,7 @@ from __future__ import unicode_literals, print_function
 import frappe, os, json
 import frappe.utils
 from frappe import _
+from frappe.utils import cint
 
 def export_module_json(doc, is_standard, module):
 	"""Make a folder for the given doc and add its json file (make it a standard
@@ -39,11 +40,15 @@ def get_doc_module(module, doctype, name):
 def export_customizations(module, doctype, sync_on_migrate=0, with_permissions=0):
 	"""Export Custom Field and Property Setter for the current document to the app folder.
 		This will be synced with bench migrate"""
+
+	sync_on_migrate = cint(sync_on_migrate)
+	with_permissions = cint(with_permissions)
+
 	if not frappe.get_conf().developer_mode:
 		raise Exception('Not developer mode')
 
 	custom = {'custom_fields': [], 'property_setters': [], 'custom_perms': [],
-		'doctype': doctype, 'sync_on_migrate': 1}
+		'doctype': doctype, 'sync_on_migrate': sync_on_migrate}
 
 	def add(_doctype):
 		custom['custom_fields'] += frappe.get_all('Custom Field',

From 326e2b316893709091ad8e8ae449f5b328baa661 Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Thu, 4 Apr 2019 15:38:10 +0530
Subject: [PATCH 211/256] fix(Codacy): Comparison fix

---
 frappe/public/js/frappe/upload.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/upload.js b/frappe/public/js/frappe/upload.js
index 219ce08586..4a4481a463 100644
--- a/frappe/public/js/frappe/upload.js
+++ b/frappe/public/js/frappe/upload.js
@@ -223,7 +223,7 @@ frappe.upload = {
 		var i = -1;
 		frappe.upload.total_files = files ? files.length : 0;
 
-		if (frappe.upload.total_files == 1){
+		if (frappe.upload.total_files === 1){
 			frappe.upload.upload_file(files[0], args, opts);
 			return;
 		}

From 83f4d9b0f25f22790c7033cf57ab9d7fff834c3f Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Thu, 4 Apr 2019 15:55:43 +0530
Subject: [PATCH 212/256] fix:Styling fixes

---
 frappe/public/js/frappe/upload.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/upload.js b/frappe/public/js/frappe/upload.js
index 4a4481a463..ea32d852f3 100644
--- a/frappe/public/js/frappe/upload.js
+++ b/frappe/public/js/frappe/upload.js
@@ -223,9 +223,8 @@ frappe.upload = {
 		var i = -1;
 		frappe.upload.total_files = files ? files.length : 0;
 
-		if (frappe.upload.total_files === 1){
-			frappe.upload.upload_file(files[0], args, opts);
-			return;
+		if (frappe.upload.total_files === 1) {
+			return frappe.upload.upload_file(files[0], args, opts);
 		}
 		// upload the first file
 		upload_next();

From 7c6370a2d19b8d4648f1a00a8c5ab070aa2f6fe1 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Thu, 4 Apr 2019 16:17:59 +0530
Subject: [PATCH 213/256] fix: cancel existing subscription while creating new
 subscription

---
 .../doctype/paypal_settings/paypal_settings.py             | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/frappe/integrations/doctype/paypal_settings/paypal_settings.py b/frappe/integrations/doctype/paypal_settings/paypal_settings.py
index 62e0555437..de15650cb6 100644
--- a/frappe/integrations/doctype/paypal_settings/paypal_settings.py
+++ b/frappe/integrations/doctype/paypal_settings/paypal_settings.py
@@ -293,8 +293,9 @@ def create_recurring_profile(token, payerid):
 		addons = data.get("addons")
 		subscription_details = data.get("subscription_details")
 
-		if data.get('subscription_id') and addons:
-			updating = True
+		if data.get('subscription_id'):
+			if addons:
+				updating = True
 			manage_recurring_payment_profile_status(data['subscription_id'], 'Cancel', params, url)
 
 		params.update({
@@ -351,7 +352,7 @@ def update_integration_request_status(token, data, status, error=False, doc=None
 
 def get_redirect_uri(doc, token, payerid):
 	data = json.loads(doc.data)
-	
+
 	if data.get("subscription_details") or data.get("subscription_id"):
 		return get_url("{0}.create_recurring_profile?token={1}&payerid={2}".format(api_path, token, payerid))
 	else:

From 813230ed8757fae46019a7207cd90123233bb887 Mon Sep 17 00:00:00 2001
From: igrekus <upload234@mail.ru>
Date: Fri, 5 Apr 2019 01:24:41 +0300
Subject: [PATCH 214/256] fix: desktop shows empty categories for users with no
 perms (#7202)

---
 frappe/public/js/frappe/views/components/Desktop.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/views/components/Desktop.vue b/frappe/public/js/frappe/views/components/Desktop.vue
index f950d04e79..a21f4ec20b 100644
--- a/frappe/public/js/frappe/views/components/Desktop.vue
+++ b/frappe/public/js/frappe/views/components/Desktop.vue
@@ -12,7 +12,7 @@
 				{{ __('Show / Hide Cards') }}
 			</a>
 			<desk-section
-				v-if="get_modules_for_category(category)"
+				v-if="get_modules_for_category(category).length"
 				:category="category"
 				:modules="get_modules_for_category(category)"
 				@update_home_settings="hs => update_modules_with_home_settings(hs)"

From 281a51421755c62b45792edf95f4e0cacb8cc894 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 08:50:59 +0530
Subject: [PATCH 215/256] feat: Show popover with message instead of hiding add
 button

---
 frappe/public/js/frappe/form/review.js | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/form/review.js b/frappe/public/js/frappe/form/review.js
index d579a9253d..43f4a48be8 100644
--- a/frappe/public/js/frappe/form/review.js
+++ b/frappe/public/js/frappe/form/review.js
@@ -32,7 +32,6 @@ frappe.ui.form.Review = class Review {
 		this.review_list_wrapper = this.$wrapper.find('.review-list');
 	}
 	add_review_button() {
-		if (!this.points.review_points || !this.get_involved_users().length) return;
 
 		this.review_list_wrapper.append(`
 			<span class="avatar avatar-small avatar-empty btn-add-review" title="${__('Add Review')}">
@@ -40,7 +39,22 @@ frappe.ui.form.Review = class Review {
 			</span>
 		`);
 
-		this.review_list_wrapper.find('.btn-add-review').click(() => this.show());
+		const review_button = this.review_list_wrapper.find('.btn-add-review');
+
+		if (!this.points.review_points) {
+			review_button.click(false);
+			review_button.popover({
+				trigger: 'hover',
+				content: () => {
+					return `<div class="text-medium">
+						${__('You do not have enough review points')}
+					</div>`;
+				},
+				html: true
+			});
+		} else {
+			review_button.click(() => this.show_review_dialog());
+		}
 	}
 	get_involved_users() {
 		const user_fields = this.frm.meta.fields
@@ -64,7 +78,7 @@ frappe.ui.form.Review = class Review {
 			.filter(user => user !== frappe.session.user)
 			.filter(Boolean);
 	}
-	show() {
+	show_review_dialog() {
 		const user_options = this.get_involved_users();
 		const doc_owner = this.frm.doc.owner;
 		const review_dialog = new frappe.ui.Dialog({

From d971268c5300bfc9ae8ce624be1035a8ba3b67a8 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 09:08:22 +0530
Subject: [PATCH 216/256] feat: Enable toolbar for energy point rule

---
 .../social/doctype/energy_point_rule/energy_point_rule.json   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.json b/frappe/social/doctype/energy_point_rule/energy_point_rule.json
index 926b34f3a3..67cfd3f450 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.json
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.json
@@ -251,14 +251,14 @@
   }
  ],
  "has_web_view": 0,
- "hide_toolbar": 1,
+ "hide_toolbar": 0,
  "idx": 0,
  "in_create": 0,
  "is_submittable": 0,
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-03-27 11:57:27.672792",
+ "modified": "2019-04-05 09:07:28.080434",
  "modified_by": "Administrator",
  "module": "Social",
  "name": "Energy Point Rule",

From e59589d488e1a474f37aa51adceb8d84266fecbc Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 09:25:32 +0530
Subject: [PATCH 217/256] fix: Disable popover title

---
 frappe/public/less/common.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frappe/public/less/common.less b/frappe/public/less/common.less
index 1e6ff48746..9670f62138 100644
--- a/frappe/public/less/common.less
+++ b/frappe/public/less/common.less
@@ -324,3 +324,7 @@ a.no-decoration& {
 .disable-click {
 	pointer-events: none;
 }
+
+.popover-title {
+	display: none;
+}
\ No newline at end of file

From 8059573d9eada3e2ac894c9eb6689be30d98a759 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 10:58:16 +0530
Subject: [PATCH 218/256] fix: Make "Energy Point Rule" fields mandatory
 (#7195)

---
 .../energy_point_rule/energy_point_rule.json  | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.json b/frappe/social/doctype/energy_point_rule/energy_point_rule.json
index 926b34f3a3..cc160943a4 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.json
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.json
@@ -30,7 +30,7 @@
    "ignore_xss_filter": 0,
    "in_filter": 0,
    "in_global_search": 0,
-   "in_list_view": 0,
+   "in_list_view": 1,
    "in_standard_filter": 0,
    "label": "Enabled",
    "length": 0,
@@ -42,7 +42,7 @@
    "read_only": 0,
    "remember_last_selected_value": 0,
    "report_hide": 0,
-   "reqd": 0,
+   "reqd": 1,
    "search_index": 0,
    "set_only_once": 0,
    "translatable": 0,
@@ -63,7 +63,7 @@
    "ignore_xss_filter": 0,
    "in_filter": 0,
    "in_global_search": 0,
-   "in_list_view": 0,
+   "in_list_view": 1,
    "in_standard_filter": 0,
    "label": "Rule Name",
    "length": 0,
@@ -75,7 +75,7 @@
    "read_only": 0,
    "remember_last_selected_value": 0,
    "report_hide": 0,
-   "reqd": 0,
+   "reqd": 1,
    "search_index": 0,
    "set_only_once": 0,
    "translatable": 0,
@@ -96,7 +96,7 @@
    "ignore_xss_filter": 0,
    "in_filter": 0,
    "in_global_search": 0,
-   "in_list_view": 0,
+   "in_list_view": 1,
    "in_standard_filter": 0,
    "label": "Reference Doctype",
    "length": 0,
@@ -109,7 +109,7 @@
    "read_only": 0,
    "remember_last_selected_value": 0,
    "report_hide": 0,
-   "reqd": 0,
+   "reqd": 1,
    "search_index": 0,
    "set_only_once": 0,
    "translatable": 0,
@@ -122,7 +122,8 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "description": "If the condition is satisfied user will be rewarded with the points\n",
+   "depends_on": "",
+   "description": "If the condition is satisfied user will be rewarded with the points. eg. doc.status == 'Closed'\n",
    "fetch_if_empty": 0,
    "fieldname": "condition",
    "fieldtype": "Code",
@@ -131,7 +132,7 @@
    "ignore_xss_filter": 0,
    "in_filter": 0,
    "in_global_search": 0,
-   "in_list_view": 0,
+   "in_list_view": 1,
    "in_standard_filter": 0,
    "label": "Condition",
    "length": 0,
@@ -143,7 +144,7 @@
    "read_only": 0,
    "remember_last_selected_value": 0,
    "report_hide": 0,
-   "reqd": 0,
+   "reqd": 1,
    "search_index": 0,
    "set_only_once": 0,
    "translatable": 0,
@@ -176,7 +177,7 @@
    "read_only": 0,
    "remember_last_selected_value": 0,
    "report_hide": 0,
-   "reqd": 0,
+   "reqd": 1,
    "search_index": 0,
    "set_only_once": 0,
    "translatable": 0,
@@ -210,7 +211,7 @@
    "read_only": 0,
    "remember_last_selected_value": 0,
    "report_hide": 0,
-   "reqd": 0,
+   "reqd": 1,
    "search_index": 0,
    "set_only_once": 0,
    "translatable": 0,
@@ -258,7 +259,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-03-27 11:57:27.672792",
+ "modified": "2019-04-04 12:05:07.736969",
  "modified_by": "Administrator",
  "module": "Social",
  "name": "Energy Point Rule",

From 674bee4cdeb2cd9833a285a178f135974c50c7d1 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 5 Apr 2019 11:01:51 +0530
Subject: [PATCH 219/256] fix: fetch all contacts and addresses

---
 .../addresses_and_contacts.py                 | 21 +++++++++++++------
 .../test_addresses_and_contacts.py            |  2 +-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/frappe/contacts/report/addresses_and_contacts/addresses_and_contacts.py b/frappe/contacts/report/addresses_and_contacts/addresses_and_contacts.py
index ce0d91953f..354911cd70 100644
--- a/frappe/contacts/report/addresses_and_contacts/addresses_and_contacts.py
+++ b/frappe/contacts/report/addresses_and_contacts/addresses_and_contacts.py
@@ -67,10 +67,14 @@ def get_reference_addresses_and_contact(reference_doctype, reference_name):
 			result.extend(add_blank_columns_for("Address"))
 			data.append(result)
 		else:
-			result = [reference_name]
-			result.extend(list(addresses) or add_blank_columns_for("Address"))
-			result.extend(list(contacts) or add_blank_columns_for("Contact"))
-			data.append(result)
+			max_length = max(len(addresses), len(contacts))
+			for idx in range(0, max_length):
+				result = [reference_name]
+
+				result.extend(list(addresses[idx].values()) if idx < len(addresses) else add_blank_columns_for("Address"))
+				result.extend(list(contacts[idx].values()) if idx < len(contacts) else add_blank_columns_for("Contact"))
+
+				data.append(result)
 
 	return data
 
@@ -81,9 +85,14 @@ def get_reference_details(reference_doctype, doctype, reference_list, reference_
 	]
 	fields = ["`tabDynamic Link`.link_name"] + field_map.get(doctype, [])
 
-	records = frappe.get_list(doctype, filters=filters, fields=fields, as_list=True)
+	records = frappe.get_list(doctype, filters=filters, fields=fields)
+	temp_records = list()
+
 	for d in records:
-		reference_details[d[0]][frappe.scrub(doctype)] = d[1:]
+		d.pop('link_name')
+		temp_records.append(d)
+
+	reference_details[reference_list[0]][frappe.scrub(doctype)] = temp_records
 	return reference_details
 
 def add_blank_columns_for(doctype):
diff --git a/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py b/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py
index b375874655..4e76256342 100644
--- a/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py
+++ b/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py
@@ -94,7 +94,7 @@ def create_linked_contact(link_list):
 
 class TestAddressesAndContacts(unittest.TestCase):
 	def test_get_data(self):
-		linked_docs = [get_custom_doc_for_address_and_contacts(), get_custom_doc_for_address_and_contacts(), get_custom_doc_for_address_and_contacts()]
+		linked_docs = [get_custom_doc_for_address_and_contacts()]
 		links_list = [item.name for item in linked_docs]
 		create_linked_contact(links_list)
 		create_linked_address(links_list)

From 25282d471ef0532eeb8d7e140c84118455b09004 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 11:28:53 +0530
Subject: [PATCH 220/256] fix: Export parent fields while exporting fixtures
 (#7199)

To allow the export of doctypes like "Custom DocPerm" which needs parent fields.
---
 frappe/core/doctype/data_import/data_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/core/doctype/data_import/data_import.py b/frappe/core/doctype/data_import/data_import.py
index 3ca154c384..dc2f9194b9 100644
--- a/frappe/core/doctype/data_import/data_import.py
+++ b/frappe/core/doctype/data_import/data_import.py
@@ -71,7 +71,7 @@ def import_file_by_path(path, ignore_links=False, overwrite=False, submit=False,
 
 def export_json(doctype, path, filters=None, or_filters=None, name=None, order_by="creation asc"):
 	def post_process(out):
-		del_keys = ('parent', 'parentfield', 'parenttype', 'modified_by', 'creation', 'owner', 'idx')
+		del_keys = ('modified_by', 'creation', 'owner', 'idx')
 		for doc in out:
 			for key in del_keys:
 				if key in doc:

From 88e6d6927ce94aa84db008e23d7afa7cc23b171e Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 11:29:04 +0530
Subject: [PATCH 221/256] fix: Export parent fields while exporting fixtures
 (#7196)

- To allow the export of doctypes like "Custom DocPerm"  which needs parent fields.
---
 frappe/core/doctype/data_import/data_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/core/doctype/data_import/data_import.py b/frappe/core/doctype/data_import/data_import.py
index 3ca154c384..dc2f9194b9 100644
--- a/frappe/core/doctype/data_import/data_import.py
+++ b/frappe/core/doctype/data_import/data_import.py
@@ -71,7 +71,7 @@ def import_file_by_path(path, ignore_links=False, overwrite=False, submit=False,
 
 def export_json(doctype, path, filters=None, or_filters=None, name=None, order_by="creation asc"):
 	def post_process(out):
-		del_keys = ('parent', 'parentfield', 'parenttype', 'modified_by', 'creation', 'owner', 'idx')
+		del_keys = ('modified_by', 'creation', 'owner', 'idx')
 		for doc in out:
 			for key in del_keys:
 				if key in doc:

From 40b299059574154a2f50598dd811fc3027e42ff0 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 11:32:15 +0530
Subject: [PATCH 222/256] fix: Make review only if energy point system is
 enabled

---
 frappe/public/js/frappe/form/form_sidebar.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/frappe/public/js/frappe/form/form_sidebar.js b/frappe/public/js/frappe/form/form_sidebar.js
index 877f63f9af..7ace78a90f 100644
--- a/frappe/public/js/frappe/form/form_sidebar.js
+++ b/frappe/public/js/frappe/form/form_sidebar.js
@@ -20,11 +20,11 @@ frappe.ui.form.Sidebar = Class.extend({
 		this.make_attachments();
 		this.make_shared();
 		this.make_viewers();
-		this.make_review();
 
 		this.make_tags();
 		this.make_like();
 		this.make_follow();
+		this.make_review();
 
 		this.bind_events();
 		frappe.ui.form.setup_user_image_event(this.frm);
@@ -45,7 +45,7 @@ frappe.ui.form.Sidebar = Class.extend({
 			frappe.ui.toggle_like(me.like_icon, me.frm.doctype, me.frm.doc.name, function() {
 				me.refresh_like();
 			});
-		})
+		});
 	},
 
 	refresh: function() {
@@ -169,9 +169,11 @@ frappe.ui.form.Sidebar = Class.extend({
 	},
 
 	make_review: function() {
-		this.frm.reviews = new frappe.ui.form.Review({
-			parent: this.sidebar.find(".form-attachments"),
-			frm: this.frm
-		});
+		if (frappe.boot.energy_points_enabled) {
+			this.frm.reviews = new frappe.ui.form.Review({
+				parent: this.sidebar.find(".form-attachments"),
+				frm: this.frm
+			});
+		}
 	}
 });

From 991cf21704463b49b82a42d405758c954fe856c1 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 12:51:00 +0530
Subject: [PATCH 223/256] refactor: Abstract energy point utils

---
 frappe/public/build.json                      |  5 +++-
 .../js/frappe/misc/energy_point_utils.js      | 30 +++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 frappe/public/js/frappe/misc/energy_point_utils.js

diff --git a/frappe/public/build.json b/frappe/public/build.json
index 76cab5a040..9ed5ec32bc 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -256,7 +256,10 @@
 
 		"public/js/frappe/chat.js",
 
-		"public/js/frappe/social/social_factory.js"
+		"public/js/frappe/social/social_factory.js",
+
+		"public/js/frappe/misc/energy_point_utils.js"
+
 	],
 	"css/module.min.css": [
 		"public/less/module.less"
diff --git a/frappe/public/js/frappe/misc/energy_point_utils.js b/frappe/public/js/frappe/misc/energy_point_utils.js
new file mode 100644
index 0000000000..46afc9b412
--- /dev/null
+++ b/frappe/public/js/frappe/misc/energy_point_utils.js
@@ -0,0 +1,30 @@
+// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
+// MIT License. See license.txt
+
+frappe.provide('frappe.energy_points');
+
+Object.assign(frappe.energy_points, {
+	get_points(points) {
+		return `<span class='bold' style="color: ${points >= 0 ? '#45A163': '#e42121'}">
+			${points > 0 ? '+': ''}${points}
+		</span>`;
+	},
+	log_message(log) {
+		const doc_link = frappe.utils.get_form_link(log.reference_doctype, log.reference_name, true);
+		const owner_name = frappe.user.full_name(log.owner).bold();
+		if (log.type === 'Appreciation') {
+			return __('{0} appreciated on {1}', [owner_name, doc_link]);
+		}
+		if (log.type === 'Criticism') {
+			return __('{0} criticized on {1}', [owner_name, doc_link]);
+		}
+		return __('via automatic rule {0} for {1}', [log.rule.bold(), doc_link]);
+	},
+	format_log(log, with_timestamp=true) {
+		let formatted_log = `<span>
+			${this.get_points(log.points)}&nbsp;${this.log_message(log)}
+			${ with_timestamp ? '<span>&nbsp;-&nbsp;</span>' + frappe.datetime.comment_when(log.creation):''}
+		</span>`;
+		return formatted_log;
+	},
+});
\ No newline at end of file

From e0a1bc92f516d51c6c116f8b1588b3d78c42f205 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 12:52:24 +0530
Subject: [PATCH 224/256] refactor: Get energy point log from docinfo

---
 frappe/desk/form/load.py               |  7 ++++++
 frappe/public/js/frappe/form/review.js | 31 +++++++++++++-------------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index a6a5c4a94e..56f15da39d 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -102,6 +102,7 @@ def get_docinfo(doc=None, doctype=None, name=None):
 		"shared": frappe.share.get_users(doc.doctype, doc.name),
 		"rating": get_feedback_rating(doc.doctype, doc.name),
 		"views": get_view_logs(doc.doctype, doc.name),
+		"energy_point_logs": get_point_logs(doc.doctype, doc.name),
 		"is_document_followed": is_document_followed(doc.doctype, doc.name, frappe.session.user),
 		"document_follow_enabled": frappe.db.get_value("User", frappe.session.user, "document_follow_notify")
 	}
@@ -136,6 +137,12 @@ def get_comments(doctype, name):
 
 	return comments
 
+def get_point_logs(doctype, docname):
+	return frappe.db.get_all('Energy Point Log', filters={
+		'reference_doctype': doctype,
+		'reference_name': docname
+	}, fields=['*'])
+
 def _get_communications(doctype, name, start=0, limit=20):
 	communications = get_communication_data(doctype, name, start, limit)
 	for c in communications:
diff --git a/frappe/public/js/frappe/form/review.js b/frappe/public/js/frappe/form/review.js
index 43f4a48be8..8fed9d33ba 100644
--- a/frappe/public/js/frappe/form/review.js
+++ b/frappe/public/js/frappe/form/review.js
@@ -127,9 +127,10 @@ frappe.ui.form.Review = class Review {
 					points: values.points,
 					review_type: values.review_type,
 					reason: values.reason
-				}).then(() => {
+				}).then(review => {
 					review_dialog.hide();
 					review_dialog.clear();
+					this.frm.get_docinfo().energy_point_logs.unshift(review);
 					this.update_reviewers();
 				});
 			},
@@ -138,21 +139,19 @@ frappe.ui.form.Review = class Review {
 		review_dialog.show();
 	}
 	update_reviewers() {
-		frappe.xcall('frappe.social.doctype.energy_point_log.energy_point_log.get_reviews', {
-			'doctype': this.frm.doc.doctype,
-			'docname': this.frm.doc.name,
-		}).then(review_logs => {
-			this.review_list_wrapper.find('.review-pill').remove();
-			review_logs.forEach(log => {
-				let review_pill = $(`
-					<span class="review-pill">
-						${frappe.avatar(log.owner)}
-						${frappe.utils.get_points(log.points)}
-					</span>
-				`);
-				this.review_list_wrapper.prepend(review_pill);
-				this.setup_detail_popover(review_pill, log);
-			});
+		const review_logs = this.frm.get_docinfo().energy_point_logs
+			.filter(log => log.type !== 'Auto');
+
+		this.review_list_wrapper.find('.review-pill').remove();
+		review_logs.forEach(log => {
+			let review_pill = $(`
+				<span class="review-pill">
+					${frappe.avatar(log.owner)}
+					${frappe.energy_points.get_points(log.points)}
+				</span>
+			`);
+			this.review_list_wrapper.prepend(review_pill);
+			this.setup_detail_popover(review_pill, log);
 		});
 	}
 	setup_detail_popover(el, data) {

From 3da809146ccb46d029edd42dffbde5aa15ea8b50 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 12:54:00 +0530
Subject: [PATCH 225/256] feat: Show energy point logs on form timeline

---
 frappe/public/js/frappe/form/footer/timeline.js    | 14 ++++++++++++++
 .../js/frappe/form/footer/timeline_item.html       |  2 ++
 frappe/public/js/frappe/misc/utils.js              |  8 +-------
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js
index b2926b31d8..545d8b45f5 100644
--- a/frappe/public/js/frappe/form/footer/timeline.js
+++ b/frappe/public/js/frappe/form/footer/timeline.js
@@ -159,6 +159,10 @@ frappe.ui.form.Timeline = class Timeline {
 
 		// append comments
 		timeline = timeline.concat(this.get_comments());
+
+		// append energy point logs
+		timeline = timeline.concat(this.get_energy_point_logs());
+
 		// sort
 		timeline
 			.filter(a => a.content)
@@ -514,6 +518,16 @@ frappe.ui.form.Timeline = class Timeline {
 		return docinfo.comments;
 	}
 
+	get_energy_point_logs() {
+		let energy_point_logs = this.frm.get_docinfo().energy_point_logs;
+		energy_point_logs.map(log => {
+			log.comment_type = 'Energy Points';
+			log.content = frappe.energy_points.format_log(log);
+			return log;
+		});
+		return energy_point_logs;
+	}
+
 	cast_comment_as_communication(c) {
 		c.sender = c.comment_email;
 		c.sender_full_name = c.comment_by;
diff --git a/frappe/public/js/frappe/form/footer/timeline_item.html b/frappe/public/js/frappe/form/footer/timeline_item.html
index 0815481030..3a79bed370 100755
--- a/frappe/public/js/frappe/form/footer/timeline_item.html
+++ b/frappe/public/js/frappe/form/footer/timeline_item.html
@@ -183,6 +183,8 @@
 						{% } %}
 						{%= __("Liked by {0}", [data.fullname]) %}
 					</span>
+					{% } else if (data.comment_type == "Energy Points") { %}
+						{{ data.content_html }}
 					{% } else { %}
 						<b title="{{ data.comment_by }}">{%= data.fullname %}</b>
 						{%= __(data.content) %}
diff --git a/frappe/public/js/frappe/misc/utils.js b/frappe/public/js/frappe/misc/utils.js
index ecbfaa555a..cdd8a614ad 100644
--- a/frappe/public/js/frappe/misc/utils.js
+++ b/frappe/public/js/frappe/misc/utils.js
@@ -31,7 +31,7 @@ Object.assign(frappe.utils, {
 		if (!txt) return false;
 
 		if(txt.indexOf("<br>")==-1 && txt.indexOf("<p")==-1
-			&& txt.indexOf("<img")==-1 && txt.indexOf("<div")==-1) {
+			&& txt.indexOf("<img")==-1 && txt.indexOf("<div")==-1 && !txt.includes('<span')) {
 			return false;
 		}
 		return true;
@@ -688,12 +688,6 @@ Object.assign(frappe.utils, {
 	deep_equal(a, b) {
 		return deep_equal(a, b);
 	},
-
-	get_points(points) {
-		return `<span class='bold' style="color: ${points >= 0 ? '#45A163': '#e42121'}">
-			${points > 0 ? '+': ''}${points}
-		</span>`;
-	}
 });
 
 // Array de duplicate

From 50ad3ea9f01f7a79ef1b483568e8d551b514b6fe Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 12:57:19 +0530
Subject: [PATCH 226/256] fix: History toggle

---
 frappe/public/js/frappe/social/pages/UserList.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/social/pages/UserList.vue b/frappe/public/js/frappe/social/pages/UserList.vue
index 407412c167..76e91af98e 100644
--- a/frappe/public/js/frappe/social/pages/UserList.vue
+++ b/frappe/public/js/frappe/social/pages/UserList.vue
@@ -17,9 +17,8 @@
 			</li>
 			<li
 				v-for="user in filtered_users"
-				:key="user.name"
-				@click="toggle_log(user.name)">
-				<div class="user-card">
+				:key="user.name">
+				<div class="user-card" @click="toggle_log(user.name)">
 					<div class="user-details flex">
 						<span v-html="get_avatar(user.name)"></span>
 						<span>
@@ -180,8 +179,6 @@ export default {
 }
 .energy-point-history {
 	border-bottom: 1px solid @border-color;
-	max-height: 300px;
-	overflow: scroll;
 	background-color: @light-bg;
 }
 </style>

From 872b867d63cd858c6d6c5c591f01aed1a78ac630 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 12:59:38 +0530
Subject: [PATCH 227/256] refactor: Use commonified code for formatted log

---
 .../social/components/EnergyPointHistory.vue  | 23 +------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/frappe/public/js/frappe/social/components/EnergyPointHistory.vue b/frappe/public/js/frappe/social/components/EnergyPointHistory.vue
index 6d15e30633..aae03b6b09 100644
--- a/frappe/public/js/frappe/social/components/EnergyPointHistory.vue
+++ b/frappe/public/js/frappe/social/components/EnergyPointHistory.vue
@@ -2,10 +2,7 @@
 	<div>
 		<ul class="log-list">
 			<li class="history-log" v-for="log in history_logs" :key="log.name">
-				<span v-html="frappe.utils.get_points(log.points)"></span>
-				<span v-html="log_body(log)"></span>
-				<span>&nbsp;-&nbsp;</span>
-				<span v-html="frappe.datetime.comment_when(log.creation)"></span>
+				<span v-html="frappe.energy_points.format_log(log, true)"></span>
 			</li>
 			<li v-if="!history_logs.length" class="history-log">
 				{{__('No logs found')}}
@@ -32,19 +29,6 @@ export default {
 			this.history_logs = data;
 		})
 	},
-	methods: {
-		log_body(log) {
-			const doc_link = frappe.utils.get_form_link(log.reference_doctype, log.reference_name, true)
-			const owner_name = frappe.user.full_name(log.owner).bold();
-			if (log.type === 'Appreciation') {
-				return __('{0} appreciated on {1}', [owner_name, doc_link])
-			}
-			if (log.type === 'Criticism') {
-				return __('{0} criticized on {1}', [owner_name, doc_link])
-			}
-			return __('via automatic rule {0} for {1}', [log.rule.bold(), doc_link])
-		}
-	}
 
 }
 </script>
@@ -71,11 +55,6 @@ export default {
 	padding: 10px;
 	padding-left: 50px;
 	display: flex;
-	span:nth-child(1) {
-		width: 40px;
-		text-align: right;
-		margin-right: 10px;
-	}
 	position: relative;
 }
 .history-log:before {

From 48e16de859b8f64af9bfe3e32bd4903767a712ba Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 13:00:05 +0530
Subject: [PATCH 228/256] fix: Return review doc on new review creation

---
 frappe/social/doctype/energy_point_log/energy_point_log.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index b8d5ef4642..2f2e40e135 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -134,6 +134,8 @@ def review(doc, points, to_user, reason, review_type='Appreciation'):
 		docname=review_doc.name
 	)
 
+	return review_doc
+
 @frappe.whitelist()
 def get_reviews(doctype, docname):
 	return frappe.get_all('Energy Point Log', filters={

From 0e077dbfa82ec8b508bebd1eb7d2d4431f93a257 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 13:03:13 +0530
Subject: [PATCH 229/256] fix: Set with_timestamp=false by default

---
 frappe/public/js/frappe/misc/energy_point_utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/misc/energy_point_utils.js b/frappe/public/js/frappe/misc/energy_point_utils.js
index 46afc9b412..4bf2b3b8f6 100644
--- a/frappe/public/js/frappe/misc/energy_point_utils.js
+++ b/frappe/public/js/frappe/misc/energy_point_utils.js
@@ -20,7 +20,7 @@ Object.assign(frappe.energy_points, {
 		}
 		return __('via automatic rule {0} for {1}', [log.rule.bold(), doc_link]);
 	},
-	format_log(log, with_timestamp=true) {
+	format_log(log, with_timestamp=false) {
 		let formatted_log = `<span>
 			${this.get_points(log.points)}&nbsp;${this.log_message(log)}
 			${ with_timestamp ? '<span>&nbsp;-&nbsp;</span>' + frappe.datetime.comment_when(log.creation):''}

From 5599634927780d9db835efccdffb75703a24a3b7 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Fri, 5 Apr 2019 13:14:49 +0530
Subject: [PATCH 230/256] fix(ux): assign box

---
 frappe/public/js/frappe/form/footer/assign_to.js | 7 +++++--
 frappe/public/js/frappe/ui/dialog.js             | 5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/form/footer/assign_to.js b/frappe/public/js/frappe/form/footer/assign_to.js
index 95ddebcc99..147ed7731e 100644
--- a/frappe/public/js/frappe/form/footer/assign_to.js
+++ b/frappe/public/js/frappe/form/footer/assign_to.js
@@ -185,6 +185,7 @@ frappe.ui.add_assignment = function(opts, dialog) {
 	var assign_to = dialog.fields_dict.assign_to.get_value();
 	var args = dialog.get_values();
 	if(args && assign_to) {
+		dialog.set_message('Assigning...');
 		return frappe.call({
 			method: opts.method,
 			args: $.extend(args, {
@@ -194,15 +195,17 @@ frappe.ui.add_assignment = function(opts, dialog) {
 				bulk_assign:  opts.bulk_assign || false,
 				re_assign: opts.re_assign || false
 			}),
-			callback: function(r,rt) {
+			btn: dialog.get_primary_btn(),
+			callback: function(r) {
 				if(!r.exc) {
 					if(opts.callback){
 						opts.callback(r);
 					}
 					dialog && dialog.hide();
+				} else {
+					dialog.clear_message();
 				}
 			},
-			btn: this
 		});
 	}
 }
diff --git a/frappe/public/js/frappe/ui/dialog.js b/frappe/public/js/frappe/ui/dialog.js
index 0a08c5f0ec..a09c62af32 100644
--- a/frappe/public/js/frappe/ui/dialog.js
+++ b/frappe/public/js/frappe/ui/dialog.js
@@ -112,6 +112,11 @@ frappe.ui.Dialog = class Dialog extends frappe.ui.FieldGroup {
 		this.$body.removeClass('hide');
 	}
 
+	clear() {
+		super();
+		this.clear_message();
+	}
+
 	set_primary_action(label, click) {
 		this.has_primary_action = true;
 		var me = this;

From 14f63830adb6d5f4fff51769eb7dccce6f49c9e9 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Fri, 5 Apr 2019 13:29:07 +0530
Subject: [PATCH 231/256] fix: test case

---
 .../addresses_and_contacts/test_addresses_and_contacts.py     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py b/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py
index 4e76256342..7a21645a82 100644
--- a/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py
+++ b/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py
@@ -94,7 +94,7 @@ def create_linked_contact(link_list):
 
 class TestAddressesAndContacts(unittest.TestCase):
 	def test_get_data(self):
-		linked_docs = [get_custom_doc_for_address_and_contacts()]
+		linked_docs = get_custom_doc_for_address_and_contacts()
 		links_list = [item.name for item in linked_docs]
 		create_linked_contact(links_list)
 		create_linked_address(links_list)
@@ -104,4 +104,4 @@ class TestAddressesAndContacts(unittest.TestCase):
 			self.assertIn(test_item, report_data)
 
 	def tearDown(self):
-		frappe.db.rollback()
\ No newline at end of file
+		frappe.db.rollback()

From 0fcececd9fddfaa79399a3fd5e849b589dbddfef Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 13:54:23 +0530
Subject: [PATCH 232/256] fix: Remove Administrator from involved users

---
 frappe/public/js/frappe/form/review.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/review.js b/frappe/public/js/frappe/form/review.js
index 8fed9d33ba..c484b78340 100644
--- a/frappe/public/js/frappe/form/review.js
+++ b/frappe/public/js/frappe/form/review.js
@@ -75,7 +75,7 @@ frappe.ui.form.Review = class Review {
 
 		return involved_users
 			.uniqBy(u => u)
-			.filter(user => user !== frappe.session.user)
+			.filter(user => !['Administrator', frappe.session.user].includes(user))
 			.filter(Boolean);
 	}
 	show_review_dialog() {

From 44da34b4b4ce1e1b522234eb39a086fca1620db9 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 14:11:51 +0530
Subject: [PATCH 233/256] feat: Show Indicator for with energy point alert

---
 .../energy_point_log/energy_point_log.py      | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index 2f2e40e135..34f1013aee 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -15,33 +15,40 @@ class EnergyPointLog(Document):
 			frappe.throw(_('You cannot give review points to yourself'))
 
 	def after_insert(self):
-		message = get_alert_message(self)
-		if message:
-			frappe.publish_realtime('energy_point_alert', message=message, user=self.user)
+		alert_dict = get_alert_dict(self)
+		if alert_dict:
+			frappe.publish_realtime('energy_point_alert', message=alert_dict, user=self.user)
 
 		frappe.cache().hdel('energy_points', self.user)
 		frappe.publish_realtime('update_points')
 
-def get_alert_message(doc):
-	message = ''
+def get_alert_dict(doc):
+	alert_dict = frappe._dict({
+		'message': '',
+		'indicator': 'green'
+	})
 	owner_name = get_fullname(doc.owner)
 	doc_link = frappe.get_desk_link(doc.reference_doctype, doc.reference_name)
 	points = frappe.bold(doc.points)
 	if doc.type == 'Auto':
-		message=_('You gained {} points').format(points)
+		alert_dict.message=_('You gained {} points').format(points)
 	elif doc.type == 'Appreciation':
-		message = _('{} appreciated your work on {} with {} points'.format(
+		alert_dict.message = _('{} appreciated your work on {} with {} points'.format(
 			owner_name,
 			doc_link,
 			points
 		))
 	elif doc.type == 'Criticism':
-		message = _('{} criticized your work on {} with {} points'.format(
+		alert_dict.message = _('{} criticized your work on {} with {} points'.format(
 			owner_name,
 			doc_link,
 			points
 		))
-	return message
+		alert_dict.indicator = 'red'
+	else:
+		alert_dict = {}
+
+	return alert_dict
 
 def create_energy_points_log(ref_doctype, ref_name, doc):
 	doc = frappe._dict(doc)

From 9633b4fb0026e348f29c5b20e97c8af1048cdad8 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 14:47:57 +0530
Subject: [PATCH 234/256] fix: Modify log message

---
 frappe/public/js/frappe/misc/energy_point_utils.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/misc/energy_point_utils.js b/frappe/public/js/frappe/misc/energy_point_utils.js
index 4bf2b3b8f6..cdee77a2ed 100644
--- a/frappe/public/js/frappe/misc/energy_point_utils.js
+++ b/frappe/public/js/frappe/misc/energy_point_utils.js
@@ -12,13 +12,14 @@ Object.assign(frappe.energy_points, {
 	log_message(log) {
 		const doc_link = frappe.utils.get_form_link(log.reference_doctype, log.reference_name, true);
 		const owner_name = frappe.user.full_name(log.owner).bold();
+		const user = frappe.user.full_name(log.user).bold();
 		if (log.type === 'Appreciation') {
-			return __('{0} appreciated on {1}', [owner_name, doc_link]);
+			return __('{0} appreciated {1} on {2}', [owner_name, user, doc_link]);
 		}
 		if (log.type === 'Criticism') {
-			return __('{0} criticized on {1}', [owner_name, doc_link]);
+			return __('{0} criticized {1} on {2}', [owner_name, user, doc_link]);
 		}
-		return __('via automatic rule {0} for {1}', [log.rule.bold(), doc_link]);
+		return __('for {0} via automatic rule {1} on {2}', [user, log.rule.bold(), doc_link]);
 	},
 	format_log(log, with_timestamp=false) {
 		let formatted_log = `<span>

From 1b4550c5033a88e7ff575b324ee75cb916b0935a Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 5 Apr 2019 15:05:09 +0530
Subject: [PATCH 235/256] fix: test case

---
 .../addresses_and_contacts/test_addresses_and_contacts.py       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py b/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py
index 7a21645a82..c7637ce202 100644
--- a/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py
+++ b/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py
@@ -94,7 +94,7 @@ def create_linked_contact(link_list):
 
 class TestAddressesAndContacts(unittest.TestCase):
 	def test_get_data(self):
-		linked_docs = get_custom_doc_for_address_and_contacts()
+		linked_docs = [get_custom_doc_for_address_and_contacts()]
 		links_list = [item.name for item in linked_docs]
 		create_linked_contact(links_list)
 		create_linked_address(links_list)

From f06fa603d7031df87386e265aaba40ab53342239 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 5 Apr 2019 15:22:55 +0530
Subject: [PATCH 236/256] fix: test case

---
 .../addresses_and_contacts/test_addresses_and_contacts.py       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py b/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py
index c7637ce202..a016a46a7e 100644
--- a/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py
+++ b/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py
@@ -101,7 +101,7 @@ class TestAddressesAndContacts(unittest.TestCase):
 		report_data = get_data({"reference_doctype": "Test Custom Doctype"})
 		for link in links_list:
 			test_item = [link, 'test address line 1', 'test address line 2', 'Milan', None, None, 'Italy', 0, '_Test First Name', '_Test Last Name', '+91 0000000000', None, 'test_contact@example.com', 1]
-			self.assertIn(test_item, report_data)
+			self.assertEquals(test_item, report_data)
 
 	def tearDown(self):
 		frappe.db.rollback()

From 422a1e151b7e81d4fbf96356713097c26636b239 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 5 Apr 2019 16:00:16 +0530
Subject: [PATCH 237/256] fix: test cases using assertListEqual

---
 .../addresses_and_contacts/test_addresses_and_contacts.py     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py b/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py
index a016a46a7e..e315019ca7 100644
--- a/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py
+++ b/frappe/contacts/report/addresses_and_contacts/test_addresses_and_contacts.py
@@ -99,9 +99,9 @@ class TestAddressesAndContacts(unittest.TestCase):
 		create_linked_contact(links_list)
 		create_linked_address(links_list)
 		report_data = get_data({"reference_doctype": "Test Custom Doctype"})
-		for link in links_list:
+		for idx, link in enumerate(links_list):
 			test_item = [link, 'test address line 1', 'test address line 2', 'Milan', None, None, 'Italy', 0, '_Test First Name', '_Test Last Name', '+91 0000000000', None, 'test_contact@example.com', 1]
-			self.assertEquals(test_item, report_data)
+			self.assertListEqual(test_item, report_data[idx])
 
 	def tearDown(self):
 		frappe.db.rollback()

From 1972ff2375d6981206e625f811af2f3041bdcfa5 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Fri, 5 Apr 2019 17:09:04 +0600
Subject: [PATCH 238/256] bumped to version 11.1.19

---
 frappe/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 11263a831e..913f6440ff 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -24,7 +24,7 @@ if sys.version[0] == '2':
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '11.1.18'
+__version__ = '11.1.19'
 __title__ = "Frappe Framework"
 
 local = Local()

From 7e8fc8f69e1fd7c2b2f4ae04768de36f3de5f2b7 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 19:16:15 +0530
Subject: [PATCH 239/256] fix: Skip review logs - while adding to enegy point
 logs to docinfo

---
 frappe/desk/form/load.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index 56f15da39d..3107c97895 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -140,7 +140,8 @@ def get_comments(doctype, name):
 def get_point_logs(doctype, docname):
 	return frappe.db.get_all('Energy Point Log', filters={
 		'reference_doctype': doctype,
-		'reference_name': docname
+		'reference_name': docname,
+		'type': ['!=', 'Review']
 	}, fields=['*'])
 
 def _get_communications(doctype, name, start=0, limit=20):

From e8cd9dc4c60cfbbe5a267fa0ef74ef4ea4ebff20 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 19:42:16 +0530
Subject: [PATCH 240/256] fix: Include only appreciation and criticism logs for
 review pills

---
 frappe/public/js/frappe/form/review.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/review.js b/frappe/public/js/frappe/form/review.js
index c484b78340..1799cd68b5 100644
--- a/frappe/public/js/frappe/form/review.js
+++ b/frappe/public/js/frappe/form/review.js
@@ -140,7 +140,7 @@ frappe.ui.form.Review = class Review {
 	}
 	update_reviewers() {
 		const review_logs = this.frm.get_docinfo().energy_point_logs
-			.filter(log => log.type !== 'Auto');
+			.filter(log => ['Appreciation', 'Criticism'].includes(log.type));
 
 		this.review_list_wrapper.find('.review-pill').remove();
 		review_logs.forEach(log => {

From 950ce155f733bc064c7ace57a7dccd153aa6499b Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 19:46:43 +0530
Subject: [PATCH 241/256] fix: format energy point log for history and form
 separately

---
 .../public/js/frappe/form/footer/timeline.js  |  2 +-
 .../js/frappe/misc/energy_point_utils.js      | 64 ++++++++++++++-----
 .../social/components/EnergyPointHistory.vue  |  2 +-
 3 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js
index 545d8b45f5..5f2acd3929 100644
--- a/frappe/public/js/frappe/form/footer/timeline.js
+++ b/frappe/public/js/frappe/form/footer/timeline.js
@@ -522,7 +522,7 @@ frappe.ui.form.Timeline = class Timeline {
 		let energy_point_logs = this.frm.get_docinfo().energy_point_logs;
 		energy_point_logs.map(log => {
 			log.comment_type = 'Energy Points';
-			log.content = frappe.energy_points.format_log(log);
+			log.content = frappe.energy_points.format_form_log(log);
 			return log;
 		});
 		return energy_point_logs;
diff --git a/frappe/public/js/frappe/misc/energy_point_utils.js b/frappe/public/js/frappe/misc/energy_point_utils.js
index cdee77a2ed..d9a64a41d8 100644
--- a/frappe/public/js/frappe/misc/energy_point_utils.js
+++ b/frappe/public/js/frappe/misc/energy_point_utils.js
@@ -9,23 +9,55 @@ Object.assign(frappe.energy_points, {
 			${points > 0 ? '+': ''}${points}
 		</span>`;
 	},
-	log_message(log) {
-		const doc_link = frappe.utils.get_form_link(log.reference_doctype, log.reference_name, true);
-		const owner_name = frappe.user.full_name(log.owner).bold();
-		const user = frappe.user.full_name(log.user).bold();
-		if (log.type === 'Appreciation') {
-			return __('{0} appreciated {1} on {2}', [owner_name, user, doc_link]);
-		}
-		if (log.type === 'Criticism') {
-			return __('{0} criticized {1} on {2}', [owner_name, user, doc_link]);
-		}
-		return __('for {0} via automatic rule {1} on {2}', [user, log.rule.bold(), doc_link]);
-	},
-	format_log(log, with_timestamp=false) {
-		let formatted_log = `<span>
-			${this.get_points(log.points)}&nbsp;${this.log_message(log)}
-			${ with_timestamp ? '<span>&nbsp;-&nbsp;</span>' + frappe.datetime.comment_when(log.creation):''}
+	format_form_log(log) {
+		const separator = `<span>&nbsp;-&nbsp;</span>`;
+		const formatted_log = `<span>
+			${this.get_points(log.points)}&nbsp;
+			<a href="#Form/Energy Point Log/${log.name}">${this.get_form_log_message(log)}</a>
+			${log.reason ? separator + log.reason: ''}
 		</span>`;
 		return formatted_log;
 	},
+	format_history_log(log) {
+		// redundant code to honor readability and to avoid confusion
+		const separator = `<span>&nbsp;-&nbsp;</span>`;
+		const formatted_log = `<span>
+			${this.get_points(log.points)}&nbsp;
+			<a href="#Form/Energy Point Log/${log.name}">${this.get_history_log_message(log)}</a>
+			${log.reason ? separator + log.reason: ''}
+			${separator + frappe.datetime.comment_when(log.creation)}
+		</span>`;
+		return formatted_log;
+	},
+	get_history_log_message(log) {
+		const doc_link = frappe.utils.get_form_link(log.reference_doctype, log.reference_name, true);
+		const owner_name = frappe.user.full_name(log.owner).bold();
+		if (log.type === 'Appreciation') {
+			return __('{0} appreciated on {1}', [owner_name, doc_link]);
+		}
+		if (log.type === 'Criticism') {
+			return __('{0} criticized on {1}', [owner_name, doc_link]);
+		}
+		if (log.type === 'Revert') {
+			return __('{0} reverted {1}', [owner_name,
+				frappe.utils.get_form_link('Energy Point Log', log.revert_for, true)]);
+		}
+		return __('via automatic rule {0} on {1}', [log.rule.bold(), doc_link]);
+	},
+	get_form_log_message(log) {
+		// redundant code to honor readability and to avoid confusion
+		const owner_name = frappe.user.full_name(log.owner).bold();
+		const user = frappe.user.full_name(log.user).bold();
+		if (log.type === 'Appreciation') {
+			return __('{0} appreciated {1}', [owner_name, user]);
+		}
+		if (log.type === 'Criticism') {
+			return __('{0} criticized {1}', [owner_name, user]);
+		}
+		if (log.type === 'Revert') {
+			return __('{0} reverted {1}', [user,
+				frappe.utils.get_form_link('Energy Point Log', log.revert_for, true)]);
+		}
+		return __('gained by {0} via automatic rule {1}', [user, log.rule.bold()]);
+	},
 });
\ No newline at end of file
diff --git a/frappe/public/js/frappe/social/components/EnergyPointHistory.vue b/frappe/public/js/frappe/social/components/EnergyPointHistory.vue
index aae03b6b09..e7274f548f 100644
--- a/frappe/public/js/frappe/social/components/EnergyPointHistory.vue
+++ b/frappe/public/js/frappe/social/components/EnergyPointHistory.vue
@@ -2,7 +2,7 @@
 	<div>
 		<ul class="log-list">
 			<li class="history-log" v-for="log in history_logs" :key="log.name">
-				<span v-html="frappe.energy_points.format_log(log, true)"></span>
+				<span v-html="frappe.energy_points.format_history_log(log, true)"></span>
 			</li>
 			<li v-if="!history_logs.length" class="history-log">
 				{{__('No logs found')}}

From d1cc18b508f51250fe3067c7864a7fe1fd9130c2 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 19:48:15 +0530
Subject: [PATCH 242/256] feat: Init revert point system

---
 .../energy_point_log/energy_point_log.js      | 14 +++-
 .../energy_point_log/energy_point_log.json    | 75 ++++++++++++++++++-
 .../energy_point_log/energy_point_log.py      | 26 ++++++-
 3 files changed, 109 insertions(+), 6 deletions(-)

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.js b/frappe/social/doctype/energy_point_log/energy_point_log.js
index c01d8e6c28..c057f7b5e4 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.js
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.js
@@ -2,7 +2,17 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Energy Point Log', {
-	refresh: function() {
-
+	refresh: function(frm) {
+		if (frm.doc.reverted) {
+			frm.set_intro(__('This document has been reverted'));
+		} else if (!['Revert', 'Review'].includes(frm.doc.type)
+			&& frappe.user_roles.includes('System Manager')) {
+			const revert_button = __('Revert');
+			frm.add_custom_button(revert_button, () => {
+				return frappe.xcall('frappe.social.doctype.energy_point_log.energy_point_log.revert', {
+					'name': frm.doc.name
+				});
+			});
+		}
 	}
 });
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.json b/frappe/social/doctype/energy_point_log/energy_point_log.json
index 2b43e99d38..72f23187a2 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.json
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.json
@@ -67,7 +67,7 @@
    "label": "Type",
    "length": 0,
    "no_copy": 0,
-   "options": "Auto\nAppreciation\nCriticism\nReview",
+   "options": "Auto\nAppreciation\nCriticism\nReview\nRevert",
    "permlevel": 0,
    "precision": "",
    "print_hide": 0,
@@ -248,6 +248,75 @@
    "set_only_once": 0,
    "translatable": 0,
    "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "0",
+   "fetch_if_empty": 0,
+   "fieldname": "reverted",
+   "fieldtype": "Check",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Reverted",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:doc.type === 'Revert'",
+   "fetch_if_empty": 0,
+   "fieldname": "revert_for",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Revert For",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Energy Point Log",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   }
  ],
  "has_web_view": 0,
@@ -259,7 +328,7 @@
  "istable": 0,
  "max_attachments": 0,
  "menu_index": 0,
- "modified": "2019-03-30 12:25:27.821811",
+ "modified": "2019-04-05 17:20:43.998915",
  "modified_by": "Administrator",
  "module": "Social",
  "name": "Energy Point Log",
@@ -306,7 +375,7 @@
   }
  ],
  "quick_entry": 0,
- "read_only": 1,
+ "read_only": 0,
  "show_name_in_global_search": 0,
  "sort_field": "modified",
  "sort_order": "DESC",
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index 34f1013aee..4292af7fad 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -45,6 +45,12 @@ def get_alert_dict(doc):
 			points
 		))
 		alert_dict.indicator = 'red'
+	elif doc.type == 'Revert':
+		alert_dict.message = _('{} reverted your points on {}'.format(
+			owner_name,
+			doc_link,
+		))
+		alert_dict.indicator = 'red'
 	else:
 		alert_dict = {}
 
@@ -149,4 +155,22 @@ def get_reviews(doctype, docname):
 		'reference_doctype': doctype,
 		'reference_name': docname,
 		'type': ['in', ('Appreciation', 'Criticism')],
-	}, fields=['points', 'owner', 'type', 'user', 'reason', 'creation'])
\ No newline at end of file
+	}, fields=['points', 'owner', 'type', 'user', 'reason', 'creation'])
+
+@frappe.whitelist()
+def revert(name, reason=None):
+	frappe.only_for('System Manager')
+	doc_to_revert = frappe.get_doc('Energy Point Log', name)
+	doc_to_revert.reverted = 1
+	doc_to_revert.save()
+
+	frappe.get_doc({
+		'doctype': 'Energy Point Log',
+		'points': -doc_to_revert.points,
+		'type': 'Revert',
+		'user': doc_to_revert.user,
+		'reason': reason,
+		'reference_doctype': doc_to_revert.reference_doctype,
+		'reference_name': doc_to_revert.reference_name,
+		'revert_for': doc_to_revert.name
+	}).insert()

From 520a6b8020e25fa7b00d72dc9b644fbbd38b1a0b Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 21:07:33 +0530
Subject: [PATCH 243/256] feat: Add revert dialog to get the reason of revert -
 Show type and doctype in list view - Track changes for energy point logs

---
 .../energy_point_log/energy_point_log.js      | 30 +++++++++++++++----
 .../energy_point_log/energy_point_log.json    | 12 ++++----
 .../energy_point_log/energy_point_log.py      |  8 +++--
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.js b/frappe/social/doctype/energy_point_log/energy_point_log.js
index c057f7b5e4..0d0bd741fe 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.js
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.js
@@ -7,12 +7,30 @@ frappe.ui.form.on('Energy Point Log', {
 			frm.set_intro(__('This document has been reverted'));
 		} else if (!['Revert', 'Review'].includes(frm.doc.type)
 			&& frappe.user_roles.includes('System Manager')) {
-			const revert_button = __('Revert');
-			frm.add_custom_button(revert_button, () => {
-				return frappe.xcall('frappe.social.doctype.energy_point_log.energy_point_log.revert', {
-					'name': frm.doc.name
-				});
-			});
+			frm.add_custom_button(__('Revert'), () => frm.events.show_revert_dialog(frm));
 		}
+	},
+	show_revert_dialog(frm) {
+		const revert_dialog = new frappe.ui.Dialog({
+			title: __('Revert'),
+			fields: [{
+				fieldname: 'reason',
+				fieldtype: 'Small Text',
+				label: __('Reason'),
+				reqd: 1
+			}],
+			primary_action: (values) => {
+				return frappe.xcall('frappe.social.doctype.energy_point_log.energy_point_log.revert', {
+					'name': frm.doc.name,
+					'reason': values.reason
+				}).then(revert_log => {
+					revert_dialog.hide();
+					revert_dialog.clear();
+					frappe.model.docinfo[frm.doc.reference_doctype][frm.doc.reference_name].energy_point_logs.unshift(revert_log);
+				}).catch(() => {});
+			},
+			primary_action_label: __('Submit')
+		});
+		revert_dialog.show();
 	}
 });
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.json b/frappe/social/doctype/energy_point_log/energy_point_log.json
index 72f23187a2..2a24016c82 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.json
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.json
@@ -62,7 +62,7 @@
    "ignore_xss_filter": 0,
    "in_filter": 0,
    "in_global_search": 0,
-   "in_list_view": 0,
+   "in_list_view": 1,
    "in_standard_filter": 0,
    "label": "Type",
    "length": 0,
@@ -130,7 +130,7 @@
    "ignore_xss_filter": 0,
    "in_filter": 0,
    "in_global_search": 0,
-   "in_list_view": 0,
+   "in_list_view": 1,
    "in_standard_filter": 0,
    "label": "Reference Doctype",
    "length": 0,
@@ -292,7 +292,7 @@
    "columns": 0,
    "depends_on": "eval:doc.type === 'Revert'",
    "fetch_if_empty": 0,
-   "fieldname": "revert_for",
+   "fieldname": "revert_of",
    "fieldtype": "Link",
    "hidden": 0,
    "ignore_user_permissions": 0,
@@ -301,7 +301,7 @@
    "in_global_search": 0,
    "in_list_view": 0,
    "in_standard_filter": 0,
-   "label": "Revert For",
+   "label": "Revert Of",
    "length": 0,
    "no_copy": 0,
    "options": "Energy Point Log",
@@ -328,7 +328,7 @@
  "istable": 0,
  "max_attachments": 0,
  "menu_index": 0,
- "modified": "2019-04-05 17:20:43.998915",
+ "modified": "2019-04-05 20:23:53.917559",
  "modified_by": "Administrator",
  "module": "Social",
  "name": "Energy Point Log",
@@ -380,7 +380,7 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "title_field": "user",
- "track_changes": 0,
+ "track_changes": 1,
  "track_seen": 0,
  "track_views": 0
 }
\ No newline at end of file
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index 4292af7fad..bcafe09eba 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -158,13 +158,13 @@ def get_reviews(doctype, docname):
 	}, fields=['points', 'owner', 'type', 'user', 'reason', 'creation'])
 
 @frappe.whitelist()
-def revert(name, reason=None):
+def revert(name, reason):
 	frappe.only_for('System Manager')
 	doc_to_revert = frappe.get_doc('Energy Point Log', name)
 	doc_to_revert.reverted = 1
 	doc_to_revert.save()
 
-	frappe.get_doc({
+	revert_log = frappe.get_doc({
 		'doctype': 'Energy Point Log',
 		'points': -doc_to_revert.points,
 		'type': 'Revert',
@@ -172,5 +172,7 @@ def revert(name, reason=None):
 		'reason': reason,
 		'reference_doctype': doc_to_revert.reference_doctype,
 		'reference_name': doc_to_revert.reference_name,
-		'revert_for': doc_to_revert.name
+		'revert_of': doc_to_revert.name
 	}).insert()
+
+	return revert_log
\ No newline at end of file

From 743086dc41c44af058005636b108d63643a0234c Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 21:08:10 +0530
Subject: [PATCH 244/256] fix: Rename revert_for -> revert_of

---
 frappe/public/js/frappe/misc/energy_point_utils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/misc/energy_point_utils.js b/frappe/public/js/frappe/misc/energy_point_utils.js
index d9a64a41d8..dc7df166ec 100644
--- a/frappe/public/js/frappe/misc/energy_point_utils.js
+++ b/frappe/public/js/frappe/misc/energy_point_utils.js
@@ -40,7 +40,7 @@ Object.assign(frappe.energy_points, {
 		}
 		if (log.type === 'Revert') {
 			return __('{0} reverted {1}', [owner_name,
-				frappe.utils.get_form_link('Energy Point Log', log.revert_for, true)]);
+				frappe.utils.get_form_link('Energy Point Log', log.revert_of, true)]);
 		}
 		return __('via automatic rule {0} on {1}', [log.rule.bold(), doc_link]);
 	},
@@ -56,7 +56,7 @@ Object.assign(frappe.energy_points, {
 		}
 		if (log.type === 'Revert') {
 			return __('{0} reverted {1}', [user,
-				frappe.utils.get_form_link('Energy Point Log', log.revert_for, true)]);
+				frappe.utils.get_form_link('Energy Point Log', log.revert_of, true)]);
 		}
 		return __('gained by {0} via automatic rule {1}', [user, log.rule.bold()]);
 	},

From 04a40d286deea8e5641d0cc3a959fc90a5fcf809 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 21:14:21 +0530
Subject: [PATCH 245/256] fix: Show alert message

- Append indicator element instead of adding
class to parent div to avoid css bleed
---
 frappe/public/js/frappe/ui/messages.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js
index 9293d497b5..9b8ff15b09 100644
--- a/frappe/public/js/frappe/ui/messages.js
+++ b/frappe/public/js/frappe/ui/messages.js
@@ -283,12 +283,12 @@ frappe.show_alert = function(message, seconds=7, actions={}) {
 			<a class="close">&times;</a>
 		</div>`);
 
-	div.find('.alert-message').append(message.message);
-
 	if(message.indicator) {
-		div.find('.alert-message').addClass('indicator '+ message.indicator);
+		div.find('.alert-message').append(`<span class="indicator ${message.indicator}"></span>`);
 	}
 
+	div.find('.alert-message').append(message.message);
+
 	if (body_html) {
 		div.find('.alert-body').show().html(body_html);
 	}

From a418e87444b02b9e7caad1253570cd483aec654f Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 21:57:17 +0530
Subject: [PATCH 246/256] fix: Refresh timeline after getting a new review

---
 frappe/public/js/frappe/form/review.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/public/js/frappe/form/review.js b/frappe/public/js/frappe/form/review.js
index 1799cd68b5..8447118644 100644
--- a/frappe/public/js/frappe/form/review.js
+++ b/frappe/public/js/frappe/form/review.js
@@ -131,6 +131,7 @@ frappe.ui.form.Review = class Review {
 					review_dialog.hide();
 					review_dialog.clear();
 					this.frm.get_docinfo().energy_point_logs.unshift(review);
+					this.frm.timeline.refresh();
 					this.update_reviewers();
 				});
 			},

From 0c31d9c814ddcac20e20a7d77eeb9468f56f156b Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 22:00:53 +0530
Subject: [PATCH 247/256] fix: Allow revert for logs only with type auto

---
 frappe/social/doctype/energy_point_log/energy_point_log.js | 2 +-
 frappe/social/doctype/energy_point_log/energy_point_log.py | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.js b/frappe/social/doctype/energy_point_log/energy_point_log.js
index 0d0bd741fe..d136219efc 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.js
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.js
@@ -5,7 +5,7 @@ frappe.ui.form.on('Energy Point Log', {
 	refresh: function(frm) {
 		if (frm.doc.reverted) {
 			frm.set_intro(__('This document has been reverted'));
-		} else if (!['Revert', 'Review'].includes(frm.doc.type)
+		} else if (frm.doc.type === 'Auto'
 			&& frappe.user_roles.includes('System Manager')) {
 			frm.add_custom_button(__('Revert'), () => frm.events.show_revert_dialog(frm));
 		}
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index bcafe09eba..3160915729 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -161,12 +161,16 @@ def get_reviews(doctype, docname):
 def revert(name, reason):
 	frappe.only_for('System Manager')
 	doc_to_revert = frappe.get_doc('Energy Point Log', name)
+
+	if doc_to_revert.type != 'Auto':
+		frappe.throw(_('This document cannot be reverted'))
+
 	doc_to_revert.reverted = 1
 	doc_to_revert.save()
 
 	revert_log = frappe.get_doc({
 		'doctype': 'Energy Point Log',
-		'points': -doc_to_revert.points,
+		'points': -(doc_to_revert.points),
 		'type': 'Revert',
 		'user': doc_to_revert.user,
 		'reason': reason,

From 8abd261c1827dc67dae98d849b7bd81a022a5290 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 5 Apr 2019 22:03:30 +0530
Subject: [PATCH 248/256] fix: Super class call in dialog.js

---
 frappe/public/js/frappe/ui/dialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/ui/dialog.js b/frappe/public/js/frappe/ui/dialog.js
index a09c62af32..eb9215e208 100644
--- a/frappe/public/js/frappe/ui/dialog.js
+++ b/frappe/public/js/frappe/ui/dialog.js
@@ -113,7 +113,7 @@ frappe.ui.Dialog = class Dialog extends frappe.ui.FieldGroup {
 	}
 
 	clear() {
-		super();
+		super.clear();
 		this.clear_message();
 	}
 

From b3359f5eb229bc147e5c21567dbfae855a44654d Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Sat, 6 Apr 2019 21:53:09 +0530
Subject: [PATCH 249/256] fix: code refactor

---
 .../report/addresses_and_contacts/addresses_and_contacts.py     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/contacts/report/addresses_and_contacts/addresses_and_contacts.py b/frappe/contacts/report/addresses_and_contacts/addresses_and_contacts.py
index 354911cd70..2f2b10fca3 100644
--- a/frappe/contacts/report/addresses_and_contacts/addresses_and_contacts.py
+++ b/frappe/contacts/report/addresses_and_contacts/addresses_and_contacts.py
@@ -63,8 +63,8 @@ def get_reference_addresses_and_contact(reference_doctype, reference_name):
 		contacts  = details.get("contact", [])
 		if not any([addresses, contacts]):
 			result = [reference_name]
-			result.extend(add_blank_columns_for("Contact"))
 			result.extend(add_blank_columns_for("Address"))
+			result.extend(add_blank_columns_for("Contact"))
 			data.append(result)
 		else:
 			max_length = max(len(addresses), len(contacts))

From 5c3121ab842c994dcd4abeea3444b8153addcb0e Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Sat, 6 Apr 2019 22:50:05 +0530
Subject: [PATCH 250/256] fix: making it py2 and py3 compatible

---
 .../addresses_and_contacts/addresses_and_contacts.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/frappe/contacts/report/addresses_and_contacts/addresses_and_contacts.py b/frappe/contacts/report/addresses_and_contacts/addresses_and_contacts.py
index 2f2b10fca3..0907476b30 100644
--- a/frappe/contacts/report/addresses_and_contacts/addresses_and_contacts.py
+++ b/frappe/contacts/report/addresses_and_contacts/addresses_and_contacts.py
@@ -67,12 +67,15 @@ def get_reference_addresses_and_contact(reference_doctype, reference_name):
 			result.extend(add_blank_columns_for("Contact"))
 			data.append(result)
 		else:
+			addresses = list(map(list, addresses))
+			contacts = list(map(list, contacts))
+
 			max_length = max(len(addresses), len(contacts))
 			for idx in range(0, max_length):
 				result = [reference_name]
 
-				result.extend(list(addresses[idx].values()) if idx < len(addresses) else add_blank_columns_for("Address"))
-				result.extend(list(contacts[idx].values()) if idx < len(contacts) else add_blank_columns_for("Contact"))
+				result.extend(addresses[idx] if idx < len(addresses) else add_blank_columns_for("Address"))
+				result.extend(contacts[idx] if idx < len(contacts) else add_blank_columns_for("Contact"))
 
 				data.append(result)
 
@@ -85,12 +88,11 @@ def get_reference_details(reference_doctype, doctype, reference_list, reference_
 	]
 	fields = ["`tabDynamic Link`.link_name"] + field_map.get(doctype, [])
 
-	records = frappe.get_list(doctype, filters=filters, fields=fields)
+	records = frappe.get_list(doctype, filters=filters, fields=fields, as_list=True)
 	temp_records = list()
 
 	for d in records:
-		d.pop('link_name')
-		temp_records.append(d)
+		temp_records.append(d[1:])
 
 	reference_details[reference_list[0]][frappe.scrub(doctype)] = temp_records
 	return reference_details

From 2d51a1ec7e8f3cce9ed15171298a65b37868ab8a Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sun, 7 Apr 2019 12:47:45 +0530
Subject: [PATCH 251/256] Revert "fix: Update user activity using ORM"

This reverts commit b963868f611159f23ee03f14b96e0cc58368c99f.
---
 frappe/sessions.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/frappe/sessions.py b/frappe/sessions.py
index 81ced8ce95..aaf40f30e7 100644
--- a/frappe/sessions.py
+++ b/frappe/sessions.py
@@ -226,11 +226,12 @@ class Session:
 			self.insert_session_record()
 
 			# update user
-			user = frappe.get_doc('User', self.data['user'])
-			user.last_login = frappe.utils.now()
-			user.last_ip = frappe.local.request_ip
-			user.last_active = frappe.utils.now()
-			user.save()
+			frappe.db.sql("""UPDATE tabUser SET last_login = %(now)s, last_ip = %(ip)s, last_active = %(now)s
+				where name=%(name)s""", {
+					"now": frappe.utils.now(),
+					"ip": frappe.local.request_ip,
+					"name": self.data['user']
+				})
 
 			frappe.db.commit()
 

From e3d0a84e64ad0f710916e6109e105d8b88929506 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sun, 7 Apr 2019 12:53:21 +0530
Subject: [PATCH 252/256] Revert "fix: Update user activity using ORM"

This reverts commit b963868f611159f23ee03f14b96e0cc58368c99f.
---
 frappe/sessions.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/frappe/sessions.py b/frappe/sessions.py
index eb28cc4dee..ef5c59a1ef 100644
--- a/frappe/sessions.py
+++ b/frappe/sessions.py
@@ -231,11 +231,12 @@ class Session:
 			self.insert_session_record()
 
 			# update user
-			user = frappe.get_doc('User', self.data['user'])
-			user.last_login = frappe.utils.now()
-			user.last_ip = frappe.local.request_ip
-			user.last_active = frappe.utils.now()
-			user.save(ignore_permissions=True)
+			frappe.db.sql("""UPDATE tabUser SET last_login = %(now)s, last_ip = %(ip)s, last_active = %(now)s
+				where name=%(name)s""", {
+					"now": frappe.utils.now(),
+					"ip": frappe.local.request_ip,
+					"name": self.data['user']
+				})
 
 			frappe.db.commit()
 

From 42b6faabe78ea2764e2a2acb5785d1dd23ab53cf Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sun, 7 Apr 2019 13:10:10 +0530
Subject: [PATCH 253/256] fix: Add quotes

---
 frappe/sessions.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/frappe/sessions.py b/frappe/sessions.py
index ef5c59a1ef..62436bdd5d 100644
--- a/frappe/sessions.py
+++ b/frappe/sessions.py
@@ -231,11 +231,15 @@ class Session:
 			self.insert_session_record()
 
 			# update user
-			frappe.db.sql("""UPDATE tabUser SET last_login = %(now)s, last_ip = %(ip)s, last_active = %(now)s
-				where name=%(name)s""", {
-					"now": frappe.utils.now(),
-					"ip": frappe.local.request_ip,
-					"name": self.data['user']
+			frappe.db.sql("""UPDATE `tabUser`
+				SET
+					last_login = %(now)s,
+					last_ip = %(ip)s,
+					last_active = %(now)s
+				WHERE name=%(name)s""", {
+					'now': frappe.utils.now(),
+					'ip': frappe.local.request_ip,
+					'name': self.data['user']
 				})
 
 			frappe.db.commit()

From f31e8f0ffad36d776e33827f0aeba4b02b8fb70d Mon Sep 17 00:00:00 2001
From: igrekus <upload234@mail.ru>
Date: Sun, 7 Apr 2019 10:57:16 +0300
Subject: [PATCH 254/256] fix: Hide empty categories in Show / Hide Cards
 dialog (#7215)

---
 frappe/public/js/frappe/views/components/Desktop.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/views/components/Desktop.vue b/frappe/public/js/frappe/views/components/Desktop.vue
index f950d04e79..a93920214d 100644
--- a/frappe/public/js/frappe/views/components/Desktop.vue
+++ b/frappe/public/js/frappe/views/components/Desktop.vue
@@ -107,7 +107,7 @@ export default {
 			});
 			const d = new frappe.ui.Dialog({
 				title: __('Show / Hide Cards'),
-				fields,
+				fields: fields.filter(f => f.options.length > 0),
 				primary_action_label: __('Save'),
 				primary_action: (values) => {
 					let all_modules = this.modules.map(m => m.module_name);

From acd7c99db65988b8dcf8d2b34c5a67347ad4554f Mon Sep 17 00:00:00 2001
From: Frappe Bot <developers@frappe.io>
Date: Sun, 7 Apr 2019 08:47:11 +0000
Subject: [PATCH 255/256] bumped to version 11.1.20

---
 frappe/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 913f6440ff..c92951a4af 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -24,7 +24,7 @@ if sys.version[0] == '2':
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '11.1.19'
+__version__ = '11.1.20'
 __title__ = "Frappe Framework"
 
 local = Local()

From 0334950a8b238eb7ea4b3420a7d486927e63f0c0 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 8 Apr 2019 10:34:34 +0530
Subject: [PATCH 256/256] feat(leaderboard): Load more logs (#7226)

* feat: Load more logs

* fix: Use v-show instead of v-if to avoid network repeated calls
---
 .../social/components/EnergyPointHistory.vue  | 46 ++++++++++++++-----
 .../js/frappe/social/pages/UserList.vue       |  2 +-
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/frappe/public/js/frappe/social/components/EnergyPointHistory.vue b/frappe/public/js/frappe/social/components/EnergyPointHistory.vue
index e7274f548f..d8e9665849 100644
--- a/frappe/public/js/frappe/social/components/EnergyPointHistory.vue
+++ b/frappe/public/js/frappe/social/components/EnergyPointHistory.vue
@@ -4,8 +4,18 @@
 			<li class="history-log" v-for="log in history_logs" :key="log.name">
 				<span v-html="frappe.energy_points.format_history_log(log, true)"></span>
 			</li>
+			<li v-if="fetching" class="history-log">
+				{{ __('Fetching') + '...' }}
+			</li>
+			<li v-if="!fetching && has_more_logs" class="history-log">
+				<button
+					class="btn btn-default btn-xs"
+					@click="get_logs()">
+					{{ __('Load more') }}
+				</button>
+			</li>
 			<li v-if="!history_logs.length" class="history-log">
-				{{__('No logs found')}}
+				{{ __('No logs found') }}
 			</li>
 		</ul>
 	</div>
@@ -15,19 +25,33 @@ export default {
 	props: ['user'],
 	data() {
 		return {
-			history_logs: []
+			history_logs: [],
+			fetching: false,
+			has_more_logs: true
 		}
 	},
 	created() {
-		frappe.db.get_list('Energy Point Log', {
-			filters: {
-				user: this.user,
-				type: ['!=', 'Review']
-			},
-			fields: ['*']
-		}).then(data => {
-			this.history_logs = data;
-		})
+		this.get_logs();
+	},
+	methods: {
+		get_logs() {
+			this.fetching = true;
+			const pull_limit = 10;
+			frappe.db.get_list('Energy Point Log', {
+				filters: {
+					user: this.user,
+					type: ['!=', 'Review']
+				},
+				fields: ['*'],
+				limit: pull_limit,
+				limit_start: this.history_logs.length
+			}).then(data => {
+				this.history_logs = this.history_logs.concat(data);
+				this.has_more_logs = data.length === pull_limit;
+			}).finally(() => {
+				this.fetching = false;
+			})
+		}
 	},
 
 }
diff --git a/frappe/public/js/frappe/social/pages/UserList.vue b/frappe/public/js/frappe/social/pages/UserList.vue
index 76e91af98e..925cf43c6f 100644
--- a/frappe/public/js/frappe/social/pages/UserList.vue
+++ b/frappe/public/js/frappe/social/pages/UserList.vue
@@ -39,7 +39,7 @@
 					</span>
 				</div>
 				<energy-point-history
-					v-if="show_log_for===user.name"
+					v-show="show_log_for===user.name"
 					class="energy-point-history"
 					:user="user.name">
 				</energy-point-history>