diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
index 8bc96e2..6f95a16 100644
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
@@ -1,431 +1,430 @@
 {
- "_last_update": null, 
- "_user_tags": null, 
- "allow_attach": null, 
- "allow_copy": null, 
- "allow_email": null, 
- "allow_import": null, 
- "allow_print": null, 
- "allow_rename": null, 
- "allow_trash": null, 
- "autoname": "PVTD.######", 
- "change_log": null, 
- "client_script": null, 
- "client_script_core": null, 
- "client_string": null, 
- "colour": null, 
- "creation": "2013-05-21 16:16:04", 
- "custom": null, 
- "default_print_format": null, 
- "description": null, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": null, 
- "dt_template": null, 
+ "_last_update": null,
+ "_user_tags": null,
+ "allow_attach": null,
+ "allow_copy": null,
+ "allow_email": null,
+ "allow_import": null,
+ "allow_print": null,
+ "allow_rename": null,
+ "allow_trash": null,
+ "autoname": "PVTD.######",
+ "change_log": null,
+ "client_script": null,
+ "client_script_core": null,
+ "client_string": null,
+ "colour": null,
+ "creation": "2013-05-21 16:16:04",
+ "custom": null,
+ "default_print_format": null,
+ "description": null,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": null,
+ "dt_template": null,
  "fields": [
   {
-   "allow_on_submit": null, 
-   "default": "Valuation and Total", 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "category", 
-   "fieldtype": "Select", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": 0, 
-   "label": "Consider Tax or Charge for", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "category", 
-   "oldfieldtype": "Select", 
-   "options": "Valuation and Total\nValuation\nTotal", 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": 0, 
-   "report_hide": null, 
-   "reqd": 1, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": "Valuation and Total",
+   "depends_on": null,
+   "description": null,
+   "fieldname": "category",
+   "fieldtype": "Select",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": 0,
+   "label": "Consider Tax or Charge for",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "category",
+   "oldfieldtype": "Select",
+   "options": "Valuation and Total\nValuation\nTotal",
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": 0,
+   "report_hide": null,
+   "reqd": 1,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": "Add", 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "add_deduct_tax", 
-   "fieldtype": "Select", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": null, 
-   "label": "Add or Deduct", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "add_deduct_tax", 
-   "oldfieldtype": "Select", 
-   "options": "Add\nDeduct", 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": 0, 
-   "report_hide": null, 
-   "reqd": 1, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": "Add",
+   "depends_on": null,
+   "description": null,
+   "fieldname": "add_deduct_tax",
+   "fieldtype": "Select",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": null,
+   "label": "Add or Deduct",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "add_deduct_tax",
+   "oldfieldtype": "Select",
+   "options": "Add\nDeduct",
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": 0,
+   "report_hide": null,
+   "reqd": 1,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "charge_type", 
-   "fieldtype": "Select", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": 1, 
-   "label": "Type", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "charge_type", 
-   "oldfieldtype": "Select", 
-   "options": "\nActual\nOn Net Total\nOn Previous Row Amount\nOn Previous Row Total", 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": 0, 
-   "report_hide": null, 
-   "reqd": 1, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "charge_type",
+   "fieldtype": "Select",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": 1,
+   "label": "Type",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "charge_type",
+   "oldfieldtype": "Select",
+   "options": "\nActual\nOn Net Total\nOn Previous Row Amount\nOn Previous Row Total",
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": 0,
+   "report_hide": null,
+   "reqd": 1,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": "eval:[\"On Previous Row Amount\", \"On Previous Row Total\"].indexOf(doc.charge_type)!==-1", 
-   "description": null, 
-   "fieldname": "row_id", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": null, 
-   "label": "Reference Row #", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "row_id", 
-   "oldfieldtype": "Data", 
-   "options": null, 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": 0, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": "eval:[\"On Previous Row Amount\", \"On Previous Row Total\"].indexOf(doc.charge_type)!==-1",
+   "description": null,
+   "fieldname": "row_id",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": null,
+   "label": "Reference Row #",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "row_id",
+   "oldfieldtype": "Data",
+   "options": null,
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": 0,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "description", 
-   "fieldtype": "Small Text", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": 1, 
-   "label": "Description", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "description", 
-   "oldfieldtype": "Small Text", 
-   "options": null, 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": "300px", 
-   "read_only": 0, 
-   "report_hide": null, 
-   "reqd": 1, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "description",
+   "fieldtype": "Small Text",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": 1,
+   "label": "Description",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "description",
+   "oldfieldtype": "Small Text",
+   "options": null,
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": "300px",
+   "read_only": 0,
+   "report_hide": null,
+   "reqd": 1,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": "300px"
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "col_break1", 
-   "fieldtype": "Column Break", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": null, 
-   "label": null, 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": null, 
-   "oldfieldtype": null, 
-   "options": null, 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": null, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "col_break1",
+   "fieldtype": "Column Break",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": null,
+   "label": null,
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": null,
+   "oldfieldtype": null,
+   "options": null,
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": null,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "account_head", 
-   "fieldtype": "Link", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": 0, 
-   "label": "Account Head", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "account_head", 
-   "oldfieldtype": "Link", 
-   "options": "Account", 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": 0, 
-   "report_hide": null, 
-   "reqd": 1, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "account_head",
+   "fieldtype": "Link",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": 0,
+   "label": "Account Head",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "account_head",
+   "oldfieldtype": "Link",
+   "options": "Account",
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": 0,
+   "report_hide": null,
+   "reqd": 1,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": ":Company", 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "cost_center", 
-   "fieldtype": "Link", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": 0, 
-   "label": "Cost Center", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "cost_center", 
-   "oldfieldtype": "Link", 
-   "options": "Cost Center", 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": 0, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": ":Company",
+   "depends_on": null,
+   "description": null,
+   "fieldname": "cost_center",
+   "fieldtype": "Link",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": 0,
+   "label": "Cost Center",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "cost_center",
+   "oldfieldtype": "Link",
+   "options": "Cost Center",
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": 0,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "rate", 
-   "fieldtype": "Float", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": 1, 
-   "label": "Rate", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "rate", 
-   "oldfieldtype": "Currency", 
-   "options": null, 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": 0, 
-   "report_hide": null, 
-   "reqd": 0, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "rate",
+   "fieldtype": "Float",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": 1,
+   "label": "Rate",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "rate",
+   "oldfieldtype": "Currency",
+   "options": null,
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": 0,
+   "report_hide": null,
+   "reqd": 0,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "tax_amount", 
-   "fieldtype": "Currency", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": 1, 
-   "label": "Amount", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "tax_amount", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": 1, 
-   "report_hide": null, 
-   "reqd": 0, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "tax_amount",
+   "fieldtype": "Currency",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": 1,
+   "label": "Amount",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "tax_amount",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": 1,
+   "report_hide": null,
+   "reqd": 0,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "total", 
-   "fieldtype": "Currency", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": null, 
-   "label": "Total", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "total", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": 1, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "total",
+   "fieldtype": "Currency",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": null,
+   "label": "Total",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "total",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": 1,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "item_wise_tax_detail", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": null, 
-   "label": "Item Wise Tax Detail ", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "item_wise_tax_detail", 
-   "oldfieldtype": "Small Text", 
-   "options": null, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": null, 
-   "read_only": 1, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "item_wise_tax_detail",
+   "fieldtype": "Small Text",
+   "hidden": 1,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": null,
+   "label": "Item Wise Tax Detail ",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "item_wise_tax_detail",
+   "oldfieldtype": "Small Text",
+   "options": null,
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_width": null,
+   "read_only": 1,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "parenttype", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_restrictions": null, 
-   "in_filter": 1, 
-   "in_list_view": null, 
-   "label": "Parenttype", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "parenttype", 
-   "oldfieldtype": "Data", 
-   "options": null, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": null, 
-   "read_only": 0, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": 0, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "parenttype",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "ignore_restrictions": null,
+   "in_filter": 1,
+   "in_list_view": null,
+   "label": "Parenttype",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "parenttype",
+   "oldfieldtype": "Data",
+   "options": null,
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_width": null,
+   "read_only": 0,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": 0,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
   }
- ], 
- "hide_heading": 1, 
- "hide_toolbar": null, 
- "icon": null, 
- "idx": 1, 
- "in_create": null, 
- "in_dialog": null, 
- "is_submittable": null, 
- "is_transaction_doc": null, 
- "issingle": null, 
- "istable": 1, 
- "max_attachments": null, 
- "menu_index": null, 
- "modified": "2014-04-15 09:48:45.892548", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Purchase Taxes and Charges", 
- "name_case": null, 
- "owner": "Administrator", 
- "parent": null, 
- "parent_node": null, 
- "parentfield": null, 
- "parenttype": null, 
- "permissions": [], 
- "plugin": null, 
- "print_outline": null, 
- "read_only": null, 
- "read_only_onload": null, 
- "search_fields": null, 
- "section_style": null, 
- "server_code": null, 
- "server_code_compiled": null, 
- "server_code_core": null, 
- "server_code_error": null, 
- "show_in_menu": null, 
- "smallicon": null, 
- "subject": null, 
- "tag_fields": null, 
- "title_field": null, 
- "use_template": null, 
+ ],
+ "hide_heading": 1,
+ "hide_toolbar": null,
+ "icon": null,
+ "idx": 1,
+ "in_create": null,
+ "in_dialog": null,
+ "is_submittable": null,
+ "is_transaction_doc": null,
+ "issingle": null,
+ "istable": 1,
+ "max_attachments": null,
+ "menu_index": null,
+ "modified": "2014-04-15 09:48:45.892548",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Purchase Taxes and Charges",
+ "name_case": null,
+ "owner": "Administrator",
+ "parent": null,
+ "parent_node": null,
+ "parentfield": null,
+ "parenttype": null,
+ "permissions": [],
+ "plugin": null,
+ "print_outline": null,
+ "read_only": null,
+ "read_only_onload": null,
+ "search_fields": null,
+ "server_code": null,
+ "server_code_compiled": null,
+ "server_code_core": null,
+ "server_code_error": null,
+ "show_in_menu": null,
+ "smallicon": null,
+ "subject": null,
+ "tag_fields": null,
+ "title_field": null,
+ "use_template": null,
  "version": null
-}
\ No newline at end of file
+}
diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
index c47990f..0b0703f 100644
--- a/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
@@ -1,431 +1,430 @@
 {
- "_last_update": null, 
- "_user_tags": null, 
- "allow_attach": null, 
- "allow_copy": null, 
- "allow_email": null, 
- "allow_import": null, 
- "allow_print": null, 
- "allow_rename": null, 
- "allow_trash": null, 
- "autoname": "INVTD.######", 
- "change_log": null, 
- "client_script": null, 
- "client_script_core": null, 
- "client_string": null, 
- "colour": null, 
- "creation": "2013-04-24 11:39:32", 
- "custom": null, 
- "default_print_format": null, 
- "description": null, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": null, 
- "dt_template": null, 
+ "_last_update": null,
+ "_user_tags": null,
+ "allow_attach": null,
+ "allow_copy": null,
+ "allow_email": null,
+ "allow_import": null,
+ "allow_print": null,
+ "allow_rename": null,
+ "allow_trash": null,
+ "autoname": "INVTD.######",
+ "change_log": null,
+ "client_script": null,
+ "client_script_core": null,
+ "client_string": null,
+ "colour": null,
+ "creation": "2013-04-24 11:39:32",
+ "custom": null,
+ "default_print_format": null,
+ "description": null,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": null,
+ "dt_template": null,
  "fields": [
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "charge_type", 
-   "fieldtype": "Select", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": 1, 
-   "label": "Type", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "charge_type", 
-   "oldfieldtype": "Select", 
-   "options": "\nActual\nOn Net Total\nOn Previous Row Amount\nOn Previous Row Total", 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": null, 
-   "report_hide": null, 
-   "reqd": 1, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "charge_type",
+   "fieldtype": "Select",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": 1,
+   "label": "Type",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "charge_type",
+   "oldfieldtype": "Select",
+   "options": "\nActual\nOn Net Total\nOn Previous Row Amount\nOn Previous Row Total",
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": null,
+   "report_hide": null,
+   "reqd": 1,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": "eval:[\"On Previous Row Amount\", \"On Previous Row Total\"].indexOf(doc.charge_type)!==-1", 
-   "description": null, 
-   "fieldname": "row_id", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": null, 
-   "label": "Reference Row #", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "row_id", 
-   "oldfieldtype": "Data", 
-   "options": null, 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": null, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": "eval:[\"On Previous Row Amount\", \"On Previous Row Total\"].indexOf(doc.charge_type)!==-1",
+   "description": null,
+   "fieldname": "row_id",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": null,
+   "label": "Reference Row #",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "row_id",
+   "oldfieldtype": "Data",
+   "options": null,
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": null,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "description", 
-   "fieldtype": "Small Text", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": 1, 
-   "label": "Description", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "description", 
-   "oldfieldtype": "Small Text", 
-   "options": null, 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": "300px", 
-   "read_only": null, 
-   "report_hide": null, 
-   "reqd": 1, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "description",
+   "fieldtype": "Small Text",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": 1,
+   "label": "Description",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "description",
+   "oldfieldtype": "Small Text",
+   "options": null,
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": "300px",
+   "read_only": null,
+   "report_hide": null,
+   "reqd": 1,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": "300px"
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "col_break_1", 
-   "fieldtype": "Column Break", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": null, 
-   "label": null, 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": null, 
-   "oldfieldtype": null, 
-   "options": null, 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": null, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "col_break_1",
+   "fieldtype": "Column Break",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": null,
+   "label": null,
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": null,
+   "oldfieldtype": null,
+   "options": null,
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": null,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": "50%"
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "account_head", 
-   "fieldtype": "Link", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": 0, 
-   "label": "Account Head", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "account_head", 
-   "oldfieldtype": "Link", 
-   "options": "Account", 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": null, 
-   "report_hide": null, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "account_head",
+   "fieldtype": "Link",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": 0,
+   "label": "Account Head",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "account_head",
+   "oldfieldtype": "Link",
+   "options": "Account",
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": null,
+   "report_hide": null,
+   "reqd": 1,
+   "search_index": 1,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": ":Company", 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "cost_center", 
-   "fieldtype": "Link", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": 0, 
-   "label": "Cost Center", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "cost_center_other_charges", 
-   "oldfieldtype": "Link", 
-   "options": "Cost Center", 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": null, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": ":Company",
+   "depends_on": null,
+   "description": null,
+   "fieldname": "cost_center",
+   "fieldtype": "Link",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": 0,
+   "label": "Cost Center",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "cost_center_other_charges",
+   "oldfieldtype": "Link",
+   "options": "Cost Center",
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": null,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "rate", 
-   "fieldtype": "Float", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": 1, 
-   "label": "Rate", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "rate", 
-   "oldfieldtype": "Currency", 
-   "options": null, 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": null, 
-   "report_hide": null, 
-   "reqd": 1, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "rate",
+   "fieldtype": "Float",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": 1,
+   "label": "Rate",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "rate",
+   "oldfieldtype": "Currency",
+   "options": null,
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": null,
+   "report_hide": null,
+   "reqd": 1,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "tax_amount", 
-   "fieldtype": "Currency", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": 1, 
-   "label": "Amount", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "tax_amount", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": 1, 
-   "report_hide": null, 
-   "reqd": 0, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "tax_amount",
+   "fieldtype": "Currency",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": 1,
+   "label": "Amount",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "tax_amount",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": 1,
+   "report_hide": null,
+   "reqd": 0,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "total", 
-   "fieldtype": "Currency", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": null, 
-   "label": "Total", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "total", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": 1, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "total",
+   "fieldtype": "Currency",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": null,
+   "label": "Total",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "total",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": 1,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "default": null, 
-   "depends_on": null, 
-   "description": "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount", 
-   "fieldname": "included_in_print_rate", 
-   "fieldtype": "Check", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": null, 
-   "label": "Is this Tax included in Basic Rate?", 
-   "no_column": null, 
-   "no_copy": 0, 
-   "oldfieldname": null, 
-   "oldfieldtype": null, 
-   "options": null, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "150px", 
-   "read_only": null, 
-   "report_hide": 1, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": 0,
+   "default": null,
+   "depends_on": null,
+   "description": "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",
+   "fieldname": "included_in_print_rate",
+   "fieldtype": "Check",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": null,
+   "label": "Is this Tax included in Basic Rate?",
+   "no_column": null,
+   "no_copy": 0,
+   "oldfieldname": null,
+   "oldfieldtype": null,
+   "options": null,
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_width": "150px",
+   "read_only": null,
+   "report_hide": 1,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": "150px"
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "tax_amount_after_discount_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 1, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": null, 
-   "label": "Tax Amount After Discount Amount", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": null, 
-   "oldfieldtype": null, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": 1, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "tax_amount_after_discount_amount",
+   "fieldtype": "Currency",
+   "hidden": 1,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": null,
+   "label": "Tax Amount After Discount Amount",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": null,
+   "oldfieldtype": null,
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": 1,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "item_wise_tax_detail", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": null, 
-   "label": "Item Wise Tax Detail", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "item_wise_tax_detail", 
-   "oldfieldtype": "Small Text", 
-   "options": null, 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": 1, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "item_wise_tax_detail",
+   "fieldtype": "Small Text",
+   "hidden": 1,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": null,
+   "label": "Item Wise Tax Detail",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "item_wise_tax_detail",
+   "oldfieldtype": "Small Text",
+   "options": null,
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": 1,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "parenttype", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_restrictions": null, 
-   "in_filter": 1, 
-   "in_list_view": null, 
-   "label": "Parenttype", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "parenttype", 
-   "oldfieldtype": "Data", 
-   "options": null, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": null, 
-   "read_only": null, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": 1, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "parenttype",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "ignore_restrictions": null,
+   "in_filter": 1,
+   "in_list_view": null,
+   "label": "Parenttype",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "parenttype",
+   "oldfieldtype": "Data",
+   "options": null,
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_width": null,
+   "read_only": null,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": 1,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
   }
- ], 
- "hide_heading": 1, 
- "hide_toolbar": null, 
- "icon": null, 
- "idx": 1, 
- "in_create": null, 
- "in_dialog": null, 
- "is_submittable": null, 
- "is_transaction_doc": null, 
- "issingle": null, 
- "istable": 1, 
- "max_attachments": null, 
- "menu_index": null, 
- "modified": "2014-04-14 18:40:48.450796", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Sales Taxes and Charges", 
- "name_case": null, 
- "owner": "Administrator", 
- "parent": null, 
- "parent_node": null, 
- "parentfield": null, 
- "parenttype": null, 
- "permissions": [], 
- "plugin": null, 
- "print_outline": null, 
- "read_only": null, 
- "read_only_onload": null, 
- "search_fields": null, 
- "section_style": null, 
- "server_code": null, 
- "server_code_compiled": null, 
- "server_code_core": null, 
- "server_code_error": null, 
- "show_in_menu": null, 
- "smallicon": null, 
- "subject": null, 
- "tag_fields": null, 
- "title_field": null, 
- "use_template": null, 
+ ],
+ "hide_heading": 1,
+ "hide_toolbar": null,
+ "icon": null,
+ "idx": 1,
+ "in_create": null,
+ "in_dialog": null,
+ "is_submittable": null,
+ "is_transaction_doc": null,
+ "issingle": null,
+ "istable": 1,
+ "max_attachments": null,
+ "menu_index": null,
+ "modified": "2014-04-14 18:40:48.450796",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Sales Taxes and Charges",
+ "name_case": null,
+ "owner": "Administrator",
+ "parent": null,
+ "parent_node": null,
+ "parentfield": null,
+ "parenttype": null,
+ "permissions": [],
+ "plugin": null,
+ "print_outline": null,
+ "read_only": null,
+ "read_only_onload": null,
+ "search_fields": null,
+ "server_code": null,
+ "server_code_compiled": null,
+ "server_code_core": null,
+ "server_code_error": null,
+ "show_in_menu": null,
+ "smallicon": null,
+ "subject": null,
+ "tag_fields": null,
+ "title_field": null,
+ "use_template": null,
  "version": null
-}
\ No newline at end of file
+}
diff --git a/erpnext/selling/doctype/campaign/campaign.json b/erpnext/selling/doctype/campaign/campaign.json
index 7d02d22..7764a23 100644
--- a/erpnext/selling/doctype/campaign/campaign.json
+++ b/erpnext/selling/doctype/campaign/campaign.json
@@ -1,237 +1,236 @@
 {
- "_last_update": null, 
- "_user_tags": null, 
- "allow_attach": null, 
- "allow_copy": null, 
- "allow_email": null, 
- "allow_import": 1, 
- "allow_print": null, 
- "allow_rename": 1, 
- "allow_trash": null, 
- "autoname": "naming_series:", 
- "change_log": null, 
- "client_script": null, 
- "client_script_core": null, 
- "client_string": null, 
- "colour": null, 
- "creation": "2013-01-10 16:34:18", 
- "custom": null, 
- "default_print_format": null, 
- "description": "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Master", 
- "dt_template": null, 
+ "_last_update": null,
+ "_user_tags": null,
+ "allow_attach": null,
+ "allow_copy": null,
+ "allow_email": null,
+ "allow_import": 1,
+ "allow_print": null,
+ "allow_rename": 1,
+ "allow_trash": null,
+ "autoname": "naming_series:",
+ "change_log": null,
+ "client_script": null,
+ "client_script_core": null,
+ "client_string": null,
+ "colour": null,
+ "creation": "2013-01-10 16:34:18",
+ "custom": null,
+ "default_print_format": null,
+ "description": "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Master",
+ "dt_template": null,
  "fields": [
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "campaign", 
-   "fieldtype": "Section Break", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": 0, 
-   "label": "Campaign", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": null, 
-   "oldfieldtype": "Section Break", 
-   "options": null, 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": null, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "campaign",
+   "fieldtype": "Section Break",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": 0,
+   "label": "Campaign",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": null,
+   "oldfieldtype": "Section Break",
+   "options": null,
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": null,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "campaign_name", 
-   "fieldtype": "Data", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": 1, 
-   "label": "Campaign Name", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "campaign_name", 
-   "oldfieldtype": "Data", 
-   "options": null, 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": null, 
-   "report_hide": null, 
-   "reqd": 1, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "campaign_name",
+   "fieldtype": "Data",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": 1,
+   "label": "Campaign Name",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "campaign_name",
+   "oldfieldtype": "Data",
+   "options": null,
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": null,
+   "report_hide": null,
+   "reqd": 1,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "naming_series", 
-   "fieldtype": "Select", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": 0, 
-   "label": "Naming Series", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": null, 
-   "oldfieldtype": null, 
-   "options": "Campaign-.####", 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": null, 
-   "report_hide": null, 
-   "reqd": 0, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "naming_series",
+   "fieldtype": "Select",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": 0,
+   "label": "Naming Series",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": null,
+   "oldfieldtype": null,
+   "options": "Campaign-.####",
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": null,
+   "report_hide": null,
+   "reqd": 0,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "description", 
-   "fieldtype": "Text", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": 1, 
-   "label": "Description", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": "description", 
-   "oldfieldtype": "Text", 
-   "options": null, 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": null, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "description",
+   "fieldtype": "Text",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": 1,
+   "label": "Description",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": "description",
+   "oldfieldtype": "Text",
+   "options": null,
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": null,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": "300px"
   }
- ], 
- "hide_heading": null, 
- "hide_toolbar": null, 
- "icon": "icon-bullhorn", 
- "idx": 1, 
- "in_create": null, 
- "in_dialog": null, 
- "is_submittable": null, 
- "is_transaction_doc": null, 
- "issingle": null, 
- "istable": null, 
- "max_attachments": null, 
- "menu_index": null, 
- "modified": "2014-04-16 12:36:34.606593", 
- "modified_by": "Administrator", 
- "module": "Selling", 
- "name": "Campaign", 
- "name_case": null, 
- "owner": "Administrator", 
- "parent": null, 
- "parent_node": null, 
- "parentfield": null, 
- "parenttype": null, 
+ ],
+ "hide_heading": null,
+ "hide_toolbar": null,
+ "icon": "icon-bullhorn",
+ "idx": 1,
+ "in_create": null,
+ "in_dialog": null,
+ "is_submittable": null,
+ "is_transaction_doc": null,
+ "issingle": null,
+ "istable": null,
+ "max_attachments": null,
+ "menu_index": null,
+ "modified": "2014-04-16 12:36:34.606593",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "Campaign",
+ "name_case": null,
+ "owner": "Administrator",
+ "parent": null,
+ "parent_node": null,
+ "parentfield": null,
+ "parenttype": null,
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": null, 
-   "import": 0, 
-   "match": null, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 0, 
-   "restrict": null, 
-   "restricted": null, 
-   "role": "Sales Manager", 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 1,
+   "export": null,
+   "import": 0,
+   "match": null,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 0,
+   "restrict": null,
+   "restricted": null,
+   "role": "Sales Manager",
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": null, 
-   "import": null, 
-   "match": null, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "restrict": null, 
-   "restricted": null, 
-   "role": "Sales User", 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 1,
+   "export": null,
+   "import": null,
+   "match": null,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "restrict": null,
+   "restricted": null,
+   "role": "Sales User",
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": null, 
-   "import": null, 
-   "match": null, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "restrict": null, 
-   "restricted": null, 
-   "role": "Sales Master Manager", 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": null,
+   "import": null,
+   "match": null,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "restrict": null,
+   "restricted": null,
+   "role": "Sales Master Manager",
+   "submit": 0,
    "write": 1
   }
- ], 
- "plugin": null, 
- "print_outline": null, 
- "read_only": null, 
- "read_only_onload": null, 
- "search_fields": null, 
- "section_style": null, 
- "server_code": null, 
- "server_code_compiled": null, 
- "server_code_core": null, 
- "server_code_error": null, 
- "show_in_menu": null, 
- "smallicon": null, 
- "subject": null, 
- "tag_fields": null, 
- "title_field": null, 
- "use_template": null, 
+ ],
+ "plugin": null,
+ "print_outline": null,
+ "read_only": null,
+ "read_only_onload": null,
+ "search_fields": null,
+ "server_code": null,
+ "server_code_compiled": null,
+ "server_code_core": null,
+ "server_code_error": null,
+ "show_in_menu": null,
+ "smallicon": null,
+ "subject": null,
+ "tag_fields": null,
+ "title_field": null,
+ "use_template": null,
  "version": null
-}
\ No newline at end of file
+}
diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json
index ec3096c..948d6ad 100644
--- a/erpnext/selling/doctype/selling_settings/selling_settings.json
+++ b/erpnext/selling/doctype/selling_settings/selling_settings.json
@@ -1,367 +1,366 @@
 {
- "_last_update": null, 
- "_user_tags": null, 
- "allow_attach": null, 
- "allow_copy": null, 
- "allow_email": null, 
- "allow_import": null, 
- "allow_print": null, 
- "allow_rename": null, 
- "allow_trash": null, 
- "autoname": null, 
- "change_log": null, 
- "client_script": null, 
- "client_script_core": null, 
- "client_string": null, 
- "colour": null, 
- "creation": "2013-06-25 10:25:16", 
- "custom": null, 
- "default_print_format": null, 
- "description": "Settings for Selling Module", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Other", 
- "dt_template": null, 
+ "_last_update": null,
+ "_user_tags": null,
+ "allow_attach": null,
+ "allow_copy": null,
+ "allow_email": null,
+ "allow_import": null,
+ "allow_print": null,
+ "allow_rename": null,
+ "allow_trash": null,
+ "autoname": null,
+ "change_log": null,
+ "client_script": null,
+ "client_script_core": null,
+ "client_string": null,
+ "colour": null,
+ "creation": "2013-06-25 10:25:16",
+ "custom": null,
+ "default_print_format": null,
+ "description": "Settings for Selling Module",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Other",
+ "dt_template": null,
  "fields": [
   {
-   "allow_on_submit": null, 
-   "default": "Customer Name", 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "cust_master_name", 
-   "fieldtype": "Select", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": 1, 
-   "label": "Customer Naming By", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": null, 
-   "oldfieldtype": null, 
-   "options": "Customer Name\nNaming Series", 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": null, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": "Customer Name",
+   "depends_on": null,
+   "description": null,
+   "fieldname": "cust_master_name",
+   "fieldtype": "Select",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": 1,
+   "label": "Customer Naming By",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": null,
+   "oldfieldtype": null,
+   "options": "Customer Name\nNaming Series",
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": null,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "campaign_naming_by", 
-   "fieldtype": "Select", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": 1, 
-   "label": "Campaign Naming By", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": null, 
-   "oldfieldtype": null, 
-   "options": "Campaign Name\nNaming Series", 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": null, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "campaign_naming_by",
+   "fieldtype": "Select",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": 1,
+   "label": "Campaign Naming By",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": null,
+   "oldfieldtype": null,
+   "options": "Campaign Name\nNaming Series",
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": null,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": "<a href=\"#Sales Browser/Customer Group\">Add / Edit</a>", 
-   "fieldname": "customer_group", 
-   "fieldtype": "Link", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": 1, 
-   "label": "Default Customer Group", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": null, 
-   "oldfieldtype": null, 
-   "options": "Customer Group", 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": null, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": "<a href=\"#Sales Browser/Customer Group\">Add / Edit</a>",
+   "fieldname": "customer_group",
+   "fieldtype": "Link",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": 1,
+   "label": "Default Customer Group",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": null,
+   "oldfieldtype": null,
+   "options": "Customer Group",
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": null,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>", 
-   "fieldname": "territory", 
-   "fieldtype": "Link", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": 1, 
-   "label": "Default Territory", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": null, 
-   "oldfieldtype": null, 
-   "options": "Territory", 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": null, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
+   "fieldname": "territory",
+   "fieldtype": "Link",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": 1,
+   "label": "Default Territory",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": null,
+   "oldfieldtype": null,
+   "options": "Territory",
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": null,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "selling_price_list", 
-   "fieldtype": "Link", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": 1, 
-   "label": "Default Price List", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": null, 
-   "oldfieldtype": null, 
-   "options": "Price List", 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": null, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "selling_price_list",
+   "fieldtype": "Link",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": 1,
+   "label": "Default Price List",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": null,
+   "oldfieldtype": null,
+   "options": "Price List",
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": null,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "column_break_5", 
-   "fieldtype": "Column Break", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": null, 
-   "label": null, 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": null, 
-   "oldfieldtype": null, 
-   "options": null, 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": null, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "column_break_5",
+   "fieldtype": "Column Break",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": null,
+   "label": null,
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": null,
+   "oldfieldtype": null,
+   "options": null,
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": null,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "so_required", 
-   "fieldtype": "Select", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": null, 
-   "label": "Sales Order Required", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": null, 
-   "oldfieldtype": null, 
-   "options": "No\nYes", 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": null, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "so_required",
+   "fieldtype": "Select",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": null,
+   "label": "Sales Order Required",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": null,
+   "oldfieldtype": null,
+   "options": "No\nYes",
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": null,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "dn_required", 
-   "fieldtype": "Select", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": null, 
-   "label": "Delivery Note Required", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": null, 
-   "oldfieldtype": null, 
-   "options": "No\nYes", 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": null, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "dn_required",
+   "fieldtype": "Select",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": null,
+   "label": "Delivery Note Required",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": null,
+   "oldfieldtype": null,
+   "options": "No\nYes",
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": null,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "maintain_same_sales_rate", 
-   "fieldtype": "Check", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": null, 
-   "label": "Maintain Same Rate Throughout Sales Cycle", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": null, 
-   "oldfieldtype": null, 
-   "options": null, 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": null, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "maintain_same_sales_rate",
+   "fieldtype": "Check",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": null,
+   "label": "Maintain Same Rate Throughout Sales Cycle",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": null,
+   "oldfieldtype": null,
+   "options": null,
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": null,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
-  }, 
+  },
   {
-   "allow_on_submit": null, 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "fieldname": "editable_price_list_rate", 
-   "fieldtype": "Check", 
-   "hidden": null, 
-   "ignore_restrictions": null, 
-   "in_filter": null, 
-   "in_list_view": null, 
-   "label": "Allow user to edit Price List Rate in transactions", 
-   "no_column": null, 
-   "no_copy": null, 
-   "oldfieldname": null, 
-   "oldfieldtype": null, 
-   "options": null, 
-   "permlevel": 0, 
-   "print_hide": null, 
-   "print_width": null, 
-   "read_only": null, 
-   "report_hide": null, 
-   "reqd": null, 
-   "search_index": null, 
-   "set_only_once": null, 
-   "trigger": null, 
+   "allow_on_submit": null,
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "fieldname": "editable_price_list_rate",
+   "fieldtype": "Check",
+   "hidden": null,
+   "ignore_restrictions": null,
+   "in_filter": null,
+   "in_list_view": null,
+   "label": "Allow user to edit Price List Rate in transactions",
+   "no_column": null,
+   "no_copy": null,
+   "oldfieldname": null,
+   "oldfieldtype": null,
+   "options": null,
+   "permlevel": 0,
+   "print_hide": null,
+   "print_width": null,
+   "read_only": null,
+   "report_hide": null,
+   "reqd": null,
+   "search_index": null,
+   "set_only_once": null,
+   "trigger": null,
    "width": null
   }
- ], 
- "hide_heading": null, 
- "hide_toolbar": null, 
- "icon": "icon-cog", 
- "idx": 1, 
- "in_create": null, 
- "in_dialog": null, 
- "is_submittable": null, 
- "is_transaction_doc": null, 
- "issingle": 1, 
- "istable": null, 
- "max_attachments": null, 
- "menu_index": null, 
- "modified": "2014-04-16 12:21:36.117261", 
- "modified_by": "Administrator", 
- "module": "Selling", 
- "name": "Selling Settings", 
- "name_case": null, 
- "owner": "Administrator", 
- "parent": null, 
- "parent_node": null, 
- "parentfield": null, 
- "parenttype": null, 
+ ],
+ "hide_heading": null,
+ "hide_toolbar": null,
+ "icon": "icon-cog",
+ "idx": 1,
+ "in_create": null,
+ "in_dialog": null,
+ "is_submittable": null,
+ "is_transaction_doc": null,
+ "issingle": 1,
+ "istable": null,
+ "max_attachments": null,
+ "menu_index": null,
+ "modified": "2014-04-16 12:21:36.117261",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "Selling Settings",
+ "name_case": null,
+ "owner": "Administrator",
+ "parent": null,
+ "parent_node": null,
+ "parentfield": null,
+ "parenttype": null,
  "permissions": [
   {
-   "amend": null, 
-   "cancel": null, 
-   "create": 1, 
-   "delete": null, 
-   "email": 1, 
-   "export": null, 
-   "import": null, 
-   "match": null, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": null, 
-   "restrict": null, 
-   "restricted": null, 
-   "role": "System Manager", 
-   "submit": null, 
+   "amend": null,
+   "cancel": null,
+   "create": 1,
+   "delete": null,
+   "email": 1,
+   "export": null,
+   "import": null,
+   "match": null,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": null,
+   "restrict": null,
+   "restricted": null,
+   "role": "System Manager",
+   "submit": null,
    "write": 1
   }
- ], 
- "plugin": null, 
- "print_outline": null, 
- "read_only": null, 
- "read_only_onload": null, 
- "search_fields": null, 
- "section_style": null, 
- "server_code": null, 
- "server_code_compiled": null, 
- "server_code_core": null, 
- "server_code_error": null, 
- "show_in_menu": null, 
- "smallicon": null, 
- "subject": null, 
- "tag_fields": null, 
- "title_field": null, 
- "use_template": null, 
+ ],
+ "plugin": null,
+ "print_outline": null,
+ "read_only": null,
+ "read_only_onload": null,
+ "search_fields": null,
+ "server_code": null,
+ "server_code_compiled": null,
+ "server_code_core": null,
+ "server_code_error": null,
+ "show_in_menu": null,
+ "smallicon": null,
+ "subject": null,
+ "tag_fields": null,
+ "title_field": null,
+ "use_template": null,
  "version": null
-}
\ No newline at end of file
+}
diff --git a/erpnext/startup/boot.py b/erpnext/startup/boot.py
index 1d5a6d2..c7acba7 100644
--- a/erpnext/startup/boot.py
+++ b/erpnext/startup/boot.py
@@ -8,39 +8,68 @@
 def boot_session(bootinfo):
 	"""boot session - send website info if guest"""
 	import frappe
-	
-	bootinfo['custom_css'] = frappe.db.get_value('Style Settings', None, 'custom_css') or ''
-	bootinfo['website_settings'] = frappe.get_doc('Website Settings')
+
+	bootinfo.custom_css = frappe.db.get_value('Style Settings', None, 'custom_css') or ''
+	bootinfo.website_settings = frappe.get_doc('Website Settings')
 
 	if frappe.session['user']!='Guest':
-		bootinfo['letter_heads'] = get_letter_heads()
-		
-		load_country_and_currency(bootinfo)
-		
-		bootinfo['notification_settings'] = frappe.get_doc("Notification Control", 
-			"Notification Control")
-				
-		# if no company, show a dialog box to create a new company
-		bootinfo["customer_count"] = frappe.db.sql("""select count(*) from tabCustomer""")[0][0]
+		bootinfo.letter_heads = get_letter_heads()
 
-		if not bootinfo["customer_count"]:
-			bootinfo['setup_complete'] = frappe.db.sql("""select name from 
+		update_page_info(bootinfo)
+
+		load_country_and_currency(bootinfo)
+
+		bootinfo.notification_settings = frappe.get_doc("Notification Control",
+			"Notification Control")
+
+		# if no company, show a dialog box to create a new company
+		bootinfo.customer_count = frappe.db.sql("""select count(*) from tabCustomer""")[0][0]
+
+		if not bootinfo.customer_count:
+			bootinfo.setup_complete = frappe.db.sql("""select name from
 				tabCompany limit 1""") and 'Yes' or 'No'
-		
-		bootinfo['docs'] += frappe.db.sql("""select name, default_currency, cost_center
+
+		bootinfo.docs += frappe.db.sql("""select name, default_currency, cost_center
             from `tabCompany`""", as_dict=1, update={"doctype":":Company"})
 
 def load_country_and_currency(bootinfo):
 	country = frappe.db.get_default("country")
 	if country and frappe.db.exists("Country", country):
-		bootinfo["docs"] += [frappe.get_doc("Country", country)]
-		
-	bootinfo["docs"] += frappe.db.sql("""select * from tabCurrency
+		bootinfo.docs += [frappe.get_doc("Country", country)]
+
+	bootinfo.docs += frappe.db.sql("""select * from tabCurrency
 		where ifnull(enabled,0)=1""", as_dict=1, update={"doctype":":Currency"})
 
 def get_letter_heads():
 	import frappe
-	ret = frappe.db.sql("""select name, content from `tabLetter Head` 
+	ret = frappe.db.sql("""select name, content from `tabLetter Head`
 		where ifnull(disabled,0)=0""")
 	return dict(ret)
-	
+
+def update_page_info(bootinfo):
+	bootinfo.page_info.update({
+		"Chart of Accounts": {
+			"title": "Chart of Accounts",
+			"route": "Accounts Browser/Account"
+		},
+		"Chart of Cost Centers": {
+			"title": "Chart of Cost Centers",
+			"route": "Accounts Browser/Cost Center"
+		},
+		"Item Group Tree": {
+			"title": "Item Group Tree",
+			"route": "Sales Browser/Item Group"
+		},
+		"Customer Group Tree": {
+			"title": "Customer Group Tree",
+			"route": "Sales Browser/Customer Group"
+		},
+		"Territory Tree": {
+			"title": "Territory Tree",
+			"route": "Sales Browser/Territory"
+		},
+		"Sales Person Tree": {
+			"title": "Sales Person Tree",
+			"route": "Sales Browser/Sales Person"
+		}
+	})