[minor] google analytics id in docs and minor fixes to web forms

This commit is contained in:
Rushabh Mehta 2016-12-09 17:29:19 +05:30
parent 58667ab123
commit 81af229466
4 changed files with 68 additions and 5 deletions

View File

@ -30,8 +30,8 @@ frappe.treeview_settings["Account"] = {
options: ['Asset', 'Liability', 'Equity', 'Income', 'Expense'].join('\n'), options: ['Asset', 'Liability', 'Equity', 'Income', 'Expense'].join('\n'),
depends_on: 'eval:doc.is_group && !doc.parent_account'}, depends_on: 'eval:doc.is_group && !doc.parent_account'},
{fieldtype:'Select', fieldname:'account_type', label:__('Account Type'), {fieldtype:'Select', fieldname:'account_type', label:__('Account Type'),
options: ['', 'Accumulated Depreciation', 'Bank', 'Cash', 'Chargeable', 'Cost of Goods Sold', 'Depreciation', options: ['', 'Accumulated Depreciation', 'Bank', 'Cash', 'Chargeable', 'Cost of Goods Sold', 'Depreciation',
'Equity', 'Expense Account', 'Expenses Included In Valuation', 'Fixed Asset', 'Income Account', 'Payable', 'Receivable', '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'), '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.") description: __("Optional. This setting will be used to filter in various transactions.")
}, },

View File

@ -1,3 +1,7 @@
from __future__ import unicode_literals
docs_version = "7.x.x"
source_link = "https://github.com/frappe/erpnext" source_link = "https://github.com/frappe/erpnext"
docs_base_url = "https://frappe.github.io/erpnext" docs_base_url = "https://frappe.github.io/erpnext"
headline = "ERPNext Documentation" 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 listed as one of the Best Open Source Softwares in the world by many online
blogs.""" blogs."""
docs_version = "7.x.x"
splash_light_background = True splash_light_background = True
google_analytics_id = 'UA-8911157-22'
def get_context(context): def get_context(context):
context.brand_html = ('<img class="brand-logo" src="'+context.docs_base_url context.brand_html = ('<img class="brand-logo" src="'+context.docs_base_url

View File

@ -1,8 +1,12 @@
{ {
"accept_payment": 0,
"allow_comments": 1, "allow_comments": 1,
"allow_delete": 1, "allow_delete": 1,
"allow_edit": 1, "allow_edit": 1,
"allow_incomplete": 0,
"allow_multiple": 1, "allow_multiple": 1,
"allow_print": 0,
"amount": 0.0,
"breadcrumbs": "[{\"title\":\"Issues\", \"name\":\"issues\"}]", "breadcrumbs": "[{\"title\":\"Issues\", \"name\":\"issues\"}]",
"creation": "2016-06-24 15:50:33.186483", "creation": "2016-06-24 15:50:33.186483",
"doc_type": "Issue", "doc_type": "Issue",
@ -11,13 +15,16 @@
"idx": 0, "idx": 0,
"is_standard": 1, "is_standard": 1,
"login_required": 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", "modified_by": "Administrator",
"module": "Support", "module": "Support",
"name": "issues", "name": "issues",
"owner": "Administrator", "owner": "Administrator",
"published": 1, "published": 1,
"route": "issues", "route": "issues",
"show_sidebar": 1,
"sidebar_items": [],
"success_message": "", "success_message": "",
"success_url": "/issues", "success_url": "/issues",
"title": "Issue", "title": "Issue",
@ -27,6 +34,8 @@
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"label": "Subject", "label": "Subject",
"max_length": 0,
"max_value": 0,
"read_only": 0, "read_only": 0,
"reqd": 1 "reqd": 1
}, },
@ -36,15 +45,30 @@
"fieldtype": "Select", "fieldtype": "Select",
"hidden": 0, "hidden": 0,
"label": "Status", "label": "Status",
"max_length": 0,
"max_value": 0,
"options": "Open\nReplied\nHold\nClosed", "options": "Open\nReplied\nHold\nClosed",
"read_only": 1, "read_only": 1,
"reqd": 0 "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", "fieldname": "description",
"fieldtype": "Text", "fieldtype": "Text",
"hidden": 0, "hidden": 0,
"label": "Description", "label": "Description",
"max_length": 0,
"max_value": 0,
"read_only": 0, "read_only": 0,
"reqd": 0 "reqd": 0
}, },
@ -53,6 +77,8 @@
"fieldtype": "Attach", "fieldtype": "Attach",
"hidden": 0, "hidden": 0,
"label": "Attachment", "label": "Attachment",
"max_length": 0,
"max_value": 0,
"read_only": 0, "read_only": 0,
"reqd": 0 "reqd": 0
} }

View File

@ -1,8 +1,12 @@
{ {
"accept_payment": 0,
"allow_comments": 0, "allow_comments": 0,
"allow_delete": 0, "allow_delete": 0,
"allow_edit": 1, "allow_edit": 1,
"allow_incomplete": 0,
"allow_multiple": 1, "allow_multiple": 1,
"allow_print": 0,
"amount": 0.0,
"creation": "2016-06-24 15:50:33.196990", "creation": "2016-06-24 15:50:33.196990",
"doc_type": "Address", "doc_type": "Address",
"docstatus": 0, "docstatus": 0,
@ -10,13 +14,16 @@
"idx": 0, "idx": 0,
"is_standard": 1, "is_standard": 1,
"login_required": 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", "modified_by": "Administrator",
"module": "Utilities", "module": "Utilities",
"name": "addresses", "name": "addresses",
"owner": "Administrator", "owner": "Administrator",
"published": 1, "published": 1,
"route": "address", "route": "address",
"show_sidebar": 0,
"sidebar_items": [],
"success_url": "/addresses", "success_url": "/addresses",
"title": "Address", "title": "Address",
"web_form_fields": [ "web_form_fields": [
@ -26,6 +33,8 @@
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"label": "Address Title", "label": "Address Title",
"max_length": 0,
"max_value": 0,
"read_only": 0, "read_only": 0,
"reqd": 0 "reqd": 0
}, },
@ -34,6 +43,8 @@
"fieldtype": "Select", "fieldtype": "Select",
"hidden": 0, "hidden": 0,
"label": "Address Type", "label": "Address Type",
"max_length": 0,
"max_value": 0,
"options": "Billing\nShipping\nOffice\nPersonal\nPlant\nPostal\nShop\nSubsidiary\nWarehouse\nOther", "options": "Billing\nShipping\nOffice\nPersonal\nPlant\nPostal\nShop\nSubsidiary\nWarehouse\nOther",
"read_only": 0, "read_only": 0,
"reqd": 1 "reqd": 1
@ -43,6 +54,8 @@
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"label": "Address Line 1", "label": "Address Line 1",
"max_length": 0,
"max_value": 0,
"read_only": 0, "read_only": 0,
"reqd": 1 "reqd": 1
}, },
@ -51,6 +64,8 @@
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"label": "Address Line 2", "label": "Address Line 2",
"max_length": 0,
"max_value": 0,
"read_only": 0, "read_only": 0,
"reqd": 0 "reqd": 0
}, },
@ -59,6 +74,8 @@
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"label": "City/Town", "label": "City/Town",
"max_length": 0,
"max_value": 0,
"read_only": 0, "read_only": 0,
"reqd": 1 "reqd": 1
}, },
@ -67,6 +84,8 @@
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"label": "State", "label": "State",
"max_length": 0,
"max_value": 0,
"read_only": 0, "read_only": 0,
"reqd": 0 "reqd": 0
}, },
@ -75,6 +94,8 @@
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"label": "Postal Code", "label": "Postal Code",
"max_length": 0,
"max_value": 0,
"read_only": 0, "read_only": 0,
"reqd": 0 "reqd": 0
}, },
@ -83,6 +104,8 @@
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
"label": "Country", "label": "Country",
"max_length": 0,
"max_value": 0,
"options": "Country", "options": "Country",
"read_only": 0, "read_only": 0,
"reqd": 1 "reqd": 1
@ -90,6 +113,8 @@
{ {
"fieldtype": "Column Break", "fieldtype": "Column Break",
"hidden": 0, "hidden": 0,
"max_length": 0,
"max_value": 0,
"read_only": 0, "read_only": 0,
"reqd": 0 "reqd": 0
}, },
@ -98,6 +123,8 @@
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"label": "Email Id", "label": "Email Id",
"max_length": 0,
"max_value": 0,
"read_only": 0, "read_only": 0,
"reqd": 0 "reqd": 0
}, },
@ -106,6 +133,8 @@
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"label": "Phone", "label": "Phone",
"max_length": 0,
"max_value": 0,
"read_only": 0, "read_only": 0,
"reqd": 1 "reqd": 1
}, },
@ -116,6 +145,8 @@
"fieldtype": "Check", "fieldtype": "Check",
"hidden": 0, "hidden": 0,
"label": "Preferred Billing Address", "label": "Preferred Billing Address",
"max_length": 0,
"max_value": 0,
"read_only": 0, "read_only": 0,
"reqd": 0 "reqd": 0
}, },
@ -126,6 +157,8 @@
"fieldtype": "Check", "fieldtype": "Check",
"hidden": 0, "hidden": 0,
"label": "Preferred Shipping Address", "label": "Preferred Shipping Address",
"max_length": 0,
"max_value": 0,
"read_only": 0, "read_only": 0,
"reqd": 0 "reqd": 0
} }