From 81af2294667e5d9a3715ee58b87db3ea9bafe51a Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Fri, 9 Dec 2016 17:29:19 +0530
Subject: [PATCH] [minor] google analytics id in docs and minor fixes to web
 forms

---
 .../accounts/doctype/account/account_tree.js  |  4 +--
 erpnext/config/docs.py                        |  6 +++-
 erpnext/support/web_form/issues/issues.json   | 28 ++++++++++++++-
 .../web_form/addresses/addresses.json         | 35 ++++++++++++++++++-
 4 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/erpnext/accounts/doctype/account/account_tree.js b/erpnext/accounts/doctype/account/account_tree.js
index fc6a1b454ef..8c7925a3ff4 100644
--- a/erpnext/accounts/doctype/account/account_tree.js
+++ b/erpnext/accounts/doctype/account/account_tree.js
@@ -30,8 +30,8 @@ frappe.treeview_settings["Account"] = {
 			options: ['Asset', 'Liability', 'Equity', 'Income', 'Expense'].join('\n'),
 			depends_on: 'eval:doc.is_group && !doc.parent_account'},
 		{fieldtype:'Select', fieldname:'account_type', label:__('Account Type'),
-			options: ['', 'Accumulated Depreciation', 'Bank', 'Cash', 'Chargeable', 'Cost of Goods Sold', 'Depreciation', 
-				'Equity', 'Expense Account', 'Expenses Included In Valuation', 'Fixed Asset', 'Income Account', 'Payable', 'Receivable', 
+			options: ['', 'Accumulated Depreciation', 'Bank', 'Cash', 'Chargeable', 'Cost of Goods Sold', 'Depreciation',
+				'Equity', 'Expense Account', 'Expenses Included In Valuation', 'Fixed Asset', 'Income Account', 'Payable', 'Receivable',
 				'Round Off', 'Stock', 'Stock Adjustment', 'Stock Received But Not Billed', 'Tax', 'Temporary'].join('\n'),
 			description: __("Optional. This setting will be used to filter in various transactions.")
 		},
diff --git a/erpnext/config/docs.py b/erpnext/config/docs.py
index 7b6915af92e..2d2cc0a8925 100644
--- a/erpnext/config/docs.py
+++ b/erpnext/config/docs.py
@@ -1,3 +1,7 @@
+from __future__ import unicode_literals
+
+docs_version = "7.x.x"
+
 source_link = "https://github.com/frappe/erpnext"
 docs_base_url = "https://frappe.github.io/erpnext"
 headline = "ERPNext Documentation"
@@ -15,8 +19,8 @@ ERPNext is Open Source under the GNU General Public Licence v3 and has been
 listed as one of the Best Open Source Softwares in the world by many online
 blogs."""
 
-docs_version = "7.x.x"
 splash_light_background = True
+google_analytics_id = 'UA-8911157-22'
 
 def get_context(context):
 	context.brand_html = ('<img class="brand-logo" src="'+context.docs_base_url
diff --git a/erpnext/support/web_form/issues/issues.json b/erpnext/support/web_form/issues/issues.json
index 4b7c70c75be..6474799277a 100644
--- a/erpnext/support/web_form/issues/issues.json
+++ b/erpnext/support/web_form/issues/issues.json
@@ -1,8 +1,12 @@
 {
+ "accept_payment": 0, 
  "allow_comments": 1, 
  "allow_delete": 1, 
  "allow_edit": 1, 
+ "allow_incomplete": 0, 
  "allow_multiple": 1, 
+ "allow_print": 0, 
+ "amount": 0.0, 
  "breadcrumbs": "[{\"title\":\"Issues\", \"name\":\"issues\"}]", 
  "creation": "2016-06-24 15:50:33.186483", 
  "doc_type": "Issue", 
@@ -11,13 +15,16 @@
  "idx": 0, 
  "is_standard": 1, 
  "login_required": 1, 
- "modified": "2016-06-24 15:52:24.768558", 
+ "max_attachment_size": 0, 
+ "modified": "2016-12-07 04:26:13.917693", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "issues", 
  "owner": "Administrator", 
  "published": 1, 
  "route": "issues", 
+ "show_sidebar": 1, 
+ "sidebar_items": [], 
  "success_message": "", 
  "success_url": "/issues", 
  "title": "Issue", 
@@ -27,6 +34,8 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "label": "Subject", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 1
   }, 
@@ -36,15 +45,30 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "label": "Status", 
+   "max_length": 0, 
+   "max_value": 0, 
    "options": "Open\nReplied\nHold\nClosed", 
    "read_only": 1, 
    "reqd": 0
   }, 
+  {
+   "fieldname": "customer", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Customer", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "options": "Customer", 
+   "read_only": 1, 
+   "reqd": 0
+  }, 
   {
    "fieldname": "description", 
    "fieldtype": "Text", 
    "hidden": 0, 
    "label": "Description", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 0
   }, 
@@ -53,6 +77,8 @@
    "fieldtype": "Attach", 
    "hidden": 0, 
    "label": "Attachment", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 0
   }
diff --git a/erpnext/utilities/web_form/addresses/addresses.json b/erpnext/utilities/web_form/addresses/addresses.json
index 50fe6e960c2..6d3fefc8f92 100644
--- a/erpnext/utilities/web_form/addresses/addresses.json
+++ b/erpnext/utilities/web_form/addresses/addresses.json
@@ -1,8 +1,12 @@
 {
+ "accept_payment": 0, 
  "allow_comments": 0, 
  "allow_delete": 0, 
  "allow_edit": 1, 
+ "allow_incomplete": 0, 
  "allow_multiple": 1, 
+ "allow_print": 0, 
+ "amount": 0.0, 
  "creation": "2016-06-24 15:50:33.196990", 
  "doc_type": "Address", 
  "docstatus": 0, 
@@ -10,13 +14,16 @@
  "idx": 0, 
  "is_standard": 1, 
  "login_required": 1, 
- "modified": "2016-06-24 16:11:28.802353", 
+ "max_attachment_size": 0, 
+ "modified": "2016-12-07 04:17:02.020768", 
  "modified_by": "Administrator", 
  "module": "Utilities", 
  "name": "addresses", 
  "owner": "Administrator", 
  "published": 1, 
  "route": "address", 
+ "show_sidebar": 0, 
+ "sidebar_items": [], 
  "success_url": "/addresses", 
  "title": "Address", 
  "web_form_fields": [
@@ -26,6 +33,8 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "label": "Address Title", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 0
   }, 
@@ -34,6 +43,8 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "label": "Address Type", 
+   "max_length": 0, 
+   "max_value": 0, 
    "options": "Billing\nShipping\nOffice\nPersonal\nPlant\nPostal\nShop\nSubsidiary\nWarehouse\nOther", 
    "read_only": 0, 
    "reqd": 1
@@ -43,6 +54,8 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "label": "Address Line 1", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 1
   }, 
@@ -51,6 +64,8 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "label": "Address Line 2", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 0
   }, 
@@ -59,6 +74,8 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "label": "City/Town", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 1
   }, 
@@ -67,6 +84,8 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "label": "State", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 0
   }, 
@@ -75,6 +94,8 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "label": "Postal Code", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 0
   }, 
@@ -83,6 +104,8 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "label": "Country", 
+   "max_length": 0, 
+   "max_value": 0, 
    "options": "Country", 
    "read_only": 0, 
    "reqd": 1
@@ -90,6 +113,8 @@
   {
    "fieldtype": "Column Break", 
    "hidden": 0, 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 0
   }, 
@@ -98,6 +123,8 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "label": "Email Id", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 0
   }, 
@@ -106,6 +133,8 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "label": "Phone", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 1
   }, 
@@ -116,6 +145,8 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "label": "Preferred Billing Address", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 0
   }, 
@@ -126,6 +157,8 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "label": "Preferred Shipping Address", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 0
   }