From b57f322c3d591c1b32208d2e5d310adf7bafcaa0 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 26 Mar 2014 18:15:29 +0530
Subject: [PATCH 1/5] FormMeta, Form Load, refactored client side Model and
 Meta - #478

---
 frappe/__init__.py                            |  21 ++-
 frappe/boot.py                                |  15 +-
 frappe/core/doctype/doctype/doctype.py        |  94 +++++------
 frappe/core/doctype/page/page.py              |  56 ++++---
 frappe/core/doctype/user/user.js              |   6 +-
 frappe/core/doctype/workflow/workflow.js      |   8 +-
 .../permission_manager/permission_manager.js  |  14 +-
 frappe/handler.py                             |   2 +-
 frappe/model/base_document.py                 |  10 ++
 frappe/model/code.py                          |   1 +
 frappe/model/doctype.py                       |   2 +
 frappe/model/document.py                      |  66 +++++---
 frappe/model/meta.py                          |   2 +
 frappe/public/build.json                      |   2 +-
 frappe/public/js/frappe/form/control.js       |   5 +-
 frappe/public/js/frappe/form/formatters.js    |   2 +-
 frappe/public/js/frappe/form/grid.js          |   6 +-
 frappe/public/js/frappe/form/linked_with.js   |   4 +-
 .../frappe/{model/doclist.js => form/save.js} |  76 +++++----
 .../public/js/frappe/form/script_manager.js   |   2 +-
 frappe/public/js/frappe/form/workflow.js      |   4 +-
 frappe/public/js/frappe/model/create_new.js   |  28 +++-
 frappe/public/js/frappe/model/meta.js         |  11 +-
 frappe/public/js/frappe/model/model.js        |  89 ++++------
 frappe/public/js/frappe/model/perm.js         |  12 +-
 frappe/public/js/frappe/model/sync.js         |  98 ++---------
 frappe/public/js/frappe/model/workflow.js     |  34 +---
 frappe/public/js/frappe/request.js            |   3 +-
 frappe/public/js/frappe/views/reportview.js   |  12 +-
 frappe/public/js/legacy/clientscriptAPI.js    |  11 +-
 frappe/public/js/legacy/form.js               |  77 +++------
 frappe/public/js/legacy/handler.js            |  19 ++-
 frappe/tests/test_document.py                 |   1 +
 frappe/tests/test_form_load.py                |  16 ++
 frappe/utils/response.py                      |  18 +-
 frappe/website/doctype/blog_post/blog_post.js |   2 +-
 frappe/widgets/form/load.py                   |  38 ++---
 frappe/widgets/form/meta.py                   | 157 ++++++++++++++++++
 frappe/widgets/form/run_method.py             |   2 -
 frappe/widgets/form/utils.py                  |   2 -
 frappe/widgets/page.py                        |  33 ++--
 41 files changed, 548 insertions(+), 513 deletions(-)
 rename frappe/public/js/frappe/{model/doclist.js => form/save.js} (63%)
 create mode 100644 frappe/tests/test_form_load.py
 create mode 100644 frappe/widgets/form/meta.py

diff --git a/frappe/__init__.py b/frappe/__init__.py
index ca7802c25f..ca8d58d6ad 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -96,9 +96,9 @@ def init(site, sites_path=None):
 	local.site_path = os.path.join(sites_path, site)
 	local.message_log = []
 	local.debug_log = []
-	local.response = _dict({})
 	local.lang = "en"
 	local.request_method = request.method if request else None
+	local.response = _dict({"docs":[]})
 	local.conf = _dict(get_site_config())
 	local.initialised = True
 	local.flags = _dict({})
@@ -115,6 +115,15 @@ def init(site, sites_path=None):
 
 	setup_module_map()
 
+def connect(site=None, db_name=None):
+	from database import Database
+	if site:
+		init(site)
+	local.db = Database(user=db_name or local.conf.db_name)
+	local.form_dict = _dict()
+	local.session = _dict()
+	set_user("Administrator")
+
 def get_site_config(sites_path=None, site_path=None):
 	config = {}
 	
@@ -200,16 +209,6 @@ def throw(msg, exc=ValidationError):
 def create_folder(path):
 	if not os.path.exists(path): os.makedirs(path)
 	
-def connect(site=None, db_name=None):
-	from database import Database
-	if site:
-		init(site)
-	local.db = Database(user=db_name or local.conf.db_name)
-	local.response = _dict()
-	local.form_dict = _dict()
-	local.session = _dict()
-	set_user("Administrator")
-
 def set_user(username):
 	from frappe.utils.user import User
 	local.session["user"] = username
diff --git a/frappe/boot.py b/frappe/boot.py
index 2470edd941..c811d4d7b1 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -65,9 +65,6 @@ def get_bootinfo():
 	for method in hooks.boot_session or []:
 		frappe.get_attr(method)(bootinfo)
 		
-	from frappe.model.utils import compress
-	bootinfo['docs'] = compress(bootinfo['docs'])
-
 	if bootinfo.lang:
 		bootinfo.lang = unicode(bootinfo.lang)
 	
@@ -138,10 +135,10 @@ def add_home_page(bootinfo, doclist):
 	home_page = frappe.get_application_home_page(frappe.session.user)
 
 	try:
-		page_doclist = frappe.widgets.page.get(home_page)
+		page = frappe.widgets.page.get(home_page)
 	except (frappe.DoesNotExistError, frappe.PermissionError), e:
-		page_doclist = frappe.widgets.page.get('desktop')
-		
-	bootinfo['home_page_html'] = page_doclist[0].content
-	bootinfo['home_page'] = page_doclist[0].name
-	doclist += page_doclist
+		frappe.message_log.pop()
+		page = frappe.widgets.page.get('desktop')
+
+	bootinfo['home_page'] = page.name
+	doclist.append(page)
diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py
index 8bac02bc72..2c05017e67 100644
--- a/frappe/core/doctype/doctype/doctype.py
+++ b/frappe/core/doctype/doctype/doctype.py
@@ -9,23 +9,20 @@ import os
 
 from frappe.utils import now, cint
 from frappe.model import no_value_fields
+from frappe.model.document import Document
 
-class DocType:
-	def __init__(self, doc=None, doclist=[]):
-		self.doc = doc
-		self.doclist = doclist
-
+class DocType(Document):
 	def validate(self):
 		if not frappe.conf.get("developer_mode"):
 			frappe.throw("Not in Developer Mode! Set in site_config.json")
 		for c in [".", "/", "#", "&", "=", ":", "'", '"']:
-			if c in self.doc.name:
+			if c in self.name:
 				frappe.msgprint(c + " not allowed in name", raise_exception=1)
 		self.validate_series()
 		self.scrub_field_names()
 		self.validate_title_field()
-		validate_fields(self.doclist.get({"doctype":"DocField"}))
-		validate_permissions(self.doclist.get({"doctype":"DocPerm"}))
+		validate_fields(self.get("fields"))
+		validate_permissions(self.get("permissions"))
 		self.make_amendable()
 		self.check_link_replacement_error()
 
@@ -33,14 +30,14 @@ class DocType:
 		if frappe.flags.in_import:
 			return
 		parent_list = frappe.db.sql("""SELECT parent 
-			from tabDocField where fieldtype="Table" and options=%s""", self.doc.name)
+			from tabDocField where fieldtype="Table" and options=%s""", self.name)
 		for p in parent_list:
 			frappe.db.sql('UPDATE tabDocType SET modified=%s WHERE `name`=%s', (now(), p[0]))
 
 	def scrub_field_names(self):
 		restricted = ('name','parent','idx','owner','creation','modified','modified_by',
 			'parentfield','parenttype',"file_list")
-		for d in self.doclist:
+		for d in self.get("fields"):
 			if d.parent and d.fieldtype:
 				if (not d.fieldname):
 					if d.label:
@@ -52,16 +49,16 @@ class DocType:
 						
 	
 	def validate_title_field(self):
-		if self.doc.title_field and \
-			self.doc.title_field not in [d.fieldname for d in self.doclist.get({"doctype":"DocField"})]:
+		if self.title_field and \
+			self.title_field not in [d.fieldname for d in self.get("fields")]:
 			frappe.throw(_("Title field must be a valid fieldname"))
 			
 	def validate_series(self, autoname=None, name=None):
-		if not autoname: autoname = self.doc.autoname
-		if not name: name = self.doc.name
+		if not autoname: autoname = self.autoname
+		if not name: name = self.name
 		
-		if not autoname and self.doclist.get({"fieldname":"naming_series"}):
-			self.doc.autoname = "naming_series:"
+		if not autoname and self.get("fields", {"fieldname":"naming_series"}):
+			self.autoname = "naming_series:"
 		
 		if autoname and (not autoname.startswith('field:')) and (not autoname.startswith('eval:')) \
 			and (not autoname=='Prompt') and (not autoname.startswith('naming_series:')):
@@ -72,10 +69,10 @@ class DocType:
 
 	def on_update(self):
 		from frappe.model.db_schema import updatedb
-		updatedb(self.doc.name)
+		updatedb(self.name)
 
 		self.change_modified_of_parent()
-		make_module_and_roles(self.doclist)
+		make_module_and_roles(self)
 		
 		from frappe import conf
 		if (not frappe.flags.in_import) and conf.get('developer_mode') or 0:
@@ -83,53 +80,53 @@ class DocType:
 			self.make_controller_template()
 		
 		# update index
-		if not self.doc.custom:
+		if not self.custom:
 			from frappe.model.code import load_doctype_module
-			module = load_doctype_module( self.doc.name, self.doc.module)
+			module = load_doctype_module( self.name, self.module)
 			if hasattr(module, "on_doctype_update"):
 				module.on_doctype_update()
-		frappe.clear_cache(doctype=self.doc.name)
+		frappe.clear_cache(doctype=self.name)
 
 	def check_link_replacement_error(self):
-		for d in self.doclist.get({"doctype":"DocField", "fieldtype":"Select"}):
+		for d in self.get("fields", {"fieldtype":"Select"}):
 			if (frappe.db.get_value("DocField", d.name, "options") or "").startswith("link:") \
 				and not d.options.startswith("link:"):
 				frappe.msgprint("link: type Select fields are getting replaced. Please check for %s" % d.label,
 					raise_exception=True)
 
 	def on_trash(self):
-		frappe.db.sql("delete from `tabCustom Field` where dt = %s", self.doc.name)
-		frappe.db.sql("delete from `tabCustom Script` where dt = %s", self.doc.name)
-		frappe.db.sql("delete from `tabProperty Setter` where doc_type = %s", self.doc.name)
-		frappe.db.sql("delete from `tabReport` where ref_doctype=%s", self.doc.name)
+		frappe.db.sql("delete from `tabCustom Field` where dt = %s", self.name)
+		frappe.db.sql("delete from `tabCustom Script` where dt = %s", self.name)
+		frappe.db.sql("delete from `tabProperty Setter` where doc_type = %s", self.name)
+		frappe.db.sql("delete from `tabReport` where ref_doctype=%s", self.name)
 	
 	def before_rename(self, old, new, merge=False):
 		if merge:
 			frappe.throw(_("DocType can not be merged"))
 			
 	def after_rename(self, old, new, merge=False):
-		if self.doc.issingle:
+		if self.issingle:
 			frappe.db.sql("""update tabSingles set doctype=%s where doctype=%s""", (new, old))
 		else:
 			frappe.db.sql("rename table `tab%s` to `tab%s`" % (old, new))
 	
 	def export_doc(self):
 		from frappe.modules.export_file import export_to_files
-		export_to_files(record_list=[['DocType', self.doc.name]])
+		export_to_files(record_list=[['DocType', self.name]])
 		
 	def import_doc(self):
 		from frappe.modules.import_module import import_from_files
-		import_from_files(record_list=[[self.doc.module, 'doctype', self.doc.name]])		
+		import_from_files(record_list=[[self.module, 'doctype', self.name]])		
 
 	def make_controller_template(self):
 		from frappe.modules import get_doc_path, get_module_path, scrub
 		
-		pypath = os.path.join(get_doc_path(self.doc.module, 
-			self.doc.doctype, self.doc.name), scrub(self.doc.name) + '.py')
+		pypath = os.path.join(get_doc_path(self.module, 
+			self.doctype, self.name), scrub(self.name) + '.py')
 
 		if not os.path.exists(pypath):
 			# get app publisher for copyright
-			app = frappe.local.module_app[frappe.scrub(self.doc.module)]
+			app = frappe.local.module_app[frappe.scrub(self.module)]
 			if not app:
 				frappe.throw("App not found!")
 			app_publisher = frappe.get_hooks(hook="app_publisher", app_name=app)[0]
@@ -143,23 +140,22 @@ class DocType:
 		"""
 			if is_submittable is set, add amended_from docfields
 		"""
-		if self.doc.is_submittable:
+		if self.is_submittable:
 			if not frappe.db.sql("""select name from tabDocField 
-				where fieldname = 'amended_from' and parent = %s""", self.doc.name):
-					new = self.doc.addchild('fields', 'DocField', self.doclist)
-					new.label = 'Amended From'
-					new.fieldtype = 'Link'
-					new.fieldname = 'amended_from'
-					new.options = self.doc.name
-					new.permlevel = 0
-					new.read_only = 1
-					new.print_hide = 1
-					new.no_copy = 1
-					new.idx = self.get_max_idx() + 1
+				where fieldname = 'amended_from' and parent = %s""", self.name):
+					self.append("fields", {
+						"label": "Amended From",
+						"fieldtype": "Link",
+						"fieldname": "amended_from",
+						"options": self.name,
+						"read_only": 1,
+						"print_hide": 1,
+						"no_copy": 1
+					})
 				
 	def get_max_idx(self):
 		max_idx = frappe.db.sql("""select max(idx) from `tabDocField` where parent = %s""", 
-			self.doc.name)
+			self.name)
 		return max_idx and max_idx[0][0] or 0
 
 def validate_fields_for_doctype(doctype):
@@ -329,14 +325,14 @@ def validate_permissions(permissions, for_remove=False):
 		check_level_zero_is_set(d)
 		remove_rights_for_single(d)
 
-def make_module_and_roles(doclist, perm_doctype="DocPerm"):
+def make_module_and_roles(doc, perm_fieldname="permissions"):
 	try:
-		if not frappe.db.exists("Module Def", doclist[0].module):
-			m = frappe.bean({"doctype": "Module Def", "module_name": doclist[0].module})
+		if not frappe.db.exists("Module Def", doc.module):
+			m = frappe.bean({"doctype": "Module Def", "module_name": doc.module})
 			m.insert()
 		
 		default_roles = ["Administrator", "Guest", "All"]
-		roles = [p.role for p in doclist.get({"doctype": perm_doctype})] + default_roles
+		roles = [p.role for p in doc.get(permissions)] + default_roles
 		
 		for role in list(set(roles)):
 			if not frappe.db.exists("Role", role):
diff --git a/frappe/core/doctype/page/page.py b/frappe/core/doctype/page/page.py
index 3bb1cc587e..1a71c9ad00 100644
--- a/frappe/core/doctype/page/page.py
+++ b/frappe/core/doctype/page/page.py
@@ -3,11 +3,9 @@
 
 from __future__ import unicode_literals
 import frappe
+from frappe.model.document import Document
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d,dl
-
+class Page(Document):
 	def autoname(self):
 		"""
 			Creates a url friendly name for this page.
@@ -15,17 +13,17 @@ class DocType:
 			it will add name-1, name-2 etc.
 		"""
 		from frappe.utils import cint
-		if (self.doc.name and self.doc.name.startswith('New Page')) or not self.doc.name:
-			self.doc.name = self.doc.page_name.lower().replace('"','').replace("'",'').\
+		if (self.name and self.name.startswith('New Page')) or not self.name:
+			self.name = self.page_name.lower().replace('"','').replace("'",'').\
 				replace(' ', '-')[:20]
-			if frappe.db.exists('Page',self.doc.name):
+			if frappe.db.exists('Page',self.name):
 				cnt = frappe.db.sql("""select name from tabPage 
-					where name like "%s-%%" order by name desc limit 1""" % self.doc.name)
+					where name like "%s-%%" order by name desc limit 1""" % self.name)
 				if cnt:
 					cnt = cint(cnt[0][0].split('-')[-1]) + 1
 				else:
 					cnt = 1
-				self.doc.name += '-' + str(cnt)
+				self.name += '-' + str(cnt)
 
 	# export
 	def on_update(self):
@@ -35,16 +33,16 @@ class DocType:
 		"""
 		from frappe import conf
 		from frappe.core.doctype.doctype.doctype import make_module_and_roles
-		make_module_and_roles(self.doclist, "Page Role")
+		make_module_and_roles(self, "roles")
 		
-		if not frappe.flags.in_import and getattr(conf,'developer_mode', 0) and self.doc.standard=='Yes':
+		if not frappe.flags.in_import and getattr(conf,'developer_mode', 0) and self.standard=='Yes':
 			from frappe.modules.export_file import export_to_files
 			from frappe.modules import get_module_path, scrub
 			import os
-			export_to_files(record_list=[['Page', self.doc.name]])
+			export_to_files(record_list=[['Page', self.name]])
 	
 			# write files
-			path = os.path.join(get_module_path(self.doc.module), 'page', scrub(self.doc.name), scrub(self.doc.name))
+			path = os.path.join(get_module_path(self.module), 'page', scrub(self.name), scrub(self.name))
 								
 			# js
 			if not os.path.exists(path + '.js'):
@@ -55,35 +53,39 @@ class DocType:
 		title: '%s',
 		single_column: true
 	});					
-}""" % (self.doc.name, self.doc.title))
+}""" % (self.name, self.title))
 
-	def get_from_files(self):
-		"""
-			Loads page info from files in module
-		"""
+	def as_dict(self):
+		d = super(Page, self).as_dict()
+		for key in ("script", "style", "content"):
+			d[key] = self.get(key)
+		return d
+
+	def load_assets(self):
 		from frappe.modules import get_module_path, scrub
 		import os
-		
-		path = os.path.join(get_module_path(self.doc.module), 'page', scrub(self.doc.name))
+				
+		path = os.path.join(get_module_path(self.module), 'page', scrub(self.name))
 
 		# script
-		fpath = os.path.join(path, scrub(self.doc.name) + '.js')
+		fpath = os.path.join(path, scrub(self.name) + '.js')
 		if os.path.exists(fpath):
 			with open(fpath, 'r') as f:
-				self.doc.script = f.read()
+				self.script = f.read()
 
 		# css
-		fpath = os.path.join(path, scrub(self.doc.name) + '.css')
+		fpath = os.path.join(path, scrub(self.name) + '.css')
 		if os.path.exists(fpath):
 			with open(fpath, 'r') as f:
-				self.doc.style = f.read()
+				self.style = f.read()
 		
 		# html
-		fpath = os.path.join(path, scrub(self.doc.name) + '.html')
+		fpath = os.path.join(path, scrub(self.name) + '.html')
 		if os.path.exists(fpath):
 			with open(fpath, 'r') as f:
-				self.doc.content = f.read()
+				self.content = f.read()
 				
 		if frappe.lang != 'en':
 			from frappe.translate import get_lang_js
-			self.doc.script += get_lang_js("page", self.doc.name)
+			self.script += get_lang_js("page", self.name)
+			
\ No newline at end of file
diff --git a/frappe/core/doctype/user/user.js b/frappe/core/doctype/user/user.js
index d7de077f58..a611a4d122 100644
--- a/frappe/core/doctype/user/user.js
+++ b/frappe/core/doctype/user/user.js
@@ -151,8 +151,7 @@ frappe.RoleEditor = Class.extend({
 			.each(function(i, checkbox) { checkbox.checked = false; });
 		
 		// set user roles as checked
-		$.each(frappe.model.get("UserRole", {parent: cur_frm.doc.name, 
-			parentfield: "user_roles"}), function(i, user_role) {
+		$.each((cur_frm.doc.user_roles || []), function(i, user_role) {
 				var checkbox = $(me.wrapper)
 					.find('[data-user-role="'+user_role.role+'"] input[type="checkbox"]').get(0);
 				if(checkbox) checkbox.checked = true;
@@ -163,8 +162,7 @@ frappe.RoleEditor = Class.extend({
 		var existing_roles_map = {};
 		var existing_roles_list = [];
 		
-		$.each(frappe.model.get("UserRole", {parent: cur_frm.doc.name, 
-			parentfield: "user_roles"}), function(i, user_role) { 
+		$.each((cur_frm.doc.user_roles || []), function(i, user_role) { 
 				existing_roles_map[user_role.role] = user_role.name;
 				existing_roles_list.push(user_role.role);
 			});
diff --git a/frappe/core/doctype/workflow/workflow.js b/frappe/core/doctype/workflow/workflow.js
index d1f25446d5..26b83403e5 100644
--- a/frappe/core/doctype/workflow/workflow.js
+++ b/frappe/core/doctype/workflow/workflow.js
@@ -20,11 +20,9 @@ frappe.core.Workflow = frappe.ui.form.Controller.extend({
 		}
 	},
 	update_field_options: function() {
-		var fields = $.map(frappe.model.get("DocField", {
-				parent: this.frm.doc.document_type,
-				fieldtype: ["not in", frappe.model.no_value_type]
-			}),
-			function(d) { return d.fieldname; });
+		var fields = $.map(frappe.model.get_doc("DocType", this.frm.doc.document_type).fields, function(d) {
+			return frappe.model.no_value_type.indexOf(d.fieldtype)===-1 ? d.fieldname : null;
+		})
 		frappe.meta.get_docfield("Workflow Document State", "update_field", this.frm.doc.name).options
 			= [""].concat(fields);
 	}
diff --git a/frappe/core/page/permission_manager/permission_manager.js b/frappe/core/page/permission_manager/permission_manager.js
index 95ec254578..9c05ea679a 100644
--- a/frappe/core/page/permission_manager/permission_manager.js
+++ b/frappe/core/page/permission_manager/permission_manager.js
@@ -428,17 +428,15 @@ frappe.PermissionEngine = Class.extend({
 		});
 	},
 	get_user_fields: function(doctype) {
-		var user_fields = frappe.model.get("DocField", {parent:doctype, 
-			fieldtype:"Link", options:"User"});
-		
-		user_fields = user_fields.concat(frappe.model.get("DocField", {parent:doctype, 
-				fieldtype:"Select", link_doctype:"User"}))
-		
+		var user_fields = frappe.model.get_children("DocType", doctype, "fields", {fieldtype:"Link", options:"User"})
+		user_fields = user_fields.concat(frappe.model.get_children("DocType", doctype, "fields", 
+			{fieldtype:"Select", link_doctype:"User"}))
+				
 		return 	user_fields	
 	},
 	get_link_fields: function(doctype) {
-		return link_fields = frappe.model.get("DocField", {parent:doctype, 
-			fieldtype:"Link", options:["not in", ["User", '[Select]']]});
+		return frappe.model.get_children("DocType", doctype, "fields",
+			{fieldtype:"Link", options:["not in", ["User", '[Select]']]});
 	}
 })
 
diff --git a/frappe/handler.py b/frappe/handler.py
index 4076e6fecd..3f780567c8 100755
--- a/frappe/handler.py
+++ b/frappe/handler.py
@@ -65,7 +65,7 @@ def handle():
 	
 	if cmd!='login':		
 		execute_cmd(cmd)
-	
+
 	return build_response("json")
 
 def execute_cmd(cmd):
diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index 65c012bcef..4877ec97fb 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -110,6 +110,16 @@ class BaseDocument(object):
 		
 		return self._valid_columns
 		
+	def as_dict(self):
+		doc = self.get_valid_dict()
+		doc["doctype"] = self.doctype
+		for df in self.get_table_fields():
+			doc[df.fieldname] = [d.as_dict() for d in (self.get(df.fieldname) or [])]
+		return doc
+			
+	def get_table_fields(self):
+		return self.meta.get('fields', {"fieldtype":"Table"})
+		
 	def get_table_field_doctype(self, fieldname):
 		return self.meta.get("fields", {"fieldname":fieldname})[0].options
 	
diff --git a/frappe/model/code.py b/frappe/model/code.py
index 9972cbfc62..b00815b623 100644
--- a/frappe/model/code.py
+++ b/frappe/model/code.py
@@ -41,6 +41,7 @@ def get_obj(dt = None, dn = None, doc=None, doclist=None, with_children = 0):
 def get_server_obj(doc, doclist = [], basedoctype = ''):
 	# for test
 	module = get_doctype_module(doc.doctype)
+	classname = doc.doctype.replace(" ", "")
 	return load_doctype_module(doc.doctype, module).DocType(doc, doclist)
 
 def run_server_obj(server_obj, method_name, arg=None):
diff --git a/frappe/model/doctype.py b/frappe/model/doctype.py
index 5b651f6744..5fecaad9d5 100644
--- a/frappe/model/doctype.py
+++ b/frappe/model/doctype.py
@@ -242,6 +242,8 @@ def clear_cache(doctype=None):
 	def clear_single(dt):
 		frappe.cache().delete_value(cache_name(dt, False))
 		frappe.cache().delete_value(cache_name(dt, True))
+		frappe.cache().delete_value("meta:" + dt)
+		frappe.cache().delete_value("form_meta:" + dt)
 
 		if doctype_cache and (dt in doctype_cache):
 			del doctype_cache[dt]
diff --git a/frappe/model/document.py b/frappe/model/document.py
index b3169da79d..3d2cb04b90 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -16,15 +16,20 @@ def get_doc(arg1, arg2=None):
 		doctype = arg1
 	else:
 		doctype = arg1.get("doctype")
-		
+	
+	controller = get_controller(doctype)
+	if controller:
+		return controller(arg1, arg2)
+	
+	return Document(arg1, arg2)
+
+def get_controller(doctype):
 	module = load_doctype_module(doctype)
 	classname = doctype.replace(" ", "")
 	if hasattr(module, classname):
 		_class = getattr(module, classname)
 		if issubclass(_class, Document):
-			return getattr(module, classname)(arg1, arg2)
-	
-	return Document(arg1, arg2)
+			return getattr(module, classname)
 
 class Document(BaseDocument):
 	def __init__(self, arg1, arg2=None):
@@ -59,6 +64,9 @@ class Document(BaseDocument):
 		
 		else:
 			d = frappe.db.get_value(self.doctype, self.name, "*", as_dict=1)
+			if not d:
+				frappe.throw("{}: {}, {}".format(_("Not Found"), 
+					self.doctype, self.name), frappe.DoesNotExistError)
 			self.update(d, valid_columns = d.keys())
 
 			for df in self.get_table_fields():
@@ -70,9 +78,6 @@ class Document(BaseDocument):
 				else:
 					self.set(df.fieldname, [])
 			
-	def get_table_fields(self):
-		return self.meta.get('fields', {"fieldtype":"Table"})
-
 	def has_permission(self, permtype):
 		if getattr(self, "_ignore_permissions", False):
 			return True
@@ -293,23 +298,10 @@ class Document(BaseDocument):
 			
 	def run_method(self, method, *args, **kwargs):
 		"""run standard triggers, plus those in frappe"""
-		def add_to_response(out, new_response):
-			if isinstance(new_response, dict):
-				out.update(new_response)
-
 		if hasattr(self, method):
-			add_to_response(frappe.local.response, 
-				getattr(self, method)(*args, **kwargs))	
-
-		args = [self, method] + list(args or [])
-
-		for handler in frappe.get_hooks("bean_event:" + self.doctype + ":" + method) \
-			+ frappe.get_hooks("bean_event:*:" + method):
-			add_to_response(frappe.local.response, 
-				frappe.call(frappe.get_attr(handler), *args, **kwargs))
-		
-		return frappe.local.response
-
+			fn = lambda self, *args, **kwargs: getattr(self, method)(*args, **kwargs)
+			return Document.hook(fn)(self, *args, **kwargs)
+	
 	def run_before_save_methods(self):
 		if self._action=="save":
 			self.run_method("validate")
@@ -332,3 +324,31 @@ class Document(BaseDocument):
 			self.run_method("on_cancel")
 		elif self._action=="update_after_submit":
 			self.run_method("on_update_after_submit")
+			
+	@staticmethod
+	def hook(f):
+		def add_to_response(new_response):
+			if isinstance(new_response, dict):
+				frappe.local.response.update(new_response)
+
+		def compose(fn, *hooks):
+			def runner(self, method, *args, **kwargs):
+				add_to_response(fn(self, *args, **kwargs))
+				for f in hooks:
+					add_to_response(f(self, method, *args, **kwargs))
+				return frappe.local.response
+			
+			return runner
+		
+		def composer(self, *args, **kwargs):
+			hooks = []
+			method = f.__name__
+			for handler in frappe.get_hooks("bean_event:" + self.doctype + ":" + method) \
+				+ frappe.get_hooks("bean_event:*:" + method):
+				hooks.append(frappe.getattr(handler))
+
+			composed = compose(f, *hooks)
+			return composed(self, method, *args, **kwargs)
+
+		return composer
+
diff --git a/frappe/model/meta.py b/frappe/model/meta.py
index cf694e750d..730b90d5e1 100644
--- a/frappe/model/meta.py
+++ b/frappe/model/meta.py
@@ -12,6 +12,8 @@ from frappe.model.document import Document
 ######
 
 def get_meta(doctype, cached=True):
+	# TODO: cache to be cleared
+
 	if cached:
 		if doctype not in frappe.local.meta:
 			frappe.local.meta[doctype] = frappe.cache().get_value("meta:" + doctype, lambda: Meta(doctype))
diff --git a/frappe/public/build.json b/frappe/public/build.json
index 29134210f3..859d9b8998 100644
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -83,7 +83,6 @@
 		
 		"public/js/frappe/model/model.js",
 		"public/js/frappe/model/meta.js",
-		"public/js/frappe/model/doclist.js",
 		"public/js/frappe/model/sync.js",
 		"public/js/frappe/model/create_new.js",
 		"public/js/frappe/model/perm.js",
@@ -135,6 +134,7 @@
 		"public/js/frappe/form/toolbar.js",
 		"public/js/frappe/form/infobar.js",
 		"public/js/frappe/form/dashboard.js",
+		"public/js/frappe/form/save.js",
 		"public/js/frappe/form/script_manager.js",
 		"public/js/frappe/form/control.js",
 		"public/js/frappe/form/link_selector.js",
diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js
index 93ad0133ff..a652c2cc6d 100644
--- a/frappe/public/js/frappe/form/control.js
+++ b/frappe/public/js/frappe/form/control.js
@@ -980,8 +980,9 @@ frappe.ui.form.ControlTable = frappe.ui.form.Control.extend({
 		this._super();
 		
 		// add title if prev field is not column / section heading or html
-		var prev_fieldtype = frappe.model.get("DocField", 
-			{parent: this.frm.doctype, idx: this.df.idx-1})[0].fieldtype;
+		var prev_fieldtype = frappe.model.get_children("DocType", this.frm.doctype, "fields", 
+			{idx: this.df.idx-1});
+		prev_fieldtype = prev_fieldtype ? prev_fieldtype[0].fieldtype : "";
 					
 		if(["Column Break", "Section Break", "HTML"].indexOf(prev_fieldtype)===-1) {
 			$("<label>" + this.df.label + "<label>").appendTo(this.wrapper);	
diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index 0482bddf5a..04d0da3853 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -98,7 +98,7 @@ frappe.form.formatters = {
 		return "<pre>" + (value==null ? "" : $("<div>").text(value).html()) + "</pre>"
 	},
 	WorkflowState: function(value) {
-		workflow_state = frappe.model.get("Workflow State", value)[0];
+		workflow_state = frappe.model.get_doc("Workflow State", value);
 		if(workflow_state) {
 			return repl("<span class='label label-%(style)s' \
 				data-workflow-state='%(value)s'\
diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js
index 1d6df2e3b8..06d43d07c7 100644
--- a/frappe/public/js/frappe/form/grid.js
+++ b/frappe/public/js/frappe/form/grid.js
@@ -118,11 +118,7 @@ frappe.ui.form.Grid = Class.extend({
 		});
 	},
 	get_data: function() {
-		var data = frappe.model.get(this.df.options, {
-			"parenttype": this.frm.doctype, 
-			"parentfield": this.df.fieldname,
-			"parent": this.frm.docname
-		});
+		var data = this.frm.doc[this.df.fieldname] || [];
 		data.sort(function(a, b) { return a.idx - b.idx});
 		return data;
 	},
diff --git a/frappe/public/js/frappe/form/linked_with.js b/frappe/public/js/frappe/form/linked_with.js
index 59f9427829..691b965cd0 100644
--- a/frappe/public/js/frappe/form/linked_with.js
+++ b/frappe/public/js/frappe/form/linked_with.js
@@ -1,9 +1,7 @@
 // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 // MIT License. See license.txt
 
-// for license information please see license.txt
-
-frappe.provide("frappe.ui.form")
+frappe.provide("frappe.ui.form");
 
 frappe.ui.form.LinkedWith = Class.extend({
 	init: function(opts) {
diff --git a/frappe/public/js/frappe/model/doclist.js b/frappe/public/js/frappe/form/save.js
similarity index 63%
rename from frappe/public/js/frappe/model/doclist.js
rename to frappe/public/js/frappe/form/save.js
index 278930b1be..b7d5fa7eba 100644
--- a/frappe/public/js/frappe/model/doclist.js
+++ b/frappe/public/js/frappe/form/save.js
@@ -1,45 +1,38 @@
 // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-// MIT License. See license.txt 
+// MIT License. See license.txt
 
-frappe.provide("frappe.model");
-frappe.model.DocList = Class.extend({
-	init: function(doctype, name) {
-		this.doctype = doctype; this.name = name;
-		this.doclist = frappe.model.get_doclist(this.doctype, this.name);
-		this.doc = this.doclist[0];
-	},
-	
-	save: function(action, callback, btn) {
-		this.check_name();
-		if(this.check_mandatory()) {
-			var me = this;
-			this._call({
+frappe.provide("frappe.ui.form");
+
+frappe.ui.form.save = function(frm, action, callback, btn) {
+	var save = function() {
+		check_name();
+		if(check_mandatory()) {
+			_call({
 				method: "frappe.widgets.form.save.savedocs",
-				args: { docs: frappe.model.compress(this.doclist), action:action},
+				args: { docs: frm.doc, action:action},
 				callback: function(r) {
-					$(document).trigger("save", me.doc);
+					$(document).trigger("save", frm.doc);
 					callback(r);
 				},
 				btn: btn
 			});
 		}
-	},
+	};
 	
-	cancel: function(callback, btn) {
-		var me = this;
-		this._call({
+	var cancel = function() {
+		_call({
 			method: "frappe.widgets.form.save.cancel",
-			args: { doctype: this.doctype, name: this.name },
+			args: { doctype: frm.doc.doctype, name: frm.doc.name },
 			callback: function(r) {
-				$(document).trigger("save", frappe.model.get_doc(me.doctype, me.name));
+				$(document).trigger("save", frm.doc);
 				callback(r);
 			},
 			btn: btn
 		});
-	},
+	};
 	
-	check_name: function() {
-		var doc = this.doclist[0];
+	var check_name = function() {
+		var doc = frm.doc;
 		var meta = locals.DocType[doc.doctype];
 		if(doc.__islocal && (meta && meta.autoname 
 				&& meta.autoname.toLowerCase()=='prompt')) {
@@ -51,23 +44,22 @@ frappe.model.DocList = Class.extend({
 				throw "name required";
 			}
 		}
-	},
+	};
 	
-	check_mandatory: function() {
-		var me = this;
+	var check_mandatory = function() {
 		var has_errors = false;
-		this.scroll_set = false;
+		frm.scroll_set = false;
 		
-		if(this.doc.docstatus==2) return true; // don't check for cancel
+		if(frm.doc.docstatus==2) return true; // don't check for cancel
 		
-		$.each(this.doclist, function(i, doc) {
+		$.each(frm.model.get_all_docs(frm.doc), function(i, doc) {
 			
 			var error_fields = [];
 			
 			$.each(frappe.meta.docfield_list[doc.doctype] || [], function(i, docfield) {
 				if(docfield.fieldname) {
 					var df = frappe.meta.get_docfield(doc.doctype, 
-						docfield.fieldname, me.doclist[0].name);
+						docfield.fieldname, frm.doc.name);
 
 					if(df.reqd && !frappe.model.has_value(doc.doctype, doc.name, df.fieldname)) {
 						has_errors = true;
@@ -87,17 +79,17 @@ frappe.model.DocList = Class.extend({
 		});
 		
 		return !has_errors;
-	},
+	};
 	
-	scroll_to: function(fieldname) {
+	var scroll_to = function(fieldname) {
 		var f = cur_frm.fields_dict[fieldname];
 		if(f) {
 			$(document).scrollTop($(f.wrapper).offset().top - 100);
 		}
-		this.scroll_set = true;
-	},
+		frm.scroll_set = true;
+	};
 
-	_call: function(opts) {
+	var _call = function(opts) {
 		// opts = {
 		// 	method: "some server method",
 		// 	args: {args to be passed},
@@ -114,5 +106,11 @@ frappe.model.DocList = Class.extend({
 				opts.callback && opts.callback(r);
 			}
 		})
-	},
-});
\ No newline at end of file
+	};
+	
+	if(action==="cancel") {
+		cancel();
+	} else {
+		save();
+	}
+}
\ No newline at end of file
diff --git a/frappe/public/js/frappe/form/script_manager.js b/frappe/public/js/frappe/form/script_manager.js
index 13a0118701..69b9a75a82 100644
--- a/frappe/public/js/frappe/form/script_manager.js
+++ b/frappe/public/js/frappe/form/script_manager.js
@@ -109,7 +109,7 @@ frappe.ui.form.ScriptManager = Class.extend({
 		}
 	},
 	copy_from_first_row: function(parentfield, current_row, fieldnames) {
-		var doclist = frappe.model.get_doclist(this.frm.doc.doctype, this.frm.doc.name, {parentfield: parentfield});
+		var doclist = this.frm.doc[parentfield];
 		if(doclist.length===1 || doclist[0]===current_row) return;
 		
 		$.each(fieldnames, function(i, fieldname) {
diff --git a/frappe/public/js/frappe/form/workflow.js b/frappe/public/js/frappe/form/workflow.js
index c97ddd3eaf..bf391efb34 100644
--- a/frappe/public/js/frappe/form/workflow.js
+++ b/frappe/public/js/frappe/form/workflow.js
@@ -79,7 +79,7 @@ frappe.ui.form.States = Class.extend({
 			// show current state on the button
 			this.workflow_button.find(".state-text").text(state);
 			
-			var state_doc = frappe.model.get("Workflow State", {name:state})[0];
+			var state_doc = frappe.model.get_doc("Workflow State", state);
 
 			if (state_doc) {
 				// set the icon
@@ -109,7 +109,7 @@ frappe.ui.form.States = Class.extend({
 
 		$.each(frappe.workflow.get_transitions(this.frm.doctype, state), function(i, d) {
 			if(in_list(user_roles, d.allowed)) {
-				d.icon = frappe.model.get("Workflow State", {name:d.next_state})[0].icon;
+				d.icon = frappe.model.get("Workflow State", d.next_state).icon;
 				
 				$(repl('<li><a href="#" data-action="%(action)s">\
 					<i class="icon icon-%(icon)s"></i> %(action)s</a></li>', d))
diff --git a/frappe/public/js/frappe/model/create_new.js b/frappe/public/js/frappe/model/create_new.js
index 48bd5c3e5f..d4f37d3853 100644
--- a/frappe/public/js/frappe/model/create_new.js
+++ b/frappe/public/js/frappe/model/create_new.js
@@ -122,20 +122,36 @@ $.extend(frappe.model, {
 		return d;
 	},
 	
-	copy_doc: function(dt, dn, from_amend) {
+	copy_doc: function(doc, from_amend) {
 		var no_copy_list = ['name','amended_from','amendment_date','cancel_reason'];
-		var newdoc = frappe.model.get_new_doc(dt);
+		var newdoc = frappe.model.get_new_doc(doc.doctype);
 
-		for(var key in locals[dt][dn]) {
+		for(var key in doc) {
 			// dont copy name and blank fields
-			var df = frappe.meta.get_docfield(dt, key);
+			var df = frappe.meta.get_docfield(doc.doctype, key);
 			
 			if(key.substr(0,2)!='__' 
 				&& !in_list(no_copy_list, key) 
 				&& !(df && (!from_amend && cint(df.no_copy)==1))) { 
-				newdoc[key] = locals[dt][dn][key];
+					value = doc[key];
+					if(df.fieldtype==="Table") {
+						newdoc[key] = [];
+						$.each(value || [], function(i, d) {
+							newdoc[key].push(frappe.model.copy_doc(d, from_amend))
+						})
+					} else {
+						newdoc[key] = doc[key];
+					}
 			}
 		}
+
+		newdoc.__islocal = 1;
+		newdoc.docstatus = 0;
+		newdoc.owner = user;
+		newdoc.creation = '';
+		newdoc.modified_by = user;
+		newdoc.modified = '';
+
 		return newdoc;
 	},
 	
@@ -167,7 +183,7 @@ $.extend(frappe.model, {
 				method: opts.method,
 				args: {
 					"source_name": opts.source_name,
-					"target_doclist": frappe.model.get_doclist(cur_frm.doc.doctype, cur_frm.doc.name)
+					"target_doclist": cur_frm.doc
 				},
 				callback: function(r) {
 					if(!r.exc) {
diff --git a/frappe/public/js/frappe/model/meta.js b/frappe/public/js/frappe/model/meta.js
index f740ddfb34..63d2987f9a 100644
--- a/frappe/public/js/frappe/model/meta.js
+++ b/frappe/public/js/frappe/model/meta.js
@@ -8,6 +8,13 @@ frappe.provide('frappe.meta.doctypes');
 frappe.provide("frappe.meta.precision_map");
 
 $.extend(frappe.meta, {
+	sync: function(doc) {
+		$.each(doc.fields, function(i, df) {
+			frappe.meta.add_field(df);
+		})
+		frappe.meta.sync_messages(doc);
+	},
+	
 	// build docfield_map and docfield_list
 	add_field: function(df) {
 		frappe.provide('frappe.meta.docfield_map.' + df.parent);
@@ -84,8 +91,8 @@ $.extend(frappe.meta, {
 	},
 
 	get_parentfield: function(parent_dt, child_dt) {
-		var df = frappe.model.get("DocField", {parent:parent_dt, fieldtype:"Table", 
-			options:child_dt})
+		var df = (frappe.model.get_doc("DocType", parent_dt).fields || []).filter(function(d) 
+			{ return d.fieldtype==="Table" && options===child_dt })
 		if(!df.length) 
 			throw "parentfield not found for " + parent_dt + ", " + child_dt;
 		return df[0].fieldname;
diff --git a/frappe/public/js/frappe/model/model.js b/frappe/public/js/frappe/model/model.js
index e02d2f5157..4e6b000831 100644
--- a/frappe/public/js/frappe/model/model.js
+++ b/frappe/public/js/frappe/model/model.js
@@ -46,8 +46,8 @@ $.extend(frappe.model, {
 		} else {
 			var cached_timestamp = null;
 			if(localStorage["_doctype:" + doctype]) {
-				var cached_doclist = JSON.parse(localStorage["_doctype:" + doctype]);
-				cached_timestamp = cached_doclist[0].modified;
+				var cached_doc = JSON.parse(localStorage["_doctype:" + doctype]);
+				cached_timestamp = cached_doc.modified;
 			}
 			return frappe.call({
 				method:'frappe.widgets.form.load.getdoctype',
@@ -64,7 +64,7 @@ $.extend(frappe.model, {
 						return;
 					}
 					if(r.message=="use_cache") {
-						frappe.model.sync(cached_doclist);
+						frappe.model.sync(cached_doc);
 					} else {
 						localStorage["_doctype:" + doctype] = JSON.stringify(r.docs);
 					}
@@ -206,10 +206,10 @@ $.extend(frappe.model, {
 	},
 
 	get: function(doctype, filters) {
-		var src = locals[doctype] || locals[":" + doctype] || [];
-		if($.isEmptyObject(src)) 
+		var docsdict = locals[doctype] || locals[":" + doctype] || [];
+		if($.isEmptyObject(docsdict)) 
 			return [];
-		return frappe.utils.filter_dict(src, filters);
+		return frappe.utils.filter_dict(docsdict, filters);
 	},
 	
 	get_value: function(doctype, filters, fieldname) {
@@ -277,55 +277,16 @@ $.extend(frappe.model, {
 		return locals[doctype] ? locals[doctype][name] : null;
 	},
 	
-	get_doclist: function(doctype, name, filters) {
-		var doclist = [];
-		if(!locals[doctype]) 
-			return doclist;
-
-		doclist[0] = locals[doctype][name];
-
-		$.each(frappe.model.get("DocField", {parent:doctype, fieldtype:"Table"}), 
-			function(i, table_field) {
-				var child_doclist = frappe.model.get(table_field.options, {
-					parent:name, parenttype: doctype,
-					parentfield: table_field.fieldname});
-				
-				if($.isArray(child_doclist)) {
-					child_doclist.sort(function(a, b) { return a.idx - b.idx; });
-					doclist = doclist.concat(child_doclist);
-				}
-			}
-		);
-		
-		if(filters) {
-			doclist = frappe.utils.filter_dict(doclist, filters);
-		}
-		
-		return doclist;
-	},
-
-	get_children: function(doctype, parent, parentfield, parenttype) { 
-		if(parenttype) {
-			var l = frappe.model.get(doctype, {parent:parent, 
-				parentfield:parentfield, parenttype:parenttype});
+	get_children: function(doctype, parent, parentfield, filters) { 
+		if($.isPlainObject(parentfield)) {
+			var doc = doctype;
+			var filters = parentfield;
+			var parentfield = parent;
+			return frappe.utils.filter_dict((doc[parentfield] || []), filters);
 		} else {
-			var l = frappe.model.get(doctype, {parent:parent, 
-				parentfield:parentfield});
+			return frappe.utils.filter_dict((frappe.model.get_doc(doctype, parent)[parentfield] || []), filters);
 		}
-
-		if(l.length) {
-			l.sort(function(a,b) { return flt(a.idx) - flt(b.idx) }); 
-			
-			// renumber
-			$.each(l, function(i, v) { v.idx = i+1; }); // for chrome bugs ???
-		}
-		return l; 
-	},
-
-	clear_doclist: function(doctype, name) {
-		$.each(frappe.model.get_doclist(doctype, name), function(i, d) {
-			if(d) frappe.model.clear_doc(d.doctype, d.name);
-		});
+		
 	},
 	
 	clear_table: function(doctype, parenttype, parent, parentfield) {
@@ -337,7 +298,7 @@ $.extend(frappe.model, {
 	},
 
 	remove_from_locals: function(doctype, name) {
-		this.clear_doclist(doctype, name);
+		this.clear_doc(doctype, name);
 		if(frappe.views.formview[doctype]) {
 			delete frappe.views.formview[doctype].frm.opendocs[name];
 		}
@@ -358,13 +319,14 @@ $.extend(frappe.model, {
 	
 	get_no_copy_list: function(doctype) {
 		var no_copy_list = ['name','amended_from','amendment_date','cancel_reason'];
-		$.each(frappe.model.get("DocField", {parent:doctype}), function(i, df) {
+		
+		$.each(frappe.model.get_doc("DocType", doctype).fields || [], function(i, df) {
 			if(cint(df.no_copy)) no_copy_list.push(df.fieldname);
 		})
 		return no_copy_list;
 	},
 
-	// args: source (doclist), target (doctype), table_map, field_map, callback
+	// args: source (doc), target (doc), table_map, field_map, callback
 	map: function(args) {
 		frappe.model.with_doctype(args.target, function() {
 			var map_info = frappe.model.map_info[args.target]
@@ -436,7 +398,7 @@ $.extend(frappe.model, {
 				},
 				callback: function(r, rt) {
 					if(!r.exc) {
-						frappe.model.clear_doclist(doctype, docname);
+						frappe.model.clear_doc(doctype, docname);
 						if(frappe.ui.toolbar.recent) 
 							frappe.ui.toolbar.recent.remove(doctype, docname);
 						if(callback) callback(r,rt);
@@ -499,9 +461,20 @@ $.extend(frappe.model, {
 			frappe.throw(frappe._("Please specify") + ": " + 
 				frappe._(frappe.meta.get_label(doc.doctype, fieldname, doc.parent || doc.name)));
 		}
+	},
+	
+	get_all_docs: function(doc) {
+		var all = [doc];
+		for(key in doc) {
+			if($.isArray(doc[key])) {
+				$.each(doc[key], function(i, d) {
+					all.push(d);
+				});
+			}
+		}
+		return all;
 	}
 });
 
 // legacy
 getchildren = frappe.model.get_children
-make_doclist = frappe.model.get_doclist
diff --git a/frappe/public/js/frappe/model/perm.js b/frappe/public/js/frappe/model/perm.js
index ea28d22459..dcb9e5f5bd 100644
--- a/frappe/public/js/frappe/model/perm.js
+++ b/frappe/public/js/frappe/model/perm.js
@@ -38,17 +38,9 @@ $.extend(frappe.perm, {
 		var perm = [{read: 0}];
 		
 		var meta = frappe.model.get_doc("DocType", doctype);
+		
 		if(!meta) {
 			return perm;
-		} else if(meta.istable) {
-			// if a child table, use permissions of parent form
-			var parent_df = frappe.model.get("DocField", {fieldtype: "Table", options: doctype});
-			if(parent_df.length) {
-				if(docname) {
-					docname = frappe.model.get_doc(doctype, docname).parent;
-				}
-				doctype = parent_df[0].parent;
-			}
 		}
 		
 		if(user==="Administrator" || user_roles.indexOf("Administrator")!==-1) {
@@ -60,7 +52,7 @@ $.extend(frappe.perm, {
 			return perm;
 		}
 		
-		var docperms = frappe.model.get("DocPerm", {parent: doctype});
+		var docperms = frappe.model.get_doc("DocType", doctype).permissions || [];
 		$.each(docperms, function(i, p) {
 			// if user has this role
 			if(user_roles.indexOf(p.role)!==-1) {
diff --git a/frappe/public/js/frappe/model/sync.js b/frappe/public/js/frappe/model/sync.js
index cb1efaa22f..1bc78e9bdc 100644
--- a/frappe/public/js/frappe/model/sync.js
+++ b/frappe/public/js/frappe/model/sync.js
@@ -5,35 +5,21 @@ $.extend(frappe.model, {
 	docinfo: {},
 	sync: function(r) {
 		/* docs:
-			extract doclist, docinfo (attachments, comments, assignments)
+			extract docs, docinfo (attachments, comments, assignments)
 			from incoming request and set in `locals` and `frappe.model.docinfo`
 		*/
 
 		if(!r.docs && !r.docinfo) r = {docs:r};
 
 		if(r.docs) {
-			var doclist = r.docs;
-			if(doclist._kl)
-				doclist = frappe.model.expand(doclist);
-
-			if(doclist && doclist.length)
-				frappe.model.clear_doclist(doclist[0].doctype, doclist[0].name)
-
 			var last_parent_name = null;
 			var dirty = [];
-			$.each(doclist, function(i, d) {
+
+			$.each(r.docs, function(i, d) {
 				if(!d.name && d.__islocal) { // get name (local if required)
+					frappe.model.clear_doc(d)
 					d.name = frappe.model.get_new_name(d.doctype);
 					frappe.provide("frappe.model.docinfo." + d.doctype + "." + d.name);	
-					if(!d.parenttype)
-						last_parent_name = d.name;
-					
-					if(dirty.indexOf(d.parenttype || d.doctype)===-1) dirty.push(d.parenttype || d.doctype);
-				}
-
-				// set parent for subsequent orphans
-				if(d.parenttype && !d.parent && d.__islocal) {
-					d.parent = last_parent_name;
 				}
 
 				if(!locals[d.doctype])
@@ -41,14 +27,15 @@ $.extend(frappe.model, {
 
 				locals[d.doctype][d.name] = d;
 				d.__last_sync_on = new Date();
+				
+				if(d.doctype==="DocType") {
+					frappe.meta.sync(d);
+				}
 
 				if(cur_frm && cur_frm.doctype==d.doctype && cur_frm.docname==d.name) {
 					cur_frm.doc = d;
 				}
 
-				if(d.doctype=='DocField') frappe.meta.add_field(d);
-				if(d.doctype=='DocType') frappe.meta.sync_messages(d);
-
 				if(d.localname) {
 					frappe.model.new_names[d.localname] = d.name;
 					$(document).trigger('rename', [d.doctype, d.localname, d.name]);
@@ -66,10 +53,10 @@ $.extend(frappe.model, {
 
 		}
 		
-		// set docinfo
+		// set docinfo (comments, assign, attachments)
 		if(r.docinfo) {
-			if(doclist) {
-				var doc = doclist[0];
+			if(r.docs) {
+				var doc = r.docs[0];
 			} else {
 				var doc = cur_frm.doc;
 			}
@@ -78,68 +65,7 @@ $.extend(frappe.model, {
 			frappe.model.docinfo[doc.doctype][doc.name] = r.docinfo;
 		}
 		
-		return doclist;
+		return r.docs;
 	},
 	
-	expand: function(data) {
-		function zip(k,v) {
-			var obj = {};
-			for(var i=0;i<k.length;i++) {
-				obj[k[i]] = v[i];
-			}
-			return obj;
-		}
-
-		var l = [];
-		for(var i=0;i<data._vl.length;i++) {
-			l.push(zip(data._kl[data._vl[i][0]], data._vl[i]));
-		}
-		return l;
-	},
-	
-	compress: function(doclist) {
-		var all_keys = {}; var values = [];
-		
-		function get_key_list(doctype) {
-			// valid standard keys
-			var key_list = ['doctype', 'name', 'docstatus', 'owner', 'parent', 
-				'parentfield', 'parenttype', 'idx', 'creation', 'modified', 
-				'modified_by', '__islocal', '__newname', '__modified', 
-				'_user_tags', '__temp', '_comments'];
-
-			for(key in frappe.meta.docfield_map[doctype]) { // all other values
-				if(!in_list(key_list, key) 
-					&& !in_list(frappe.model.no_value_type, frappe.meta.docfield_map[doctype][key].fieldtype)
-					&& !frappe.meta.docfield_map[doctype][key].no_column) {
-						key_list[key_list.length] = key
-					}
-			}
-			return key_list;
-		}
-		
-		for(var i=0; i<doclist.length;i++) {
-			var doc = doclist[i];
-			
-			// make keys
-			if(!all_keys[doc.doctype]) { 
-				all_keys[doc.doctype] = get_key_list(doc.doctype);
-				// doctype must be first
-			}
-			
-			var row = []
-			var key_list = all_keys[doc.doctype];
-			
-			// make data rows
-			for(var j=0;j<key_list.length;j++) {
-				row.push(doc[key_list[j]]);
-			}
-			
-			values.push(row);
-		}
-
-		return JSON.stringify({'_vl':values, '_kl':all_keys});
-	}	
 });
-
-// legacy
-compress_doclist = frappe.model.compress;
\ No newline at end of file
diff --git a/frappe/public/js/frappe/model/workflow.js b/frappe/public/js/frappe/model/workflow.js
index 2287d646ff..c0b83deae9 100644
--- a/frappe/public/js/frappe/model/workflow.js
+++ b/frappe/public/js/frappe/model/workflow.js
@@ -23,31 +23,19 @@ frappe.workflow = {
 	},
 	get_default_state: function(doctype) {
 		frappe.workflow.setup(doctype);
-		return frappe.model.get("Workflow Document State", {
-			parent: frappe.workflow.workflows[doctype].name,
-			idx: 1
-		})[0].state;
+		return frappe.workflow.workflows[doctype].workflow_document_states[0].state;
 	},
 	get_transitions: function(doctype, state) {
 		frappe.workflow.setup(doctype);
-		return frappe.model.get("Workflow Transition", {
-			parent: frappe.workflow.workflows[doctype].name,
-			state: state
-		});
+		return frappe.model.get_children(frappe.workflow.workflows[doctype], "workflow_transitions", {state:state});
 	},
 	get_document_state: function(doctype, state) {
 		frappe.workflow.setup(doctype);
-		return frappe.model.get("Workflow Document State", {
-			parent: frappe.workflow.workflows[doctype].name,
-			state: state
-		})[0];
+		return frappe.model.get_children(frappe.workflow.workflows[doctype], "workflow_document_states", {state:state})[0];
 	},
 	get_next_state: function(doctype, state, action) {
-		return frappe.model.get("Workflow Transition", {
-			parent: frappe.workflow.workflows[doctype].name,
-			state: state,
-			action: action
-		})[0].next_state;
+		return frappe.model.get_children(frappe.workflow.workflows[doctype], "workflow_transitions", {
+			state:state, action:action})[0].next_state;
 	},
  	is_read_only: function(doctype, name) {
 		var state_fieldname = frappe.workflow.get_state_fieldname(doctype);
@@ -60,13 +48,7 @@ frappe.workflow = {
 			var state = locals[doctype][name][state_fieldname] || 
 				frappe.workflow.get_default_state(doctype);
 
-			var workflow_doc_state = frappe.model.get("Workflow Document State", 
-				{
-					parent: frappe.workflow.workflows[doctype].name, 
-					state: state
-				});
-			var allow_edit = workflow_doc_state.length ? 
-				workflow_doc_state[0].allow_edit : null;
+			var allow_edit = state ? frappe.workflow.get_document_state(doctype, state).allow_edit : null;
 
 			if(user_roles.indexOf(allow_edit)==-1) {
 				return true;
@@ -75,8 +57,8 @@ frappe.workflow = {
 		return false;
 	},
 	get_update_fields: function(doctype) {
-		var update_fields = $.unique($.map(frappe.model.get("Workflow Document State", 
-			{parent:frappe.workflow.workflows[doctype].name}), function(d) {
+		var update_fields = $.unique($.map(frappe.workflow.workflows[doctype].workflow_document_states || [], 
+			function(d) {
 				return d.update_field;
 			}));
 		return update_fields;
diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js
index 8524f685c9..259d10f67a 100644
--- a/frappe/public/js/frappe/request.js
+++ b/frappe/public/js/frappe/request.js
@@ -16,8 +16,7 @@ frappe.call = function(opts) {
 	} else if(opts.doc) {
 		$.extend(args, {
 			cmd: "runserverobj",
-			docs: frappe.model.compress(frappe.model.get_doclist(opts.doc.doctype,
-				opts.doc.name)),
+			docs: frappe.model.get_doc(opts.doc.doctype, opts.doc.name),
 			method: opts.method,
 			args: opts.args,
 		});	
diff --git a/frappe/public/js/frappe/views/reportview.js b/frappe/public/js/frappe/views/reportview.js
index 5108568ee1..d692fb36b9 100644
--- a/frappe/public/js/frappe/views/reportview.js
+++ b/frappe/public/js/frappe/views/reportview.js
@@ -337,13 +337,13 @@ frappe.views.ReportView = frappe.ui.Listing.extend({
 				callback: function(r) {
 					if(!r.exc) {
 						d.hide();
-						var doclist = r.message;
+						var doc = r.message;
 						$.each(me.dataView.getItems(), function(i, item) {
-							if (item.name === doclist[0].name) {
-								var new_item = $.extend({}, item, doclist[0]);
-								$.each(doclist, function(i, doc) {
-									if(item[doc.doctype + ":name"]===doc.name) {
-										$.each(doc, function(k, v) {
+							if (item.name === doc.name) {
+								var new_item = $.extend({}, item);
+								$.each(frappe.model.get_all_docs(doc), function(i, d) {
+									if(item[d.doctype + ":name"]===d.name) {
+										$.each(d, function(k, v) {
 											if(frappe.model.std_fields_list.indexOf(k)===-1) {
 												new_item[k] = v;
 											}
diff --git a/frappe/public/js/legacy/clientscriptAPI.js b/frappe/public/js/legacy/clientscriptAPI.js
index 968a5b22ac..c542fff82f 100644
--- a/frappe/public/js/legacy/clientscriptAPI.js
+++ b/frappe/public/js/legacy/clientscriptAPI.js
@@ -4,10 +4,7 @@
 get_server_fields = function(method, arg, table_field, doc, dt, dn, allow_edit, call_back) {
 	frappe.dom.freeze();
 	return $c('runserverobj', 
-		args={'method':method, 
-				'docs':frappe.model.compress(make_doclist(doc.doctype, doc.name)), 
-				'arg':arg
-			},
+		args={'method': method, 'docs': doc, 'arg': arg },
 	function(r, rt) {
 		frappe.dom.unfreeze();
 		if (r.message)  {
@@ -125,10 +122,6 @@ _f.Frm.prototype.get_doc = function() {
 	return locals[this.doctype][this.docname];
 }
 
-_f.Frm.prototype.get_doclist = function(filters) {
-	return frappe.model.get_doclist(this.doctype, this.docname, filters);
-}
-
 _f.Frm.prototype.field_map = function(fnames, fn) {
 	if(typeof fnames==='string') {
 		if(fnames == '*') {
@@ -170,7 +163,7 @@ _f.Frm.prototype.toggle_display = function(fnames, show) {
 }
 
 _f.Frm.prototype.call_server = function(method, args, callback) {
-	return $c_obj(cur_frm.get_doclist(), method, args, callback);
+	return $c_obj(cur_frm.doc, method, args, callback);
 }
 
 _f.Frm.prototype.get_files = function() {
diff --git a/frappe/public/js/legacy/form.js b/frappe/public/js/legacy/form.js
index 7a99b51438..a990adc070 100644
--- a/frappe/public/js/legacy/form.js
+++ b/frappe/public/js/legacy/form.js
@@ -548,13 +548,11 @@ _f.Frm.prototype.setnewdoc = function() {
 _f.Frm.prototype.runscript = function(scriptname, callingfield, onrefresh) {
 	var me = this;
 	if(this.docname) {
-		// make doc list
-		var doclist = frappe.model.compress(make_doclist(this.doctype, this.docname));
 		// send to run
 		if(callingfield)
 			$(callingfield.input).set_working();
 
-		return $c('runserverobj', {'docs':doclist, 'method':scriptname }, 
+		return $c('runserverobj', {'docs':this.doc, 'method':scriptname }, 
 			function(r, rtxt) { 
 				// run refresh
 				if(onrefresh)
@@ -577,45 +575,10 @@ _f.Frm.prototype.copy_doc = function(onload, from_amend) {
 		return;
 	}
 	
-	var dn = this.docname;
-	// copy parent
-	var newdoc = frappe.model.copy_doc(this.doctype, dn, from_amend);
-	newdoc.idx = null;
-	
-	// copy chidren
-	var dl = make_doclist(this.doctype, dn);
-
-	// table fields dict - for no_copy check
-	var tf_dict = {};
-
-	for(var d in dl) {
-		d1 = dl[d];
-		
-		// get tabel field
-		if(d1.parentfield && !tf_dict[d1.parentfield]) {
-			tf_dict[d1.parentfield] = frappe.meta.get_docfield(d1.parenttype, d1.parentfield);
-		}
-		
-		if(d1.parent==dn && cint(tf_dict[d1.parentfield].no_copy)!=1) {
-			var ch = frappe.model.copy_doc(d1.doctype, d1.name, from_amend);
-			ch.parent = newdoc.name;
-			ch.docstatus = 0;
-			ch.owner = user;
-			ch.creation = '';
-			ch.modified_by = user;
-			ch.modified = '';
-		}
-	}
-
-	newdoc.__islocal = 1;
-	newdoc.docstatus = 0;
-	newdoc.owner = user;
-	newdoc.creation = '';
-	newdoc.modified_by = user;
-	newdoc.modified = '';
+	var newdoc = frappe.model.copy_doc(this.doc, from_amend);
 
+	newdoc.idx = null;
 	if(onload)onload(newdoc);
-
 	loaddoc(newdoc.doctype, newdoc.name);
 }
 
@@ -651,19 +614,15 @@ _f.Frm.prototype._save = function(save_action, callback, btn, on_error) {
 		scroll(0, 0);
 	
 	// validate
-	if(save_action!="Cancel") {
-		validated = true;
-		this.script_manager.trigger("validate");
-		if(!validated) {
-			if(on_error) 
-				on_error();
-			return;
-		}
+	validated = true;
+	this.script_manager.trigger("validate");
+	if(!validated) {
+		if(on_error) 
+			on_error();
+		return;
 	}
-
-	var doclist = new frappe.model.DocList(this.doctype, this.docname);
-
-	doclist.save(save_action || "Save", function(r) {
+	
+	var after_save = function(r) {
 		if(!r.exc) {
 			me.refresh();
 		} else {
@@ -680,7 +639,9 @@ _f.Frm.prototype._save = function(save_action, callback, btn, on_error) {
 			}
 			frappe._from_link = null;
 		}
-	}, btn);
+	}
+	
+	frappe.ui.form.save(this, save_action || "Save", after_save, btn);
 }
 
 
@@ -713,14 +674,16 @@ _f.Frm.prototype.savecancel = function(btn, on_error) {
 				on_error();
 			return;
 		}
-		
-		var doclist = new frappe.model.DocList(me.doctype, me.docname);
-		doclist.cancel(function(r) {
+
+		var after_cancel = function(r) {
 			if(!r.exc) {
 				me.refresh();
 				me.script_manager.trigger("after_cancel");
+			} else {
+				on_error();
 			}
-		}, btn, on_error);
+		}		
+		frappe.ui.form.save(this, "cancel", after_cancel, btn);
 	});
 }
 
diff --git a/frappe/public/js/legacy/handler.js b/frappe/public/js/legacy/handler.js
index 639890eb37..4e83448e3d 100644
--- a/frappe/public/js/legacy/handler.js
+++ b/frappe/public/js/legacy/handler.js
@@ -13,7 +13,7 @@ function $c(command, args, callback, error, no_spinner, freeze_msg, btn) {
 }
 
 // For calling an object
-function $c_obj(doclist, method, arg, callback, no_spinner, freeze_msg, btn) {
+function $c_obj(doc, method, arg, callback, no_spinner, freeze_msg, btn) {
 	if(arg && typeof arg!='string') arg = JSON.stringify(arg);
 		
 	args = {
@@ -22,10 +22,11 @@ function $c_obj(doclist, method, arg, callback, no_spinner, freeze_msg, btn) {
 		method: method
 	};
 	
-	if(typeof doclist=='string') 
-		args.doctype = doclist; 
-	else 
-		args.docs = frappe.model.compress(doclist)
+	if(typeof doc=='string') {
+		args.doctype = doc; 
+	} else {
+		args.docs = doc
+	}
 	
 	return frappe.request.call({
 		args: args,
@@ -53,7 +54,7 @@ function $c_page(module, page, method, arg, callback, no_spinner, freeze_msg, bt
 }
 
 // For calling an for output as csv
-function $c_obj_csv(doclist, method, arg) {
+function $c_obj_csv(doc, method, arg) {
 	// single
 	
 	var args = {}
@@ -62,10 +63,10 @@ function $c_obj_csv(doclist, method, arg) {
 	args.method = method;
 	args.arg = arg;
 	
-	if(doclist.substr)
-		args.doctype = doclist;		
+	if(doc.substr)
+		args.doctype = doc;		
 	else
-		args.docs = frappe.model.compress(doclist);
+		args.docs = doc;
 
 	// open
 	open_url_post(frappe.request.url, args);
diff --git a/frappe/tests/test_document.py b/frappe/tests/test_document.py
index 965501bcfe..9cd56b734e 100644
--- a/frappe/tests/test_document.py
+++ b/frappe/tests/test_document.py
@@ -120,5 +120,6 @@ class TestDocument(unittest.TestCase):
 		d.starts_on = "2014-01-01"
 		d.ends_on = "2013-01-01"
 		self.assertRaises(frappe.ValidationError, d.validate)
+		self.assertRaises(frappe.ValidationError, d.run_method, "validate")
 		self.assertRaises(frappe.ValidationError, d.save)
 		
diff --git a/frappe/tests/test_form_load.py b/frappe/tests/test_form_load.py
new file mode 100644
index 0000000000..7c0c018f00
--- /dev/null
+++ b/frappe/tests/test_form_load.py
@@ -0,0 +1,16 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# MIT License. See license.txt
+
+import frappe, unittest
+from frappe.widgets.form.meta import get_meta
+from frappe.widgets.form.load import getdoctype, getdoc 
+
+class TestFormLoad(unittest.TestCase):
+	def test_load(self):
+		getdoctype("DocType")
+		self.assertEquals(frappe.response.docs[0].name, "DocType")
+		self.assertTrue(frappe.response.docs[0].get("__js"))
+
+		frappe.response.docs = []
+		d = getdoctype("Event")
+		self.assertTrue(frappe.response.docs[0].get("__calendar_js"))
diff --git a/frappe/utils/response.py b/frappe/utils/response.py
index d675d3ad1f..e8661615c0 100644
--- a/frappe/utils/response.py
+++ b/frappe/utils/response.py
@@ -9,7 +9,8 @@ import mimetypes
 import os
 import frappe
 from frappe import _
-from frappe.model.doc import Document
+import frappe.model.doc
+import frappe.model.document
 import frappe.utils
 import frappe.sessions
 import frappe.model.utils
@@ -28,6 +29,9 @@ def report_error(status_code):
 	return response
 
 def build_response(response_type=None):
+	if "docs" in frappe.local.response and not frappe.local.response.docs:
+		del frappe.local.response["docs"]
+	
 	response_type_map = {
 		'csv': as_csv,
 		'download': as_raw,
@@ -54,7 +58,6 @@ def as_raw():
 
 def as_json():
 	make_logs()
-	cleanup_docs()
 	response = Response()
 	response.headers["Content-Type"] = "application/json; charset: utf-8"
 	response = gzip(json.dumps(frappe.local.response, default=json_handler, separators=(',',':')),
@@ -68,14 +71,11 @@ def make_logs():
 		frappe.response['exc'] = json.dumps([frappe.utils.cstr(d) for d in frappe.local.error_log])
 
 	if frappe.local.message_log:
-		frappe.response['_server_messages'] = json.dumps([frappe.utils.cstr(d) for d in frappe.local.message_log])
+		frappe.response['_server_messages'] = json.dumps([frappe.utils.cstr(d) for
+			d in frappe.local.message_log])
 	
 	if frappe.debug_log and frappe.conf.get("logging") or False:
 		frappe.response['_debug_messages'] = json.dumps(frappe.local.debug_log)
-
-def cleanup_docs():
-	if frappe.response.get('docs') and type(frappe.response['docs'])!=dict:
-		frappe.response['docs'] = frappe.model.utils.compress(frappe.response['docs'])
 		
 def gzip(data, response):
 	data = data.encode('utf-8')
@@ -107,8 +107,10 @@ def json_handler(obj):
 		return unicode(obj)
 	elif isinstance(obj, LocalProxy):
 		return unicode(obj)
-	elif isinstance(obj, Document):
+	elif isinstance(obj, frappe.model.doc.Document):
 		return obj.fields
+	elif isinstance(obj, frappe.model.document.Document):
+		return obj.as_dict()
 	else:
 		raise TypeError, """Object of type %s with value of %s is not JSON serializable""" % \
 			(type(obj), repr(obj))
diff --git a/frappe/website/doctype/blog_post/blog_post.js b/frappe/website/doctype/blog_post/blog_post.js
index f02b95ead3..ed555352d7 100644
--- a/frappe/website/doctype/blog_post/blog_post.js
+++ b/frappe/website/doctype/blog_post/blog_post.js
@@ -5,7 +5,7 @@ cur_frm.cscript.refresh = function(doc) {
 	if(!doc.__islocal && doc.published) {
 		if(!doc.email_sent) {
 			cur_frm.add_custom_button('Email Subscribers', function() {
-				$c_obj(make_doclist(doc.doctype, doc.name), 'send_emails', '', function(r) {
+				$c_obj(doc, 'send_emails', '', function(r) {
 					cur_frm.refresh();
 				});
 			});
diff --git a/frappe/widgets/form/load.py b/frappe/widgets/form/load.py
index 672d9f6206..28e7497c11 100644
--- a/frappe/widgets/form/load.py
+++ b/frappe/widgets/form/load.py
@@ -5,6 +5,7 @@ from __future__ import unicode_literals
 import frappe, json
 import frappe.model.doc
 import frappe.utils
+import frappe.widgets.form.meta
 
 @frappe.whitelist()
 def getdoc(doctype, name, user=None):
@@ -13,8 +14,6 @@ def getdoc(doctype, name, user=None):
 	Requries "doctype", "name" as form variables.
 	Will also call the "onload" method on the document.
 	"""
-
-	import frappe
 	
 	if not (doctype and name):
 		raise Exception, 'doctype and name required!'
@@ -26,14 +25,12 @@ def getdoc(doctype, name, user=None):
 		return []
 
 	try:
-		bean = frappe.bean(doctype, name)
-		bean.run_method("onload")
+		doc = frappe.get_doc(doctype, name)
+		doc.run_method("onload")
 		
-		if not bean.has_read_perm():
+		if not doc.has_permission("read"):
 			raise frappe.PermissionError
 
-		doclist = bean.doclist
-
 		# add file list
 		get_docinfo(doctype, name)
 		
@@ -42,35 +39,38 @@ def getdoc(doctype, name, user=None):
 		frappe.msgprint('Did not load.')
 		raise
 
-	if bean and not name.startswith('_'):
+	if doc and not name.startswith('_'):
 		frappe.user.update_recent(doctype, name)
 	
-	frappe.response['docs'] = doclist
+	frappe.response.docs.append(doc)
 
 @frappe.whitelist()
 def getdoctype(doctype, with_parent=False, cached_timestamp=None):
 	"""load doctype"""
-	import frappe.model.doctype
-	import frappe.model.meta
-	
-	doclist = []
 	
+	docs = []
 	# with parent (called from report builder)
 	if with_parent:
 		parent_dt = frappe.model.meta.get_parent_dt(doctype)
 		if parent_dt:
-			doclist = frappe.model.doctype.get(parent_dt, processed=True)
+			docs = get_meta_bundle(parent_dt)
 			frappe.response['parent_dt'] = parent_dt
 	
-	if not doclist:
-		doclist = frappe.model.doctype.get(doctype, processed=True)
+	if not docs:
+		docs = get_meta_bundle(doctype)
 	
-	frappe.response['restrictions'] = get_restrictions(doclist)
+	frappe.response['restrictions'] = get_restrictions(docs[0])
 	
-	if cached_timestamp and doclist[0].modified==cached_timestamp:
+	if cached_timestamp and docs[0].modified==cached_timestamp:
 		return "use_cache"
 	
-	frappe.response['docs'] = doclist
+	frappe.response.docs.extend(docs)
+
+def get_meta_bundle(doctype):
+	bundle = [frappe.widgets.form.meta.get_meta(doctype)]
+	for df in bundle[0].get_table_fields():
+		bundle.append(frappe.widgets.form.meta.get_meta(df.options))
+	return bundle
 
 def get_docinfo(doctype, name):
 	frappe.response["docinfo"] = {
diff --git a/frappe/widgets/form/meta.py b/frappe/widgets/form/meta.py
new file mode 100644
index 0000000000..63f0601864
--- /dev/null
+++ b/frappe/widgets/form/meta.py
@@ -0,0 +1,157 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# MIT License. See license.txt 
+
+# metadata
+
+from __future__ import unicode_literals
+import frappe, os
+from frappe.utils import cstr, cint
+from frappe.model.meta import Meta
+from frappe.modules import scrub, get_module_path
+from frappe.model.workflow import get_workflow_name
+
+######
+
+def get_meta(doctype, cached=True):
+	if cached:
+		meta = frappe.cache().get_value("form_meta:" + doctype, lambda: FormMeta(doctype))
+	else:
+		meta = FormMeta(doctype)
+
+	if frappe.local.lang != 'en':
+		meta.set("__messages", frappe.get_lang_dict("doctype", doctype))
+		
+	return meta
+		
+class FormMeta(Meta):
+	def __init__(self, doctype):
+		super(FormMeta, self).__init__(doctype)
+		self.load_assets()
+		
+	def load_assets(self):
+		self.expand_selects()
+		self.add_search_fields()
+
+		if not self.istable:
+			self.add_linked_with()
+			self.add_code()
+			self.load_print_formats()
+			self.load_workflows()
+		
+	def as_dict(self):
+		d = super(FormMeta, self).as_dict()
+		for k in ("__js", "__css", "__list_js", "__calendar_js", "__map_js", "__linked_with", "__messages"):
+			d[k] = self.get(k)
+		
+		for i, df in enumerate(d.get("fields")):
+			for k in ("link_doctype", "search_fields"):
+				df[k] = self.get("fields")[i].get(k)
+				
+		return d
+		
+	def add_code(self):
+		path = os.path.join(get_module_path(self.module), 'doctype', scrub(self.name))
+		def _get_path(fname):
+			return os.path.join(path, scrub(fname))
+	
+		self._add_code(_get_path(self.name + '.js'), '__js')
+		self._add_code(_get_path(self.name + '.css'), "__css")
+		self._add_code(_get_path(self.name + '_list.js'), '__list_js')
+		self._add_code(_get_path(self.name + '_calendar.js'), '__calendar_js')
+		self._add_code(_get_path(self.name + '_map.js'), '__map_js')
+	
+		self.add_custom_script()
+		self.add_code_via_hook("doctype_js", "__js")
+	
+	def _add_code(self, path, fieldname):
+		js = frappe.read_file(path)
+		if js:
+			self.set(fieldname, (self.get(fieldname) or "") + "\n\n" + render_jinja(js))
+		
+	def add_code_via_hook(self, hook, fieldname):
+		hook = "{}:{}".format(hook, self.name)
+		for app_name in frappe.get_installed_apps():
+			for file in frappe.get_hooks(hook, app_name=app_name):
+				path = frappe.get_app_path(app_name, *file.strip("/").split("/"))
+				self._add_code(path, fieldname)
+	
+	def add_custom_script(self):
+		"""embed all require files"""
+		# custom script
+		custom = frappe.db.get_value("Custom Script", {"dt": self.name, 
+			"script_type": "Client"}, "script") or ""
+	
+		self.set("__js", (self.get('__js') or '') + "\n\n" + custom)
+	
+	def render_jinja(content):
+		if "{% include" in content:
+			content = frappe.get_jenv().from_string(content).render()
+		return content
+
+	def expand_selects(self):
+		for df in self.get("fields", {"fieldtype": "Select"}):
+			if df.options and df.options.startswith("link:"):
+				df.link_doctype = df.options.split("\n")[0][5:]
+				df.options = '\n'.join([''] + [o.name for o in frappe.db.sql("""select 
+					name from `tab%s` where docstatus<2 order by name asc""" % df.link_doctype, as_dict=1)])
+				
+	def add_search_fields(self):
+		"""add search fields found in the doctypes indicated by link fields' options"""
+		for df in self.get("fields", {"fieldtype": "Link", "options":["!=", "[Select]"]}):
+			if df.options:
+				search_fields = frappe.get_meta(df.options).search_fields
+				if search_fields:
+					df.search_fields = map(lambda sf: sf.strip(), search_fields.split(","))
+
+	def add_linked_with(self):
+		"""add list of doctypes this doctype is 'linked' with"""
+		links = frappe.db.sql("""select parent, fieldname from tabDocField
+			where (fieldtype="Link" and options=%s)
+			or (fieldtype="Select" and options=%s)""", (self.name, "link:"+ self.name))
+		links += frappe.db.sql("""select dt as parent, fieldname from `tabCustom Field`
+			where (fieldtype="Link" and options=%s)
+			or (fieldtype="Select" and options=%s)""", (self.name, "link:"+ self.name))
+
+		links = dict(links)
+
+		if not links: 
+			return {}
+
+		ret = {}
+
+		for dt in links:
+			ret[dt] = { "fieldname": links[dt] }
+
+		for grand_parent, options in frappe.db.sql("""select parent, options from tabDocField 
+			where fieldtype="Table" 
+				and options in (select name from tabDocType 
+					where istable=1 and name in (%s))""" % ", ".join(["%s"] * len(links)) ,tuple(links)):
+
+			ret[grand_parent] = {"child_doctype": options, "fieldname": links[options] }
+			if options in ret:
+				del ret[options]
+		
+		self.set("__linked_with", ret)
+					
+	def load_print_formats(self):
+		frappe.response.docs.extend(frappe.db.sql("""select * FROM `tabPrint Format`
+			WHERE doc_type=%s AND docstatus<2""", (self.name,), as_dict=1, update={"doctype":"Print Format"}))
+	
+	def load_workflows(self):
+		# get active workflow
+		workflow_name = get_workflow_name(self.name)
+
+		if workflow_name and frappe.db.exists("Workflow", workflow_name):
+			workflow = frappe.get_doc("Workflow", workflow_name)
+			frappe.response.docs.append(workflow)
+			
+			for d in workflow.get("workflow_document_states"):
+				frappe.response.docs.append(frappe.get_doc("Workflow State", d.state))
+
+	
+def render_jinja(content):
+	if "{% include" in content:
+		content = frappe.get_jenv().from_string(content).render()
+	return content
+
+	
\ No newline at end of file
diff --git a/frappe/widgets/form/run_method.py b/frappe/widgets/form/run_method.py
index 8f84c3aa53..8bc1c282a6 100644
--- a/frappe/widgets/form/run_method.py
+++ b/frappe/widgets/form/run_method.py
@@ -20,8 +20,6 @@ def runserverobj():
 	dt = frappe.form_dict.get('doctype')
 	dn = frappe.form_dict.get('docname')
 	
-	frappe.response["docs"] = []
-	
 	if dt: # not called from a doctype (from a page)
 		if not dn: dn = dt # single
 		so = frappe.model.code.get_obj(dt, dn)
diff --git a/frappe/widgets/form/utils.py b/frappe/widgets/form/utils.py
index de71e4cf30..9731bf7f01 100644
--- a/frappe/widgets/form/utils.py
+++ b/frappe/widgets/form/utils.py
@@ -112,8 +112,6 @@ def get_linked_docs(doctype, name, metadata_loaded=None):
 				results[dt] = ret
 				
 			if not dt in metadata_loaded:
-				if not "docs" in frappe.local.response:
-					frappe.local.response.docs = []
 				frappe.local.response.docs += linkmeta
 				
 	return results
\ No newline at end of file
diff --git a/frappe/widgets/page.py b/frappe/widgets/page.py
index 953771544c..526ce46c88 100644
--- a/frappe/widgets/page.py
+++ b/frappe/widgets/page.py
@@ -11,14 +11,14 @@ def get(name):
 	"""
 	   Return the :term:`doclist` of the `Page` specified by `name`
 	"""
-	page = frappe.bean("Page", name)
-	if has_permission(page.doclist):
-		page.run_method("get_from_files")
-		return page.doclist
+	page = frappe.get_doc('Page', name)
+	if has_permission(page):
+		page.load_assets()
+		return page
 	else:
 		frappe.response['403'] = 1
 		raise frappe.PermissionError, 'No read permission for Page %s' % \
-			(page.doclist[0].title or name,)
+			(page.title or name)
 
 @frappe.whitelist(allow_guest=True)
 def getpage():
@@ -26,24 +26,19 @@ def getpage():
 	   Load the page from `frappe.form` and send it via `frappe.response`
 	"""
 	page = frappe.form_dict.get('name')
-	doclist = get(page)
+	doc = get(page)
 
-	if has_permission(doclist):
-		# load translations
-		if frappe.lang != "en":
-			frappe.response["__messages"] = frappe.get_lang_dict("page", page)
+	# load translations
+	if frappe.lang != "en":
+		frappe.response["__messages"] = frappe.get_lang_dict("page", page)
 
-		frappe.response['docs'] = doclist
-	else:
-		frappe.response['403'] = 1
-		raise frappe.PermissionError, 'No read permission for Page %s' % \
-			(doclist[0].title or page, )
-		
-def has_permission(page_doclist):
+	frappe.response.docs.append(doc)
+
+def has_permission(page):
 	if frappe.user.name == "Administrator" or "System Manager" in frappe.user.get_roles():
 		return True
 		
-	page_roles = [d.role for d in page_doclist if d.fields.get("doctype")=="Page Role"]
+	page_roles = [d.role for d in page.get("roles")]
 	if page_roles:
 		if frappe.session.user == "Guest" and "Guest" not in page_roles:
 			return False
@@ -51,7 +46,7 @@ def has_permission(page_doclist):
 			# check if roles match
 			return False
 		
-	if not frappe.has_permission("Page", ptype="read", refdoc=page_doclist[0].name):
+	if not frappe.has_permission("Page", ptype="read", doc=page):
 		# check if there are any restrictions
 		return False
 	else:

From 57acf4e9cbfcbf05b0cd882b408925f6a869d7d9 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 27 Mar 2014 14:17:44 +0530
Subject: [PATCH 2/5] #478

---
 frappe/core/doctype/workflow/workflow.js      |  2 +-
 .../permission_manager/permission_manager.js  |  6 +--
 frappe/model/controller.py                    | 28 ++---------
 frappe/model/meta.py                          |  4 +-
 frappe/public/js/frappe/form/control.js       |  4 +-
 frappe/public/js/frappe/form/formatters.js    |  2 +-
 frappe/public/js/frappe/form/save.js          |  4 +-
 frappe/public/js/frappe/form/toolbar.js       |  2 +-
 frappe/public/js/frappe/form/workflow.js      |  6 +--
 frappe/public/js/frappe/model/create_new.js   | 46 +++++++++++--------
 frappe/public/js/frappe/model/meta.js         |  4 +-
 frappe/public/js/frappe/model/model.js        | 40 ++++++++++------
 frappe/public/js/frappe/model/perm.js         |  8 ++--
 frappe/public/js/frappe/model/sync.js         | 18 ++++++--
 frappe/public/js/frappe/model/workflow.js     |  8 ++--
 frappe/public/js/frappe/print/print_table.js  |  3 +-
 frappe/public/js/frappe/request.js            |  2 +-
 .../public/js/frappe/views/communication.js   |  2 +-
 frappe/public/js/frappe/views/listview.js     | 10 ++--
 frappe/public/js/frappe/views/query_report.js |  2 +-
 frappe/public/js/frappe/views/reportview.js   |  2 +-
 frappe/public/js/legacy/form.js               |  6 +--
 frappe/public/js/legacy/print_format.js       |  2 +-
 frappe/website/doctype/web_page/web_page.py   |  6 +--
 .../website_settings/website_settings.js      |  4 +-
 frappe/widgets/form/load.py                   |  5 +-
 frappe/widgets/form/save.py                   | 32 ++++++-------
 27 files changed, 130 insertions(+), 128 deletions(-)

diff --git a/frappe/core/doctype/workflow/workflow.js b/frappe/core/doctype/workflow/workflow.js
index 26b83403e5..7cbfd6b715 100644
--- a/frappe/core/doctype/workflow/workflow.js
+++ b/frappe/core/doctype/workflow/workflow.js
@@ -20,7 +20,7 @@ frappe.core.Workflow = frappe.ui.form.Controller.extend({
 		}
 	},
 	update_field_options: function() {
-		var fields = $.map(frappe.model.get_doc("DocType", this.frm.doc.document_type).fields, function(d) {
+		var fields = $.map(frappe.get_doc("DocType", this.frm.doc.document_type).fields, function(d) {
 			return frappe.model.no_value_type.indexOf(d.fieldtype)===-1 ? d.fieldname : null;
 		})
 		frappe.meta.get_docfield("Workflow Document State", "update_field", this.frm.doc.name).options
diff --git a/frappe/core/page/permission_manager/permission_manager.js b/frappe/core/page/permission_manager/permission_manager.js
index 9c05ea679a..015a8d4640 100644
--- a/frappe/core/page/permission_manager/permission_manager.js
+++ b/frappe/core/page/permission_manager/permission_manager.js
@@ -428,14 +428,14 @@ frappe.PermissionEngine = Class.extend({
 		});
 	},
 	get_user_fields: function(doctype) {
-		var user_fields = frappe.model.get_children("DocType", doctype, "fields", {fieldtype:"Link", options:"User"})
-		user_fields = user_fields.concat(frappe.model.get_children("DocType", doctype, "fields", 
+		var user_fields = frappe.get_children("DocType", doctype, "fields", {fieldtype:"Link", options:"User"})
+		user_fields = user_fields.concat(frappe.get_children("DocType", doctype, "fields", 
 			{fieldtype:"Select", link_doctype:"User"}))
 				
 		return 	user_fields	
 	},
 	get_link_fields: function(doctype) {
-		return frappe.model.get_children("DocType", doctype, "fields",
+		return frappe.get_children("DocType", doctype, "fields",
 			{fieldtype:"Link", options:["not in", ["User", '[Select]']]});
 	}
 })
diff --git a/frappe/model/controller.py b/frappe/model/controller.py
index a023809fc8..fd01646127 100644
--- a/frappe/model/controller.py
+++ b/frappe/model/controller.py
@@ -6,22 +6,11 @@ import frappe
 from frappe import msgprint, _
 from frappe.utils import flt, cint, cstr
 from frappe.model.meta import get_field_precision
+from frappe.model.document import Document
 
 class EmptyTableError(frappe.ValidationError): pass
 
-class DocListController(object):
-	def __init__(self, doc, doclist):
-		self.doc, self.doclist = doc, doclist
-		
-		if hasattr(self, "setup"):
-			self.setup()
-	
-	@property
-	def meta(self):
-		if not hasattr(self, "_meta"):
-			self._meta = frappe.get_doctype(self.doc.doctype)
-		return self._meta
-		
+class DocListController(Document):
 	def validate_value(self, fieldname, condition, val2, doc=None, raise_exception=None):
 		"""check that value of fieldname should be 'condition' val2
 			else throw exception"""
@@ -80,18 +69,9 @@ class DocListController(object):
 		for fieldname in fieldnames:
 			doc.fields[fieldname] = flt(doc.fields.get(fieldname), self.precision(fieldname, doc.parentfield))
 			
-	def _process(self, parentfield):
-		from frappe.model.doc import Document
-		if isinstance(parentfield, Document):
-			parentfield = parentfield.parentfield
-			
-		elif isinstance(parentfield, dict):
-			parentfield = parentfield.get("parentfield")
-			
-		return parentfield
-
 	def precision(self, fieldname, parentfield=None):
-		parentfield = self._process(parentfield)
+		if not isinstance(parentfield, basestring):
+			parentfield = parentfield.parentfield
 		
 		if not hasattr(self, "_precision"):
 			self._precision = frappe._dict({
diff --git a/frappe/model/meta.py b/frappe/model/meta.py
index 730b90d5e1..380d02e31d 100644
--- a/frappe/model/meta.py
+++ b/frappe/model/meta.py
@@ -29,7 +29,7 @@ class Meta(Document):
 	def get_link_fields(self):
 		tmp = self.get("fields", {"fieldtype":"Link"})
 		tmp.extend(self.get("fields", {"fieldtype":"Select", "options": "^link:"}))
-		return tmp
+		return tmp			
 	
 	def get_table_fields(self):
 		return [
@@ -46,7 +46,7 @@ class Meta(Document):
 		
 	def get_table_field_doctype(self, fieldname):
 		return { "fields": "DocField", "permissions": "DocPerm"}.get(fieldname)
-		
+
 	def process(self):
 		self.add_custom_fields()
 		self.apply_property_setters()
diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js
index a652c2cc6d..e77ea6fd45 100644
--- a/frappe/public/js/frappe/form/control.js
+++ b/frappe/public/js/frappe/form/control.js
@@ -980,9 +980,9 @@ frappe.ui.form.ControlTable = frappe.ui.form.Control.extend({
 		this._super();
 		
 		// add title if prev field is not column / section heading or html
-		var prev_fieldtype = frappe.model.get_children("DocType", this.frm.doctype, "fields", 
+		var prev_fieldtype = frappe.get_children("DocType", this.frm.doctype, "fields", 
 			{idx: this.df.idx-1});
-		prev_fieldtype = prev_fieldtype ? prev_fieldtype[0].fieldtype : "";
+		prev_fieldtype = prev_fieldtype.length ? prev_fieldtype[0].fieldtype : "";
 					
 		if(["Column Break", "Section Break", "HTML"].indexOf(prev_fieldtype)===-1) {
 			$("<label>" + this.df.label + "<label>").appendTo(this.wrapper);	
diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index 04d0da3853..286b7ba8ab 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -98,7 +98,7 @@ frappe.form.formatters = {
 		return "<pre>" + (value==null ? "" : $("<div>").text(value).html()) + "</pre>"
 	},
 	WorkflowState: function(value) {
-		workflow_state = frappe.model.get_doc("Workflow State", value);
+		workflow_state = frappe.get_doc("Workflow State", value);
 		if(workflow_state) {
 			return repl("<span class='label label-%(style)s' \
 				data-workflow-state='%(value)s'\
diff --git a/frappe/public/js/frappe/form/save.js b/frappe/public/js/frappe/form/save.js
index b7d5fa7eba..4ddbec5f84 100644
--- a/frappe/public/js/frappe/form/save.js
+++ b/frappe/public/js/frappe/form/save.js
@@ -9,7 +9,7 @@ frappe.ui.form.save = function(frm, action, callback, btn) {
 		if(check_mandatory()) {
 			_call({
 				method: "frappe.widgets.form.save.savedocs",
-				args: { docs: frm.doc, action:action},
+				args: { doc: frm.doc, action:action},
 				callback: function(r) {
 					$(document).trigger("save", frm.doc);
 					callback(r);
@@ -52,7 +52,7 @@ frappe.ui.form.save = function(frm, action, callback, btn) {
 		
 		if(frm.doc.docstatus==2) return true; // don't check for cancel
 		
-		$.each(frm.model.get_all_docs(frm.doc), function(i, doc) {
+		$.each(frappe.model.get_all_docs(frm.doc), function(i, doc) {
 			
 			var error_fields = [];
 			
diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js
index cf8ecc7e42..3d960debec 100644
--- a/frappe/public/js/frappe/form/toolbar.js
+++ b/frappe/public/js/frappe/form/toolbar.js
@@ -186,7 +186,7 @@ frappe.ui.form.Toolbar = Class.extend({
 	},
 	has_workflow: function() {
 		if(this._has_workflow === undefined)
-			this._has_workflow = frappe.model.get("Workflow", {document_type: this.frm.doctype}).length;
+			this._has_workflow = frappe.get_list("Workflow", {document_type: this.frm.doctype}).length;
 		return this._has_workflow;
 	},
 	get_docstatus: function() {
diff --git a/frappe/public/js/frappe/form/workflow.js b/frappe/public/js/frappe/form/workflow.js
index bf391efb34..d93ae4a638 100644
--- a/frappe/public/js/frappe/form/workflow.js
+++ b/frappe/public/js/frappe/form/workflow.js
@@ -79,7 +79,7 @@ frappe.ui.form.States = Class.extend({
 			// show current state on the button
 			this.workflow_button.find(".state-text").text(state);
 			
-			var state_doc = frappe.model.get_doc("Workflow State", state);
+			var state_doc = frappe.get_doc("Workflow State", state);
 
 			if (state_doc) {
 				// set the icon
@@ -109,7 +109,7 @@ frappe.ui.form.States = Class.extend({
 
 		$.each(frappe.workflow.get_transitions(this.frm.doctype, state), function(i, d) {
 			if(in_list(user_roles, d.allowed)) {
-				d.icon = frappe.model.get("Workflow State", d.next_state).icon;
+				d.icon = frappe.get_list("Workflow State", d.next_state).icon;
 				
 				$(repl('<li><a href="#" data-action="%(action)s">\
 					<i class="icon icon-%(icon)s"></i> %(action)s</a></li>', d))
@@ -160,7 +160,7 @@ frappe.ui.form.States = Class.extend({
 			// revert state on error
 			var on_error = function() {
 				// reset in locals
-				locals[me.frm.doctype][me.frm.docname] = doc_before_action;
+				frappe.model.add_to_locals(doc_before_action);
 				me.frm.refresh();
 			}
 
diff --git a/frappe/public/js/frappe/model/create_new.js b/frappe/public/js/frappe/model/create_new.js
index d4f37d3853..fd9e2737d5 100644
--- a/frappe/public/js/frappe/model/create_new.js
+++ b/frappe/public/js/frappe/model/create_new.js
@@ -7,7 +7,7 @@ $.extend(frappe.model, {
 	new_names: {},
 	new_name_count: {},
 
-	get_new_doc: function(doctype, parent_doc) {
+	get_new_doc: function(doctype, parent_doc, parentfield) {
 		frappe.provide("locals." + doctype);
 		var doc = {
 			docstatus: 0,
@@ -18,8 +18,19 @@ $.extend(frappe.model, {
 			owner: user
 		};
 		frappe.model.set_default_values(doc, parent_doc);
-		locals[doctype][doc.name] = doc;
-		frappe.provide("frappe.model.docinfo." + doctype + "." + doc.name);
+		
+		if(parent_doc) {
+			$.extend(doc, {
+				parent: parent_doc.name,
+				parentfield: parentfield,
+				parenttype: parent_doc.doctype,
+			});
+			parent_doc[parentfield].push(doc);
+		} else {
+			frappe.provide("frappe.model.docinfo." + doctype + "." + doc.name);
+		}
+
+		frappe.model.add_to_locals(doc);		
 		return doc;
 	},
 	
@@ -84,12 +95,12 @@ $.extend(frappe.model, {
 	
 	get_default_from_boot_docs: function(df, doc, parent_doc) {
 		// set default from partial docs passed during boot like ":User"
-		if(frappe.model.get(df["default"]).length > 0) {
+		if(frappe.get_list(df["default"]).length > 0) {
 			var ref_fieldname = df["default"].slice(1).toLowerCase().replace(" ", "_");
 			var ref_value = parent_doc ? 
 				parent_doc[ref_fieldname] :
 				frappe.defaults.get_user_default(ref_fieldname);
-			var ref_doc = ref_value ? frappe.model.get_doc(df["default"], ref_value) : null;
+			var ref_doc = ref_value ? frappe.get_doc(df["default"], ref_value) : null;
 			
 			if(ref_doc && ref_doc[df.fieldname]) {
 				return ref_doc[df.fieldname];
@@ -99,23 +110,18 @@ $.extend(frappe.model, {
 	
 	add_child: function(parent_doc, doctype, parentfield, idx) {
 		// create row doc
-		idx = idx ?
-			idx - 0.1 :
-			frappe.model.get_children(doctype, parent_doc.name, parentfield, 
-				parent_doc.doctype).length + 1;
+		idx = idx ? idx - 0.1 : (parent_doc[parentfield] || []).length + 1;
+
+		var d = frappe.model.get_new_doc(doctype, parent_doc, parentfield);
+		d.idx = idx;
 
-		var d = frappe.model.get_new_doc(doctype, parent_doc);
-		$.extend(d, {
-			parent: parent_doc.name,
-			parentfield: parentfield,
-			parenttype: parent_doc.doctype,
-			idx: idx
-		});
-				
 		// renum for fraction
-		idx !== cint(idx) && 
-			frappe.model.get_children(doctype, parent_doc.name, parentfield, 
-				parent_doc.doctype);
+		if(idx !== cint(idx)) {
+			var sorted = parent_doc[parentfield].sort(function(a, b) { return a.idx - b.idx; });
+			$.each(sorted, function(i, d) {
+				d.idx = i + 1;
+			});
+		}
 
 		cur_frm && cur_frm.dirty();
 				
diff --git a/frappe/public/js/frappe/model/meta.js b/frappe/public/js/frappe/model/meta.js
index 63d2987f9a..cbd7fa88a2 100644
--- a/frappe/public/js/frappe/model/meta.js
+++ b/frappe/public/js/frappe/model/meta.js
@@ -91,7 +91,7 @@ $.extend(frappe.meta, {
 	},
 
 	get_parentfield: function(parent_dt, child_dt) {
-		var df = (frappe.model.get_doc("DocType", parent_dt).fields || []).filter(function(d) 
+		var df = (frappe.get_doc("DocType", parent_dt).fields || []).filter(function(d) 
 			{ return d.fieldtype==="Table" && options===child_dt })
 		if(!df.length) 
 			throw "parentfield not found for " + parent_dt + ", " + child_dt;
@@ -110,7 +110,7 @@ $.extend(frappe.meta, {
 		var print_format_list = ["Standard"];
 		var default_print_format = locals.DocType[doctype].default_print_format;
 		
-		var print_formats = frappe.model.get("Print Format", {doc_type: doctype})
+		var print_formats = frappe.get_list("Print Format", {doc_type: doctype})
 			.sort(function(a, b) { return (a > b) ? 1 : -1; });
 		$.each(print_formats, function(i, d) {
 			if(!in_list(print_format_list, d.name))
diff --git a/frappe/public/js/frappe/model/model.js b/frappe/public/js/frappe/model/model.js
index 4e6b000831..a1626d7f01 100644
--- a/frappe/public/js/frappe/model/model.js
+++ b/frappe/public/js/frappe/model/model.js
@@ -205,8 +205,8 @@ $.extend(frappe.model, {
 		return ret ? true : false;
 	},
 
-	get: function(doctype, filters) {
-		var docsdict = locals[doctype] || locals[":" + doctype] || [];
+	get_list: function(doctype, filters) {
+		var docsdict = locals[doctype] || locals[":" + doctype] || {};
 		if($.isEmptyObject(docsdict)) 
 			return [];
 		return frappe.utils.filter_dict(docsdict, filters);
@@ -217,16 +217,15 @@ $.extend(frappe.model, {
 			return locals[doctype] && locals[doctype][filters] 
 				&& locals[doctype][filters][fieldname];
 		} else {
-			var l = frappe.model.get(doctype, filters);
+			var l = frappe.get_list(doctype, filters);
 			return (l.length && l[0]) ? l[0][fieldname] : null;
 		}
 	},
 	
-	set_value: function(doctype, name, fieldname, value, fieldtype) {
+	set_value: function(doctype, docname, fieldname, value, fieldtype) {
 		/* help: Set a value locally (if changed) and execute triggers */
-		if(!name) name = doctype;
-		var doc = locals[doctype] && locals[doctype][name] || null;
-		
+		var doc = locals[doctype] && locals[doctype][docname];
+				
 		if(doc && doc[fieldname] !== value) {
 			doc[fieldname] = value;
 			frappe.model.trigger(fieldname, value, doc); 
@@ -274,19 +273,28 @@ $.extend(frappe.model, {
 	},
 	
 	get_doc: function(doctype, name) {
+		if($.isPlainObject(name)) {
+			var doc = frappe.get_list(doctype, name);
+			return doc && doc.length ? doc[0] : null;
+		}
 		return locals[doctype] ? locals[doctype][name] : null;
 	},
 	
 	get_children: function(doctype, parent, parentfield, filters) { 
-		if($.isPlainObject(parentfield)) {
+		if($.isPlainObject(doctype)) {
 			var doc = doctype;
-			var filters = parentfield;
+			var filters = parentfield
 			var parentfield = parent;
-			return frappe.utils.filter_dict((doc[parentfield] || []), filters);
 		} else {
-			return frappe.utils.filter_dict((frappe.model.get_doc(doctype, parent)[parentfield] || []), filters);
+			var doc = frappe.get_doc(doctype, parent)[parentfield];
+		}
+
+		var children = doc[parentfield] || [];
+		if(filters) {
+			return frappe.utils.filter_dict(children, filters);
+		} else {
+			return children;
 		}
-		
 	},
 	
 	clear_table: function(doctype, parenttype, parent, parentfield) {
@@ -314,13 +322,13 @@ $.extend(frappe.model, {
 		}
 		delete locals[doctype][name];
 		if(parent)
-			frappe.model.get_children(doctype, parent, parentfield, parenttype);
+			frappe.get_children(doctype, parent, parentfield, parenttype);
 	},
 	
 	get_no_copy_list: function(doctype) {
 		var no_copy_list = ['name','amended_from','amendment_date','cancel_reason'];
 		
-		$.each(frappe.model.get_doc("DocType", doctype).fields || [], function(i, df) {
+		$.each(frappe.get_doc("DocType", doctype).fields || [], function(i, df) {
 			if(cint(df.no_copy)) no_copy_list.push(df.fieldname);
 		})
 		return no_copy_list;
@@ -477,4 +485,6 @@ $.extend(frappe.model, {
 });
 
 // legacy
-getchildren = frappe.model.get_children
+frappe.get_doc = frappe.model.get_doc;
+frappe.get_children = frappe.model.get_children;
+frappe.get_list = frappe.model.get_list;
\ No newline at end of file
diff --git a/frappe/public/js/frappe/model/perm.js b/frappe/public/js/frappe/model/perm.js
index dcb9e5f5bd..86b1aa0405 100644
--- a/frappe/public/js/frappe/model/perm.js
+++ b/frappe/public/js/frappe/model/perm.js
@@ -37,7 +37,7 @@ $.extend(frappe.perm, {
 	get_perm: function(doctype, docname) {
 		var perm = [{read: 0}];
 		
-		var meta = frappe.model.get_doc("DocType", doctype);
+		var meta = frappe.get_doc("DocType", doctype);
 		
 		if(!meta) {
 			return perm;
@@ -52,7 +52,7 @@ $.extend(frappe.perm, {
 			return perm;
 		}
 		
-		var docperms = frappe.model.get_doc("DocType", doctype).permissions || [];
+		var docperms = frappe.get_doc("DocType", doctype).permissions || [];
 		$.each(docperms, function(i, p) {
 			// if user has this role
 			if(user_roles.indexOf(p.role)!==-1) {
@@ -75,7 +75,7 @@ $.extend(frappe.perm, {
 	
 	has_unrestricted_access: function(doctype, docname, restricted) {
 		var restrictions = frappe.defaults.get_restrictions();
-		var doc = frappe.model.get_doc(doctype, docname);
+		var doc = frappe.get_doc(doctype, docname);
 
 		if(restricted) {
 			if(doc.owner==user) return true;
@@ -93,7 +93,7 @@ $.extend(frappe.perm, {
 		
 		// loop and find if has restricted data
 		var has_restricted_data = false;
-		var doc = frappe.model.get_doc(doctype, docname);
+		var doc = frappe.get_doc(doctype, docname);
 		$.each(fields_to_check, function(i, df) {
 			if(doc[df.fieldname] && restrictions[df.options].indexOf(doc[df.fieldname])===-1) {
 				has_restricted_data = true;
diff --git a/frappe/public/js/frappe/model/sync.js b/frappe/public/js/frappe/model/sync.js
index 1bc78e9bdc..830e7e2c56 100644
--- a/frappe/public/js/frappe/model/sync.js
+++ b/frappe/public/js/frappe/model/sync.js
@@ -22,10 +22,7 @@ $.extend(frappe.model, {
 					frappe.provide("frappe.model.docinfo." + d.doctype + "." + d.name);	
 				}
 
-				if(!locals[d.doctype])
-					locals[d.doctype] = {};
-
-				locals[d.doctype][d.name] = d;
+				frappe.model.add_to_locals(d);
 				d.__last_sync_on = new Date();
 				
 				if(d.doctype==="DocType") {
@@ -67,5 +64,18 @@ $.extend(frappe.model, {
 		
 		return r.docs;
 	},
+	add_to_locals: function(doc) {
+		if(!locals[doc.doctype]) locals[doc.doctype] = {};
+		locals[doc.doctype][doc.name] = doc;
+		if(!doc.parent) {
+			$.each(doc, function(key, value) {
+				if($.isArray(value)) {
+					$.each(value, function(i, d) {
+						frappe.model.add_to_locals(d);
+					});
+				}
+			});
+		}
+	}
 	
 });
diff --git a/frappe/public/js/frappe/model/workflow.js b/frappe/public/js/frappe/model/workflow.js
index c0b83deae9..1b7d6ada52 100644
--- a/frappe/public/js/frappe/model/workflow.js
+++ b/frappe/public/js/frappe/model/workflow.js
@@ -7,7 +7,7 @@ frappe.workflow = {
 	state_fields: {},
 	workflows: {},
 	setup: function(doctype) {
-		var wf = frappe.model.get("Workflow", {document_type: doctype});
+		var wf = frappe.get_list("Workflow", {document_type: doctype});
 		if(wf.length) {
 			frappe.workflow.workflows[doctype] = wf[0];
 			frappe.workflow.state_fields[doctype] = wf[0].workflow_state_field;
@@ -27,14 +27,14 @@ frappe.workflow = {
 	},
 	get_transitions: function(doctype, state) {
 		frappe.workflow.setup(doctype);
-		return frappe.model.get_children(frappe.workflow.workflows[doctype], "workflow_transitions", {state:state});
+		return frappe.get_children(frappe.workflow.workflows[doctype], "workflow_transitions", {state:state});
 	},
 	get_document_state: function(doctype, state) {
 		frappe.workflow.setup(doctype);
-		return frappe.model.get_children(frappe.workflow.workflows[doctype], "workflow_document_states", {state:state})[0];
+		return frappe.get_children(frappe.workflow.workflows[doctype], "workflow_document_states", {state:state})[0];
 	},
 	get_next_state: function(doctype, state, action) {
-		return frappe.model.get_children(frappe.workflow.workflows[doctype], "workflow_transitions", {
+		return frappe.get_children(frappe.workflow.workflows[doctype], "workflow_transitions", {
 			state:state, action:action})[0].next_state;
 	},
  	is_read_only: function(doctype, name) {
diff --git a/frappe/public/js/frappe/print/print_table.js b/frappe/public/js/frappe/print/print_table.js
index d2612bb564..4433f4581d 100644
--- a/frappe/public/js/frappe/print/print_table.js
+++ b/frappe/public/js/frappe/print/print_table.js
@@ -28,8 +28,7 @@ frappe.print.Table = Class.extend({
 		}));
 	},
 	get_data: function() {
-		var children = frappe.model.get(this.tabletype, {
-			parent:this.docname, parenttype:this.doctype, parentfield: this.fieldname})
+		var children = frappe.get_doc(this.doctype, this.docname)[this.fieldname] || [];
 				
 		var data = []
 		for(var i=0; i<children.length; i++) {
diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js
index 259d10f67a..4f37782dd6 100644
--- a/frappe/public/js/frappe/request.js
+++ b/frappe/public/js/frappe/request.js
@@ -16,7 +16,7 @@ frappe.call = function(opts) {
 	} else if(opts.doc) {
 		$.extend(args, {
 			cmd: "runserverobj",
-			docs: frappe.model.get_doc(opts.doc.doctype, opts.doc.name),
+			docs: frappe.get_doc(opts.doc.doctype, opts.doc.name),
 			method: opts.method,
 			args: opts.args,
 		});	
diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index 3328208ca2..b6c9105429 100644
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -13,7 +13,7 @@ frappe.views.CommunicationList = Class.extend({
 		}
 				
 		if(!this.list)
-			this.list = frappe.model.get("Communication", {"parenttype": this.doc.doctype, "parent": this.doc.name});
+			this.list = frappe.get_list("Communication", {"parenttype": this.doc.doctype, "parent": this.doc.name});
 				
 		var sortfn = function (a, b) { return (b.creation > a.creation) ? 1 : -1; }
 		this.list = this.list.sort(sortfn);
diff --git a/frappe/public/js/frappe/views/listview.js b/frappe/public/js/frappe/views/listview.js
index 46b7a11528..4677e59cdd 100644
--- a/frappe/public/js/frappe/views/listview.js
+++ b/frappe/public/js/frappe/views/listview.js
@@ -43,7 +43,7 @@ frappe.views.ListView = Class.extend({
 			'modified_by'], function(i, fieldname) { add_field(fieldname); })
 
 		// add title field
-		var meta = frappe.model.get("DocType", this.doctype)[0];
+		var meta = frappe.get_doc("DocType", this.doctype);
 		if(meta.title_field) {
 			this.title_field = meta.title_field;
 			add_field(meta.title_field);
@@ -56,8 +56,8 @@ frappe.views.ListView = Class.extend({
 			this.stats.push(this.workflow_state_fieldname);
 		}
 				
-		$.each(frappe.model.get("DocField", {"parent":this.doctype, "in_list_view":1}), function(i,d) {
-			if(frappe.perm.has_perm(me.doctype, d.permlevel, "read")) {
+		$.each(meta.fields, function(i,d) {
+			if(d.in_list_view && frappe.perm.has_perm(me.doctype, d.permlevel, "read")) {
 				if(d.fieldtype=="Image" && d.options) {
 					add_field(d.options);
 				} else {
@@ -103,8 +103,8 @@ frappe.views.ListView = Class.extend({
 		var overridden = $.map(this.settings.add_columns || [], function(d) { 
 			return d.content;
 		});
-		var docfields_in_list_view = frappe.model.get("DocField", {"parent":this.doctype, 
-			"in_list_view":1}).sort(function(a, b) { return a.idx - b.idx })
+		var docfields_in_list_view = frappe.get_children("DocType", this.doctype, "fields", 
+			{"in_list_view":1}).sort(function(a, b) { return a.idx - b.idx })
 		
 		$.each(docfields_in_list_view, function(i,d) {
 			if(in_list(overridden, d.fieldname) || d.fieldname === me.title_field) {
diff --git a/frappe/public/js/frappe/views/query_report.js b/frappe/public/js/frappe/views/query_report.js
index 0d07129c3b..bb4cfdf8ce 100644
--- a/frappe/public/js/frappe/views/query_report.js
+++ b/frappe/public/js/frappe/views/query_report.js
@@ -93,7 +93,7 @@ frappe.views.QueryReport = Class.extend({
 				me.appframe.set_title(frappe._("Query Report")+": " + frappe._(me.report_name));
 				
 				frappe.model.with_doc("Report", me.report_name, function() {
-					me.report_doc = frappe.model.get_doc("Report", me.report_name);
+					me.report_doc = frappe.get_doc("Report", me.report_name);
 					frappe.model.with_doctype(me.report_doc.ref_doctype, function() {
 						if(!frappe.query_reports[me.report_name]) {
 							return frappe.call({
diff --git a/frappe/public/js/frappe/views/reportview.js b/frappe/public/js/frappe/views/reportview.js
index d692fb36b9..94b64c47e3 100644
--- a/frappe/public/js/frappe/views/reportview.js
+++ b/frappe/public/js/frappe/views/reportview.js
@@ -27,7 +27,7 @@ frappe.views.ReportViewPage = Class.extend({
 			if(me.docname) {
 				frappe.model.with_doc('Report', me.docname, function(r) {
 					me.page.reportview.set_columns_and_filters(
-						JSON.parse(frappe.model.get("Report", me.docname)[0].json));
+						JSON.parse(frappe.get_doc("Report", me.docname).json));
 					me.page.reportview.set_route_filters();
 					me.page.reportview.run();
 				});
diff --git a/frappe/public/js/legacy/form.js b/frappe/public/js/legacy/form.js
index a990adc070..d4b50838d9 100644
--- a/frappe/public/js/legacy/form.js
+++ b/frappe/public/js/legacy/form.js
@@ -212,7 +212,7 @@ _f.Frm.prototype.watch_model_updates = function() {
 	})
 	
 	// on table fields
-	$.each(frappe.model.get("DocField", {fieldtype:"Table", parent: me.doctype}), function(i, df) {
+	$.each(frappe.get_children("DocType", me.doctype, "fields", {fieldtype:"Table"}), function(i, df) {
 		frappe.model.on(df.options, "*", function(fieldname, value, doc) {
 			if(doc.parent===me.docname && doc.parentfield===df.fieldname) {
 				me.dirty();
@@ -306,7 +306,7 @@ _f.Frm.prototype.rename_notify = function(dt, old, name) {
 // SETUP
 
 _f.Frm.prototype.setup_meta = function(doctype) {
-	this.meta = frappe.model.get_doc('DocType',this.doctype);
+	this.meta = frappe.get_doc('DocType',this.doctype);
 	this.perm = frappe.perm.get_perm(this.doctype); // for create
 	if(this.meta.istable) { this.meta.in_dialog = 1 }
 }
@@ -366,7 +366,7 @@ _f.Frm.prototype.refresh = function(docname) {
 		this.read_only = frappe.workflow.is_read_only(this.doctype, this.docname);
 
 		// set the doc
-		this.doc = frappe.model.get_doc(this.doctype, this.docname);	  
+		this.doc = frappe.get_doc(this.doctype, this.docname);	  
 		
 		// check if doctype is already open
 		if (!this.opendocs[this.docname]) {
diff --git a/frappe/public/js/legacy/print_format.js b/frappe/public/js/legacy/print_format.js
index 6fc9a40174..e7bda243de 100644
--- a/frappe/public/js/legacy/print_format.js
+++ b/frappe/public/js/legacy/print_format.js
@@ -420,7 +420,7 @@ $.extend(_p, {
 		// Get doctype, docname, layout for a doctype
 		var docname = cur_frm.docname;
 		var doctype = cur_frm.doctype;
-		var data = getchildren('DocField', doctype, 'fields', 'DocType');
+		var data = frappe.get_children("DocType", doctype, "fields");
 		var layout = _p.add_layout(doctype);
 		this.pf_list = [layout];
 		var me = this;
diff --git a/frappe/website/doctype/web_page/web_page.py b/frappe/website/doctype/web_page/web_page.py
index 550605e67a..fefcecb3cf 100644
--- a/frappe/website/doctype/web_page/web_page.py
+++ b/frappe/website/doctype/web_page/web_page.py
@@ -7,7 +7,5 @@ from frappe.website.website_generator import WebsiteGenerator
 from frappe.website.utils import cleanup_page_name
 from frappe.utils import cint
 
-class DocType(WebsiteGenerator):
-	def __init__(self, doc, doclist):
-		self.doc, self.doclist = doc, doclist
-		self.save_versions = True
\ No newline at end of file
+class WebsitePage(WebsiteGenerator):
+	save_versions = True
diff --git a/frappe/website/doctype/website_settings/website_settings.js b/frappe/website/doctype/website_settings/website_settings.js
index 4db6bd9e05..aecc9615a1 100644
--- a/frappe/website/doctype/website_settings/website_settings.js
+++ b/frappe/website/doctype/website_settings/website_settings.js
@@ -31,7 +31,7 @@ $.extend(cur_frm.cscript, {
 	},
 	
 	label: function(doc, cdt, cdn) {
-		var item = frappe.model.get_doc(cdt, cdn);
+		var item = frappe.get_doc(cdt, cdn);
 		if(item.parentfield === "top_bar_items") {
 			this.set_parent_label_options();
 		}
@@ -56,7 +56,7 @@ $.extend(cur_frm.cscript, {
 	
 	// get labels of parent items
 	get_parent_options: function(table_field) {
-		var items = getchildren('Top Bar Item', cur_frm.doc.name, table_field);
+		var items = cur_frm.doc[table_field] || [];
 		var main_items = [''];
 		for(var i in items) {
 			var d = items[i];
diff --git a/frappe/widgets/form/load.py b/frappe/widgets/form/load.py
index 28e7497c11..298aaf005a 100644
--- a/frappe/widgets/form/load.py
+++ b/frappe/widgets/form/load.py
@@ -68,8 +68,9 @@ def getdoctype(doctype, with_parent=False, cached_timestamp=None):
 
 def get_meta_bundle(doctype):
 	bundle = [frappe.widgets.form.meta.get_meta(doctype)]
-	for df in bundle[0].get_table_fields():
-		bundle.append(frappe.widgets.form.meta.get_meta(df.options))
+	for df in bundle[0].fields:
+		if df.fieldtype=="Table":
+			bundle.append(frappe.widgets.form.meta.get_meta(df.options))
 	return bundle
 
 def get_docinfo(doctype, name):
diff --git a/frappe/widgets/form/save.py b/frappe/widgets/form/save.py
index d8430b5c1a..32c51a5e23 100644
--- a/frappe/widgets/form/save.py
+++ b/frappe/widgets/form/save.py
@@ -2,27 +2,25 @@
 # MIT License. See license.txt 
 
 from __future__ import unicode_literals
-import frappe
+import frappe, json
 
 @frappe.whitelist()
 def savedocs():
 	"""save / submit / update doclist"""
 	try:
-		wrapper = frappe.bean()
-		wrapper.from_compressed(frappe.form_dict.docs, frappe.form_dict.docname)
+		doc = frappe.get_doc(json.loads(frappe.form_dict.doc))
 
 		# action
-		action = frappe.form_dict.action
-		if action=='Update': action='update_after_submit'
+		doc.docstatus = {"Save":0, "Submit": 1, "Update": 1, "Cancel": 2}[frappe.form_dict.action]
 		try:
-			getattr(wrapper, action.lower())()
+			doc.save()
 		except NameError, e:
 			frappe.msgprint(frappe._("Name Exists"))
 			raise
 
 		# update recent documents
-		frappe.user.update_recent(wrapper.doc.doctype, wrapper.doc.name)
-		send_updated_docs(wrapper)
+		frappe.user.update_recent(doc.doctype, doc.name)
+		send_updated_docs(doc)
 
 	except Exception, e:
 		frappe.msgprint(frappe._('Did not save'))
@@ -33,20 +31,20 @@ def savedocs():
 def cancel(doctype=None, name=None):
 	"""cancel a doclist"""
 	try:
-		wrapper = frappe.bean(doctype, name)
-		wrapper.cancel()
-		send_updated_docs(wrapper)
+		doc = frappe.get_doc(doctype, name)
+		doc.cancel()
+		send_updated_docs(doc)
 		
 	except Exception, e:
 		frappe.errprint(frappe.utils.get_traceback())
 		frappe.msgprint(frappe._("Did not cancel"))
 		raise
 		
-def send_updated_docs(wrapper):
+def send_updated_docs(doc):
 	from load import get_docinfo
-	get_docinfo(wrapper.doc.doctype, wrapper.doc.name)
+	get_docinfo(doc.doctype, doc.name)
 	
-	frappe.response['main_doc_name'] = wrapper.doc.name
-	frappe.response['doctype'] = wrapper.doc.doctype
-	frappe.response['docname'] = wrapper.doc.name
-	frappe.response['docs'] = wrapper.doclist
\ No newline at end of file
+	frappe.response['main_doc_name'] = doc.name
+	frappe.response['doctype'] = doc.doctype
+	frappe.response['docname'] = doc.name
+	frappe.response.docs.append(doc)
\ No newline at end of file

From e69de80cfc89fb6fb9a08ff60811df4e6f56fb4d Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 27 Mar 2014 16:12:32 +0530
Subject: [PATCH 3/5] #478

---
 frappe/core/doctype/bulk_email/bulk_email.py  |  7 ++--
 frappe/core/doctype/comment/comment.py        |  6 +--
 .../doctype/communication/communication.py    |  8 ++--
 .../doctype/control_panel/control_panel.py    |  7 ++--
 .../core/doctype/custom_field/custom_field.py |  6 +--
 .../doctype/custom_script/custom_script.py    |  6 +--
 .../doctype/customize_form/customize_form.py  | 12 +++---
 .../customize_form_field.py                   |  7 ++--
 .../default_home_page/default_home_page.py    |  7 ++--
 .../core/doctype/defaultvalue/defaultvalue.py |  6 +--
 frappe/core/doctype/docfield/docfield.py      |  7 ++--
 frappe/core/doctype/docperm/docperm.py        |  7 ++--
 frappe/core/doctype/doctype/doctype.py        |  2 +-
 .../core/doctype/doctype/doctype_template.py  |  6 +--
 frappe/core/doctype/event/event.py            |  8 ----
 frappe/core/doctype/event_role/event_role.py  |  7 ++--
 frappe/core/doctype/event_user/event_user.py  |  7 ++--
 frappe/core/doctype/file_data/file_data.py    |  6 +--
 .../core/doctype/letter_head/letter_head.py   |  7 ++--
 frappe/core/doctype/module_def/module_def.py  |  7 ++--
 .../notification_count/notification_count.py  |  6 +--
 .../outgoing_email_settings.py                |  6 +--
 frappe/core/doctype/page_role/page_role.py    |  7 ++--
 frappe/core/doctype/patch_log/patch_log.py    |  7 ++--
 .../core/doctype/print_format/print_format.py |  4 +-
 .../property_setter/property_setter.py        |  6 +--
 frappe/core/doctype/report/report.py          |  4 +-
 frappe/core/doctype/role/role.py              |  7 ++--
 .../doctype/scheduler_log/scheduler_log.py    |  7 ++--
 .../social_login_keys/social_login_keys.py    |  7 ++--
 frappe/core/doctype/tag/tag.py                |  7 ++--
 frappe/core/doctype/todo/todo.py              |  6 +--
 frappe/core/doctype/user/user.py              |  9 ++---
 frappe/core/doctype/userrole/userrole.py      |  6 +--
 frappe/core/doctype/version/version.py        |  6 +--
 frappe/core/doctype/workflow/workflow.py      |  6 +--
 .../workflow_action/workflow_action.py        |  7 ++--
 .../workflow_document_state.py                |  7 ++--
 .../doctype/workflow_state/workflow_state.py  |  7 ++--
 .../workflow_transition.py                    |  7 ++--
 frappe/model/__init__.py                      |  4 +-
 frappe/model/base_document.py                 | 18 +++++++--
 frappe/model/bean.py                          |  5 +--
 frappe/model/controller.py                    |  2 +-
 frappe/model/doc.py                           | 39 +------------------
 frappe/model/document.py                      | 22 +++++++++--
 frappe/utils/nestedset.py                     |  3 +-
 .../about_us_settings/about_us_settings.py    |  6 +--
 .../about_us_team_member.py                   |  7 ++--
 .../doctype/blog_category/blog_category.py    |  4 +-
 frappe/website/doctype/blog_post/blog_post.py |  4 +-
 .../doctype/blog_settings/blog_settings.py    |  6 +--
 frappe/website/doctype/blogger/blogger.py     |  6 +--
 .../company_history/company_history.py        |  7 ++--
 .../contact_us_settings.py                    |  6 +--
 frappe/website/doctype/post/post.py           |  6 +--
 .../doctype/style_settings/style_settings.py  |  6 +--
 .../doctype/top_bar_item/top_bar_item.py      |  7 ++--
 frappe/website/doctype/user_vote/user_vote.py |  6 +--
 .../doctype/website_group/website_group.py    |  4 +-
 .../doctype/website_route/website_route.py    |  4 +-
 .../website_route_permission.py               |  6 +--
 .../doctype/website_script/website_script.py  |  6 +--
 .../website_settings/website_settings.py      |  6 +--
 .../website_slideshow/website_slideshow.py    |  6 +--
 .../website_slideshow_item.py                 |  7 ++--
 .../website_template/website_template.py      |  6 +--
 67 files changed, 231 insertions(+), 243 deletions(-)

diff --git a/frappe/core/doctype/bulk_email/bulk_email.py b/frappe/core/doctype/bulk_email/bulk_email.py
index a48f49f2a7..3aa353233a 100644
--- a/frappe/core/doctype/bulk_email/bulk_email.py
+++ b/frappe/core/doctype/bulk_email/bulk_email.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+from frappe.model.document import Document
+
+class BulkEmail(Document):
+	pass
\ No newline at end of file
diff --git a/frappe/core/doctype/comment/comment.py b/frappe/core/doctype/comment/comment.py
index 145625131a..bfff8da333 100644
--- a/frappe/core/doctype/comment/comment.py
+++ b/frappe/core/doctype/comment/comment.py
@@ -5,9 +5,9 @@ from __future__ import unicode_literals
 import frappe, json
 from frappe.website.render import clear_cache
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+from frappe.model.document import Document
+
+class Comment(Document):
 		
 	def validate(self):
 		if frappe.db.sql("""select count(*) from tabComment where comment_doctype=%s
diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py
index 42b1d8d43a..28d55c200c 100644
--- a/frappe/core/doctype/communication/communication.py
+++ b/frappe/core/doctype/communication/communication.py
@@ -12,11 +12,9 @@ from frappe.utils.email_lib.email_body import get_email
 from frappe.utils.email_lib.smtp import send
 from frappe.utils import scrub_urls
 
-class DocType():
-	def __init__(self, doc, doclist=None):
-		self.doc = doc
-		self.doclist = doclist
-		
+from frappe.model.document import Document
+
+class Communication(Document):
 	def get_parent_bean(self):
 		return frappe.bean(self.doc.parenttype, self.doc.parent)
 		
diff --git a/frappe/core/doctype/control_panel/control_panel.py b/frappe/core/doctype/control_panel/control_panel.py
index 673b1a33be..d4de2f70fd 100644
--- a/frappe/core/doctype/control_panel/control_panel.py
+++ b/frappe/core/doctype/control_panel/control_panel.py
@@ -7,10 +7,9 @@ import frappe
 from frappe import form, msgprint
 import frappe.defaults
 
-class DocType:
-	def __init__(self, doc, doclist):
-		self.doc = doc
-		self.doclist = doclist
+from frappe.model.document import Document
+
+class ControlPanel(Document):
 
 	def on_update(self):
 		# clear cache on save
diff --git a/frappe/core/doctype/custom_field/custom_field.py b/frappe/core/doctype/custom_field/custom_field.py
index e2520f0425..04f52e762d 100644
--- a/frappe/core/doctype/custom_field/custom_field.py
+++ b/frappe/core/doctype/custom_field/custom_field.py
@@ -6,9 +6,9 @@ import frappe
 from frappe.utils import cint, cstr
 from frappe import _
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+from frappe.model.document import Document
+
+class CustomField(Document):
 		
 	def autoname(self):
 		self.set_fieldname()
diff --git a/frappe/core/doctype/custom_script/custom_script.py b/frappe/core/doctype/custom_script/custom_script.py
index 6907e986b7..d2be1c8a6d 100644
--- a/frappe/core/doctype/custom_script/custom_script.py
+++ b/frappe/core/doctype/custom_script/custom_script.py
@@ -4,9 +4,9 @@ from __future__ import unicode_literals
 import frappe
 from frappe.utils import cstr
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+from frappe.model.document import Document
+
+class CustomScript(Document):
 		
 	def autoname(self):
 		self.doc.name = self.doc.dt + "-" + self.doc.script_type
diff --git a/frappe/core/doctype/customize_form/customize_form.py b/frappe/core/doctype/customize_form/customize_form.py
index 5401135212..82ac597d97 100644
--- a/frappe/core/doctype/customize_form/customize_form.py
+++ b/frappe/core/doctype/customize_form/customize_form.py
@@ -9,7 +9,9 @@ from __future__ import unicode_literals
 import frappe, json
 from frappe.utils import cstr
 
-class DocType:
+from frappe.model.document import Document
+
+class CustomizeForm(Document):
 	def __init__(self, doc, doclist=[]):
 		self.doc, self.doclist = doc, doclist
 		self.doctype_properties = [
@@ -57,12 +59,10 @@ class DocType:
 		self.clear()
 
 		if self.doc.doc_type:
-			from frappe.model.doc import addchild
-
+			
 			for d in self.get_ref_doclist():
 				if d.doctype=='DocField':
-					new = addchild(self.doc, 'fields', 'Customize Form Field', 
-						self.doclist)
+					new = self.doc.append('fields', {})
 					self.set(
 						{
 							'list': self.docfield_properties,
@@ -94,7 +94,7 @@ class DocType:
 			Clear fields in the doc
 		"""
 		# Clear table before adding new doctype's fields
-		self.doclist = self.doc.clear_table(self.doclist, 'fields')
+		self.set('fields', [])
 		self.set({ 'list': self.doctype_properties, 'value': None })
 	
 		
diff --git a/frappe/core/doctype/customize_form_field/customize_form_field.py b/frappe/core/doctype/customize_form_field/customize_form_field.py
index a48f49f2a7..4d2118a4a8 100644
--- a/frappe/core/doctype/customize_form_field/customize_form_field.py
+++ b/frappe/core/doctype/customize_form_field/customize_form_field.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+from frappe.model.document import Document
+
+class CustomizeFormField(Document):
+	pass
\ No newline at end of file
diff --git a/frappe/core/doctype/default_home_page/default_home_page.py b/frappe/core/doctype/default_home_page/default_home_page.py
index a48f49f2a7..9993435b1a 100644
--- a/frappe/core/doctype/default_home_page/default_home_page.py
+++ b/frappe/core/doctype/default_home_page/default_home_page.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+from frappe.model.document import Document
+
+class DefaultHomePage(Document):
+	pass
\ No newline at end of file
diff --git a/frappe/core/doctype/defaultvalue/defaultvalue.py b/frappe/core/doctype/defaultvalue/defaultvalue.py
index ed3b873f7d..2099698b54 100644
--- a/frappe/core/doctype/defaultvalue/defaultvalue.py
+++ b/frappe/core/doctype/defaultvalue/defaultvalue.py
@@ -4,9 +4,9 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+from frappe.model.document import Document
+
+class Defaultvalue(Document):
 		
 def on_doctype_update():
 	if not frappe.db.sql("""show index from `tabDefaultValue` 
diff --git a/frappe/core/doctype/docfield/docfield.py b/frappe/core/doctype/docfield/docfield.py
index a48f49f2a7..118a032b23 100644
--- a/frappe/core/doctype/docfield/docfield.py
+++ b/frappe/core/doctype/docfield/docfield.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+from frappe.model.document import Document
+
+class DocField(Document):
+	pass
diff --git a/frappe/core/doctype/docperm/docperm.py b/frappe/core/doctype/docperm/docperm.py
index a48f49f2a7..00bffbfe52 100644
--- a/frappe/core/doctype/docperm/docperm.py
+++ b/frappe/core/doctype/docperm/docperm.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+from frappe.model.document import Document
+
+class DocPerm(Document):
+	pass
\ No newline at end of file
diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py
index 2c05017e67..9013ce8474 100644
--- a/frappe/core/doctype/doctype/doctype.py
+++ b/frappe/core/doctype/doctype/doctype.py
@@ -134,7 +134,7 @@ class DocType(Document):
 			with open(pypath, 'w') as pyfile:
 				with open(os.path.join(get_module_path("core"), "doctype", "doctype", 
 					"doctype_template.py"), 'r') as srcfile:
-					pyfile.write(srcfile.read().format(app_publisher=app_publisher))
+					pyfile.write(srcfile.read().format(app_publisher=app_publisher, classname=self.name.replace(" ", "")))
 	
 	def make_amendable(self):
 		"""
diff --git a/frappe/core/doctype/doctype/doctype_template.py b/frappe/core/doctype/doctype/doctype_template.py
index bb4f563ecf..369bd592d8 100644
--- a/frappe/core/doctype/doctype/doctype_template.py
+++ b/frappe/core/doctype/doctype/doctype_template.py
@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe
+from frappe.model.document import Document
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+class {classname}(Document):
+	pass
\ No newline at end of file
diff --git a/frappe/core/doctype/event/event.py b/frappe/core/doctype/event/event.py
index 9e99b08f0a..31a2dabf82 100644
--- a/frappe/core/doctype/event/event.py
+++ b/frappe/core/doctype/event/event.py
@@ -14,14 +14,6 @@ class Event(Document):
 	def validate(self):
 		if self.starts_on and self.ends_on and self.starts_on > self.ends_on:
 			frappe.msgprint(frappe._("Event End must be after Start"), raise_exception=True)
-		
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
-		
-	def validate(self):
-		if self.doc.starts_on and self.doc.ends_on and self.doc.starts_on > self.doc.ends_on:
-			frappe.msgprint(frappe._("Event End must be after Start"), raise_exception=True)
 			
 def get_permission_query_conditions():
 	return """(tabEvent.event_type='Public' or tabEvent.owner='%(user)s'
diff --git a/frappe/core/doctype/event_role/event_role.py b/frappe/core/doctype/event_role/event_role.py
index a48f49f2a7..cb24e5f51e 100644
--- a/frappe/core/doctype/event_role/event_role.py
+++ b/frappe/core/doctype/event_role/event_role.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+from frappe.model.document import Document
+
+class EventRole(Document):
+	pass
\ No newline at end of file
diff --git a/frappe/core/doctype/event_user/event_user.py b/frappe/core/doctype/event_user/event_user.py
index a48f49f2a7..3d4591739b 100644
--- a/frappe/core/doctype/event_user/event_user.py
+++ b/frappe/core/doctype/event_user/event_user.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+from frappe.model.document import Document
+
+class EventUser(Document):
+	pass
\ No newline at end of file
diff --git a/frappe/core/doctype/file_data/file_data.py b/frappe/core/doctype/file_data/file_data.py
index 242f32d8e7..ede5dd57e6 100644
--- a/frappe/core/doctype/file_data/file_data.py
+++ b/frappe/core/doctype/file_data/file_data.py
@@ -10,11 +10,9 @@ naming for same name files: file.gif, file-1.gif, file-2.gif etc
 
 import frappe, frappe.utils, os
 from frappe import conf
+from frappe.model.document import Document
 
-class DocType():
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
-		
+class FileData(Document):
 	def before_insert(self):
 		frappe.local.rollback_observers.append(self)
 	
diff --git a/frappe/core/doctype/letter_head/letter_head.py b/frappe/core/doctype/letter_head/letter_head.py
index 9e1c0a6f32..f004a73804 100755
--- a/frappe/core/doctype/letter_head/letter_head.py
+++ b/frappe/core/doctype/letter_head/letter_head.py
@@ -5,10 +5,9 @@ from __future__ import unicode_literals
 import frappe
 
 
-class DocType:
-	def __init__(self, doc, doclist=[]):
-		self.doc = doc
-		self.doclist = doclist
+from frappe.model.document import Document
+
+class LetterHead(Document):
 	
 	def validate(self):
 		self.set_as_default()
diff --git a/frappe/core/doctype/module_def/module_def.py b/frappe/core/doctype/module_def/module_def.py
index a48f49f2a7..b8b6fab465 100644
--- a/frappe/core/doctype/module_def/module_def.py
+++ b/frappe/core/doctype/module_def/module_def.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+from frappe.model.document import Document
+
+class ModuleDef(Document):
+	pass
\ No newline at end of file
diff --git a/frappe/core/doctype/notification_count/notification_count.py b/frappe/core/doctype/notification_count/notification_count.py
index 21d81c4247..cd58e9aa46 100644
--- a/frappe/core/doctype/notification_count/notification_count.py
+++ b/frappe/core/doctype/notification_count/notification_count.py
@@ -6,9 +6,9 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+from frappe.model.document import Document
+
+class NotificationCount(Document):
 
 @frappe.whitelist()
 def get_notifications():
diff --git a/frappe/core/doctype/outgoing_email_settings/outgoing_email_settings.py b/frappe/core/doctype/outgoing_email_settings/outgoing_email_settings.py
index e37bbe22a5..2d10488761 100644
--- a/frappe/core/doctype/outgoing_email_settings/outgoing_email_settings.py
+++ b/frappe/core/doctype/outgoing_email_settings/outgoing_email_settings.py
@@ -6,9 +6,9 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+from frappe.model.document import Document
+
+class OutgoingEmailSettings(Document):
 		
 	def validate(self):
 		self.doc.encode()
diff --git a/frappe/core/doctype/page_role/page_role.py b/frappe/core/doctype/page_role/page_role.py
index a48f49f2a7..9752238bb2 100644
--- a/frappe/core/doctype/page_role/page_role.py
+++ b/frappe/core/doctype/page_role/page_role.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+from frappe.model.document import Document
+
+class PageRole(Document):
+	pass
\ No newline at end of file
diff --git a/frappe/core/doctype/patch_log/patch_log.py b/frappe/core/doctype/patch_log/patch_log.py
index cb42e2eea2..18a3dc2aed 100644
--- a/frappe/core/doctype/patch_log/patch_log.py
+++ b/frappe/core/doctype/patch_log/patch_log.py
@@ -6,6 +6,7 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+from frappe.model.document import Document
+
+class PatchLog(Document):
+	pass
\ No newline at end of file
diff --git a/frappe/core/doctype/print_format/print_format.py b/frappe/core/doctype/print_format/print_format.py
index 637adb3d11..e5787c6584 100644
--- a/frappe/core/doctype/print_format/print_format.py
+++ b/frappe/core/doctype/print_format/print_format.py
@@ -8,7 +8,9 @@ from frappe.modules import get_doc_path
 
 standard_format = "templates/print_formats/standard.html"
 
-class DocType:
+from frappe.model.document import Document
+
+class PrintFormat(Document):
 	def __init__(self, d, dl):
 		self.doc, self.doclist = d,dl
 
diff --git a/frappe/core/doctype/property_setter/property_setter.py b/frappe/core/doctype/property_setter/property_setter.py
index 9e19f63ec5..e72b5ec1ed 100644
--- a/frappe/core/doctype/property_setter/property_setter.py
+++ b/frappe/core/doctype/property_setter/property_setter.py
@@ -4,9 +4,9 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+from frappe.model.document import Document
+
+class PropertySetter(Document):
 
 	def autoname(self):
 		self.doc.name = self.doc.doc_type + "-" \
diff --git a/frappe/core/doctype/report/report.py b/frappe/core/doctype/report/report.py
index 881949ff0e..f130efe581 100644
--- a/frappe/core/doctype/report/report.py
+++ b/frappe/core/doctype/report/report.py
@@ -5,7 +5,9 @@ from __future__ import unicode_literals
 import frappe
 from frappe import conf, _
 
-class DocType:
+from frappe.model.document import Document
+
+class Report(Document):
 	def __init__(self, doc, doclist):
 		self.doc, self.doclist = doc, doclist
 		
diff --git a/frappe/core/doctype/role/role.py b/frappe/core/doctype/role/role.py
index a48f49f2a7..219bed3579 100644
--- a/frappe/core/doctype/role/role.py
+++ b/frappe/core/doctype/role/role.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+from frappe.model.document import Document
+
+class Role(Document):
+	pass
\ No newline at end of file
diff --git a/frappe/core/doctype/scheduler_log/scheduler_log.py b/frappe/core/doctype/scheduler_log/scheduler_log.py
index cb42e2eea2..58185eb867 100644
--- a/frappe/core/doctype/scheduler_log/scheduler_log.py
+++ b/frappe/core/doctype/scheduler_log/scheduler_log.py
@@ -6,6 +6,7 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+from frappe.model.document import Document
+
+class SchedulerLog(Document):
+	pass
\ No newline at end of file
diff --git a/frappe/core/doctype/social_login_keys/social_login_keys.py b/frappe/core/doctype/social_login_keys/social_login_keys.py
index cb42e2eea2..1a6b2389e0 100644
--- a/frappe/core/doctype/social_login_keys/social_login_keys.py
+++ b/frappe/core/doctype/social_login_keys/social_login_keys.py
@@ -6,6 +6,7 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+from frappe.model.document import Document
+
+class SocialLoginKeys(Document):
+	pass
\ No newline at end of file
diff --git a/frappe/core/doctype/tag/tag.py b/frappe/core/doctype/tag/tag.py
index a48f49f2a7..668d620f78 100644
--- a/frappe/core/doctype/tag/tag.py
+++ b/frappe/core/doctype/tag/tag.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+from frappe.model.document import Document
+
+class Tag(Document):
+	pass
\ No newline at end of file
diff --git a/frappe/core/doctype/todo/todo.py b/frappe/core/doctype/todo/todo.py
index 2203546c0a..9c9639df94 100644
--- a/frappe/core/doctype/todo/todo.py
+++ b/frappe/core/doctype/todo/todo.py
@@ -4,9 +4,9 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+from frappe.model.document import Document
+
+class Todo(Document):
 	
 	def validate(self):
 		if self.doc.is_new():
diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index 1f8b9be91e..88fdc0c7d7 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -9,10 +9,9 @@ from frappe.auth import _update_password
 
 STANDARD_USERS = ("Guest", "Administrator")
 
-class DocType:
-	def __init__(self, doc, doclist):
-		self.doc = doc
-		self.doclist = doclist
+from frappe.model.document import Document
+
+class User(Document):
 		
 	def autoname(self):
 		"""set name as email id"""
@@ -49,7 +48,7 @@ class DocType:
 	def add_system_manager_role(self):
 		# if adding system manager, do nothing
 		if not cint(self.doc.enabled) or ("System Manager" in [user_role.role for user_role in
-				self.doclist.get({"parentfield": "user_roles"})]):
+				self.get("user_roles")]):
 			return
 		
 		if self.doc.user_type == "System User" and not self.get_other_system_managers():
diff --git a/frappe/core/doctype/userrole/userrole.py b/frappe/core/doctype/userrole/userrole.py
index 20f5e77cce..1b31f98aea 100644
--- a/frappe/core/doctype/userrole/userrole.py
+++ b/frappe/core/doctype/userrole/userrole.py
@@ -5,9 +5,9 @@ from __future__ import unicode_literals
 import frappe
 from frappe.utils import cint
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+from frappe.model.document import Document
+
+class Userrole(Document):
 		
 	def validate(self):
 		if cint(self.doc.fields.get("__islocal")) and frappe.db.exists("UserRole", {
diff --git a/frappe/core/doctype/version/version.py b/frappe/core/doctype/version/version.py
index edb6e2e185..ecf721d3b7 100644
--- a/frappe/core/doctype/version/version.py
+++ b/frappe/core/doctype/version/version.py
@@ -6,9 +6,9 @@
 from __future__ import unicode_literals
 import frappe, json
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+from frappe.model.document import Document
+
+class Version(Document):
 		
 @frappe.whitelist()
 def restore(version):
diff --git a/frappe/core/doctype/workflow/workflow.py b/frappe/core/doctype/workflow/workflow.py
index 9550d667d8..213dca2c02 100644
--- a/frappe/core/doctype/workflow/workflow.py
+++ b/frappe/core/doctype/workflow/workflow.py
@@ -4,9 +4,9 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+from frappe.model.document import Document
+
+class Workflow(Document):
 		
 	def validate(self):
 		self.set_active()
diff --git a/frappe/core/doctype/workflow_action/workflow_action.py b/frappe/core/doctype/workflow_action/workflow_action.py
index a48f49f2a7..3bf0ee4977 100644
--- a/frappe/core/doctype/workflow_action/workflow_action.py
+++ b/frappe/core/doctype/workflow_action/workflow_action.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+from frappe.model.document import Document
+
+class WorkflowAction(Document):
+	pass
\ No newline at end of file
diff --git a/frappe/core/doctype/workflow_document_state/workflow_document_state.py b/frappe/core/doctype/workflow_document_state/workflow_document_state.py
index a48f49f2a7..fc491ac941 100644
--- a/frappe/core/doctype/workflow_document_state/workflow_document_state.py
+++ b/frappe/core/doctype/workflow_document_state/workflow_document_state.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+from frappe.model.document import Document
+
+class WorkflowDocumentState(Document):
+	pass
\ No newline at end of file
diff --git a/frappe/core/doctype/workflow_state/workflow_state.py b/frappe/core/doctype/workflow_state/workflow_state.py
index a48f49f2a7..83eb8a4dc9 100644
--- a/frappe/core/doctype/workflow_state/workflow_state.py
+++ b/frappe/core/doctype/workflow_state/workflow_state.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+from frappe.model.document import Document
+
+class WorkflowState(Document):
+	pass
\ No newline at end of file
diff --git a/frappe/core/doctype/workflow_transition/workflow_transition.py b/frappe/core/doctype/workflow_transition/workflow_transition.py
index a48f49f2a7..69a04db9ee 100644
--- a/frappe/core/doctype/workflow_transition/workflow_transition.py
+++ b/frappe/core/doctype/workflow_transition/workflow_transition.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+from frappe.model.document import Document
+
+class WorkflowTransition(Document):
+	pass
\ No newline at end of file
diff --git a/frappe/model/__init__.py b/frappe/model/__init__.py
index 7dd9487f05..10554210bd 100644
--- a/frappe/model/__init__.py
+++ b/frappe/model/__init__.py
@@ -34,9 +34,9 @@ def copytables(srctype, src, srcfield, tartype, tar, tarfield, srcfields, tarfie
 	if not tarfields: 
 		tarfields = srcfields
 	l = []
-	data = frappe.model.doc.getchildren(src.name, srctype, srcfield)
+	data = src.get(srcfield)
 	for d in data:
-		newrow = frappe.model.doc.addchild(tar, tarfield, tartype)
+		newrow = tar.append(tarfield)
 		newrow.idx = d.idx
 	
 		for i in range(len(srcfields)):
diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index 4877ec97fb..3085ffbed0 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -33,9 +33,15 @@ class BaseDocument(object):
 	def get(self, key=None, filters=None, limit=None, default=None):
 		if key:
 			if filters:
-				return _filter(self.__dict__.get(key), filters, limit=limit)
+				value = _filter(self.__dict__.get(key), filters, limit=limit)
 			else:
-				return self.__dict__.get(key, default)
+				value = self.__dict__.get(key, default)
+			
+			if value is None and key in self.get_table_fields():
+				self.set(key, [])
+				value = self.__dict__.get(key)
+				
+			return value
 		else:
 			return self.__dict__
 				
@@ -48,11 +54,15 @@ class BaseDocument(object):
 
 		self.__dict__[key] = value
 			
-	def append(self, key, value):
+	def append(self, key, value=None):
+		if value==None:
+			value={}
 		if isinstance(value, dict):
 			if not self.get(key):
 				self.__dict__[key] = []
-			self.get(key).append(self._init_child(value, key))
+			value = self._init_child(value, key)
+			self.get(key).append(value)
+			return value
 		else:
 			raise ValueError
 			
diff --git a/frappe/model/bean.py b/frappe/model/bean.py
index c7e8ec9411..33e278b163 100644
--- a/frappe/model/bean.py
+++ b/frappe/model/bean.py
@@ -51,7 +51,6 @@ class Bean:
 		"""
 			Load doclist from dt
 		"""
-		from frappe.model.doc import getchildren
 
 		if not dt: dt = self.doc.doctype
 		if not dn: dn = self.doc.name
@@ -63,8 +62,6 @@ class Bean:
 
 		# load chilren
 		doclist = frappe.doclist([doc,])
-		for t in tablefields:
-			doclist += getchildren(doc.name, t[0], t[1], dt)
 
 		self.set_doclist(doclist)
 		
@@ -432,7 +429,7 @@ class Bean:
 				if df.doctype=="DocField" and df.reqd and df.parent==doc.doctype and df.fieldname!="naming_series":
 					msg = ""
 					if df.fieldtype == "Table":
-						if not self.doclist.get({"parentfield": df.fieldname}):
+						if not self.get(df.fieldname):
 							msg = _("Error") + ": " + _("Data missing in table") + ": " + _(df.label)
 				
 					elif doc.fields.get(df.fieldname) is None:
diff --git a/frappe/model/controller.py b/frappe/model/controller.py
index fd01646127..b44a580014 100644
--- a/frappe/model/controller.py
+++ b/frappe/model/controller.py
@@ -56,7 +56,7 @@ class DocListController(Document):
 			msgprint(msg, raise_exception=raise_exception or True)
 			
 	def validate_table_has_rows(self, parentfield, raise_exception=None):
-		if not self.doclist.get({"parentfield": parentfield}):
+		if not self.get(parentfield):
 			label = self.meta.get_label(parentfield)
 			msgprint(_("Error") + ": " + _(label) + " " + _("cannot be empty"),
 				raise_exception=raise_exception or EmptyTableError)
diff --git a/frappe/model/doc.py b/frappe/model/doc.py
index 144e3b6700..1e547fd122 100755
--- a/frappe/model/doc.py
+++ b/frappe/model/doc.py
@@ -545,29 +545,6 @@ class Document:
 			self.fields['__unsaved'] = 1
 		
 		return frappe.doclist(doclist)
-
-	def addchild(self, fieldname, childtype = '', doclist=None):
-		"""
-	      Returns a child record of the give `childtype`.
-	      
-	      * if local is set, it does not save the record
-	      * if doclist is passed, it append the record to the doclist
-		"""
-		from frappe.model.doc import Document
-		d = Document()
-		d.parent = self.name
-		d.parenttype = self.doctype
-		d.parentfield = fieldname
-		d.doctype = childtype
-		d.docstatus = 0;
-		d.name = ''
-		d.owner = frappe.session['user']
-		d.fields['__islocal'] = 1 # for Client to identify unsaved doc
-		
-		if doclist != None:
-			doclist.append(d)	
-	
-		return d
 		
 	def get_values(self):
 		"""get non-null fields dict withouth standard fields"""
@@ -581,21 +558,7 @@ class Document:
 		
 	def get_db_value(self, key):
 		return frappe.db.get_value(self.doctype, self.name, key)
-			
-def addchild(parent, fieldname, childtype = '', doclist=None):
-	"""
-	
-   Create a child record to the parent doc.
-   
-   Example::
-   
-     c = Document('Contact','ABC')
-     d = addchild(c, 'contact_updates', 'Contact Update')
-     d.last_updated = 'Phone call'
-     d.save(1)
-	"""
-	return parent.addchild(fieldname, childtype, doclist)
-			
+						
 def make_autoname(key, doctype=''):
 	"""
    Creates an autoname from the given key:
diff --git a/frappe/model/document.py b/frappe/model/document.py
index 3d2cb04b90..f46849d54c 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -132,12 +132,26 @@ class Document(BaseDocument):
 			self.db_update()
 
 		# children
+		child_map = {}
 		ignore_children_type = self.get("_ignore_children_type", [])
+
 		for d in self.get_all_children():
-			if d.doctype not in _ignore_children_type:
-				d.parent = self.name
-				d.db_update()
-		
+			d.parent = self.name # rename if reqd
+			d.parenttype = self.doctype
+			d.db_update()
+			child_map.setdefault(d.doctype, []).append(d.name)
+						
+		for df in self.get_table_fields():
+			if df.options not in ignore_children_type:
+				cnames = child_map.get(df.options) or []
+				if cnames:
+					frappe.db.sql("""delete from `tab%s` where parent=%s and parenttype=%s and
+						name not in (%s)""" % (df.options, '%s', '%s', ','.join(['%s'] * len(cnames))), 
+							tuple([self.name, self.doctype] + cnames))
+				else:
+					frappe.db.sql("""delete from `tab%s` where parent=%s and parenttype=%s""" \
+						% (df.options, '%s', '%s'), (self.name, self.doctype))
+
 		self.run_post_save_methods()
 		
 	def update_single(self, d):
diff --git a/frappe/utils/nestedset.py b/frappe/utils/nestedset.py
index 693f2da911..c0f63dbc45 100644
--- a/frappe/utils/nestedset.py
+++ b/frappe/utils/nestedset.py
@@ -14,6 +14,7 @@ from __future__ import unicode_literals
 
 import frappe
 from frappe import msgprint, _
+from frappe.model.document import Document
 
 class NestedSetRecursionError(frappe.ValidationError): pass
 class NestedSetMultipleRootsError(frappe.ValidationError): pass
@@ -188,7 +189,7 @@ def validate_loop(doctype, name, lft, rgt):
 		"%s", "%s"), (lft, rgt)):
 		frappe.throw("""Item cannot be added to its own descendents.""", NestedSetRecursionError)
 
-class DocTypeNestedSet(object):
+class DocTypeNestedSet(Document):
 	def on_update(self):
 		update_nsm(self)
 		self.validate_ledger()
diff --git a/frappe/website/doctype/about_us_settings/about_us_settings.py b/frappe/website/doctype/about_us_settings/about_us_settings.py
index 5c272ba8da..b5c198cbc5 100644
--- a/frappe/website/doctype/about_us_settings/about_us_settings.py
+++ b/frappe/website/doctype/about_us_settings/about_us_settings.py
@@ -6,9 +6,9 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+from frappe.model.document import Document
+
+class AboutUsSettings(Document):
 			
 	def on_update(self):
 		from frappe.website.render import clear_cache
diff --git a/frappe/website/doctype/about_us_team_member/about_us_team_member.py b/frappe/website/doctype/about_us_team_member/about_us_team_member.py
index cb42e2eea2..1dea8b4be3 100644
--- a/frappe/website/doctype/about_us_team_member/about_us_team_member.py
+++ b/frappe/website/doctype/about_us_team_member/about_us_team_member.py
@@ -6,6 +6,7 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+from frappe.model.document import Document
+
+class AboutUsTeamMember(Document):
+	pass
\ No newline at end of file
diff --git a/frappe/website/doctype/blog_category/blog_category.py b/frappe/website/doctype/blog_category/blog_category.py
index 492ca04eb6..04f819dba3 100644
--- a/frappe/website/doctype/blog_category/blog_category.py
+++ b/frappe/website/doctype/blog_category/blog_category.py
@@ -6,9 +6,7 @@ import frappe
 from frappe.website.website_generator import WebsiteGenerator
 from frappe.website.render import clear_cache
 
-class DocType(WebsiteGenerator):
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+class BlogCategory(WebsiteGenerator):
 		
 	def autoname(self):
 		# to override autoname of WebsiteGenerator
diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py
index 09b09aad52..cae8a6d187 100644
--- a/frappe/website/doctype/blog_post/blog_post.py
+++ b/frappe/website/doctype/blog_post/blog_post.py
@@ -10,9 +10,7 @@ from frappe.website.render import clear_cache
 from frappe import _
 from frappe.utils import today
 
-class DocType(WebsiteGenerator):
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+class BlogPost(WebsiteGenerator):
 		self.save_versions = True
 				
 	def get_page_title(self):
diff --git a/frappe/website/doctype/blog_settings/blog_settings.py b/frappe/website/doctype/blog_settings/blog_settings.py
index 2c03816c3c..19a2525ad8 100644
--- a/frappe/website/doctype/blog_settings/blog_settings.py
+++ b/frappe/website/doctype/blog_settings/blog_settings.py
@@ -6,9 +6,9 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+from frappe.model.document import Document
+
+class BlogSettings(Document):
 		
 	def on_update(self):
 		from frappe.website.render import clear_cache
diff --git a/frappe/website/doctype/blogger/blogger.py b/frappe/website/doctype/blogger/blogger.py
index 3b71838336..b32ba1106c 100644
--- a/frappe/website/doctype/blogger/blogger.py
+++ b/frappe/website/doctype/blogger/blogger.py
@@ -7,9 +7,9 @@ from __future__ import unicode_literals
 import frappe
 from frappe import _
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+from frappe.model.document import Document
+
+class Blogger(Document):
 		
 	def on_update(self):
 		"if user is set, then update all older blogs"
diff --git a/frappe/website/doctype/company_history/company_history.py b/frappe/website/doctype/company_history/company_history.py
index cb42e2eea2..83af48808c 100644
--- a/frappe/website/doctype/company_history/company_history.py
+++ b/frappe/website/doctype/company_history/company_history.py
@@ -6,6 +6,7 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+from frappe.model.document import Document
+
+class CompanyHistory(Document):
+	pass
\ No newline at end of file
diff --git a/frappe/website/doctype/contact_us_settings/contact_us_settings.py b/frappe/website/doctype/contact_us_settings/contact_us_settings.py
index 12162c1799..c3185832ba 100644
--- a/frappe/website/doctype/contact_us_settings/contact_us_settings.py
+++ b/frappe/website/doctype/contact_us_settings/contact_us_settings.py
@@ -6,9 +6,9 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+from frappe.model.document import Document
+
+class ContactUsSettings(Document):
 
 	def on_update(self):
 		from frappe.website.render import clear_cache
diff --git a/frappe/website/doctype/post/post.py b/frappe/website/doctype/post/post.py
index cc83b76e2a..0b15b97a01 100644
--- a/frappe/website/doctype/post/post.py
+++ b/frappe/website/doctype/post/post.py
@@ -10,9 +10,9 @@ from frappe.utils import get_fullname
 from frappe.utils.email_lib.bulk import send
 from frappe.utils.email_lib import sendmail
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+from frappe.model.document import Document
+
+class Post(Document):
 		
 	def validate(self):
 		if not self.doc.parent_post and not self.doc.title:
diff --git a/frappe/website/doctype/style_settings/style_settings.py b/frappe/website/doctype/style_settings/style_settings.py
index c66e4779d0..5912a95ffc 100644
--- a/frappe/website/doctype/style_settings/style_settings.py
+++ b/frappe/website/doctype/style_settings/style_settings.py
@@ -7,9 +7,9 @@ import frappe
 from frappe.utils import cint, cstr
 from frappe import _
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+from frappe.model.document import Document
+
+class StyleSettings(Document):
 		
 	def validate(self):
 		"""make custom css"""
diff --git a/frappe/website/doctype/top_bar_item/top_bar_item.py b/frappe/website/doctype/top_bar_item/top_bar_item.py
index a48f49f2a7..5e8cd7c469 100644
--- a/frappe/website/doctype/top_bar_item/top_bar_item.py
+++ b/frappe/website/doctype/top_bar_item/top_bar_item.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+from frappe.model.document import Document
+
+class TopBarItem(Document):
+	pass
\ No newline at end of file
diff --git a/frappe/website/doctype/user_vote/user_vote.py b/frappe/website/doctype/user_vote/user_vote.py
index 79b8334305..f6e9b51ad6 100644
--- a/frappe/website/doctype/user_vote/user_vote.py
+++ b/frappe/website/doctype/user_vote/user_vote.py
@@ -5,9 +5,9 @@ from __future__ import unicode_literals
 import frappe
 from frappe.website.permissions import get_access
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+from frappe.model.document import Document
+
+class UserVote(Document):
 	
 	def validate(self):
 		# if new
diff --git a/frappe/website/doctype/website_group/website_group.py b/frappe/website/doctype/website_group/website_group.py
index 3068d3984f..536ae27943 100644
--- a/frappe/website/doctype/website_group/website_group.py
+++ b/frappe/website/doctype/website_group/website_group.py
@@ -7,9 +7,7 @@ from frappe.website.website_generator import WebsiteGenerator
 from frappe.templates.generators.website_group import clear_cache
 from frappe.model.doc import make_autoname
 
-class DocType(WebsiteGenerator):
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+class WebsiteGroup(WebsiteGenerator):
 		
 	def get_page_title(self):
 		return self.doc.group_title
diff --git a/frappe/website/doctype/website_route/website_route.py b/frappe/website/doctype/website_route/website_route.py
index 1498898565..0d58ae0cb3 100644
--- a/frappe/website/doctype/website_route/website_route.py
+++ b/frappe/website/doctype/website_route/website_route.py
@@ -10,9 +10,7 @@ from frappe.utils.nestedset import DocTypeNestedSet
 sitemap_fields = ("page_name", "ref_doctype", "docname", "page_or_generator", "idx",
 	"lastmod", "parent_website_route", "public_read", "public_write", "page_title")
 
-class DocType(DocTypeNestedSet):
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+class WebsiteRoute(DocTypeNestedSet):
 		self.nsm_parent_field = "parent_website_route"
 		
 	def autoname(self):
diff --git a/frappe/website/doctype/website_route_permission/website_route_permission.py b/frappe/website/doctype/website_route_permission/website_route_permission.py
index 3a840cd7df..4c00077c0b 100644
--- a/frappe/website/doctype/website_route_permission/website_route_permission.py
+++ b/frappe/website/doctype/website_route_permission/website_route_permission.py
@@ -6,9 +6,9 @@ import frappe
 
 from frappe.website.permissions import remove_empty_permissions, clear_permissions
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+from frappe.model.document import Document
+
+class WebsiteRoutePermission(Document):
 		
 	def on_update(self):
 		remove_empty_permissions()
diff --git a/frappe/website/doctype/website_script/website_script.py b/frappe/website/doctype/website_script/website_script.py
index 2fdabfe4c1..a50b91d9b9 100644
--- a/frappe/website/doctype/website_script/website_script.py
+++ b/frappe/website/doctype/website_script/website_script.py
@@ -6,9 +6,9 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+from frappe.model.document import Document
+
+class WebsiteScript(Document):
 		
 	def on_update(self):
 		"""clear cache"""
diff --git a/frappe/website/doctype/website_settings/website_settings.py b/frappe/website/doctype/website_settings/website_settings.py
index 81b59ea6c7..b5b5fed3e3 100644
--- a/frappe/website/doctype/website_settings/website_settings.py
+++ b/frappe/website/doctype/website_settings/website_settings.py
@@ -8,7 +8,7 @@ from frappe.utils import get_request_site_address, encode
 from frappe.model.controller import DocListController
 from urllib import quote
 
-class DocType(DocListController):
+class WebsiteSettings(DocListController):
 	def validate(self):
 		self.validate_top_bar_items()
 		self.validate_footer_items()
@@ -21,7 +21,7 @@ class DocType(DocListController):
 	
 	def validate_top_bar_items(self):
 		"""validate url in top bar items"""
-		for top_bar_item in self.doclist.get({"parentfield": "top_bar_items"}):
+		for top_bar_item in self.get("top_bar_items"):
 			if top_bar_item.parent_label:
 				parent_label_item = self.doclist.get({"parentfield": "top_bar_items", 
 					"label": top_bar_item.parent_label})
@@ -38,7 +38,7 @@ class DocType(DocListController):
 	
 	def validate_footer_items(self):
 		"""clear parent label in footer"""
-		for footer_item in self.doclist.get({"parentfield": "footer_items"}):
+		for footer_item in self.get("footer_items"):
 			footer_item.parent_label = None
 
 	def on_update(self):
diff --git a/frappe/website/doctype/website_slideshow/website_slideshow.py b/frappe/website/doctype/website_slideshow/website_slideshow.py
index 8f1e859add..ce121731c6 100644
--- a/frappe/website/doctype/website_slideshow/website_slideshow.py
+++ b/frappe/website/doctype/website_slideshow/website_slideshow.py
@@ -6,9 +6,9 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+from frappe.model.document import Document
+
+class WebsiteSlideshow(Document):
 		
 	def on_update(self):
 		# a slide show can be in use and any change in it should get reflected
diff --git a/frappe/website/doctype/website_slideshow_item/website_slideshow_item.py b/frappe/website/doctype/website_slideshow_item/website_slideshow_item.py
index cb42e2eea2..d782525f4b 100644
--- a/frappe/website/doctype/website_slideshow_item/website_slideshow_item.py
+++ b/frappe/website/doctype/website_slideshow_item/website_slideshow_item.py
@@ -6,6 +6,7 @@
 from __future__ import unicode_literals
 import frappe
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
\ No newline at end of file
+from frappe.model.document import Document
+
+class WebsiteSlideshowItem(Document):
+	pass
\ No newline at end of file
diff --git a/frappe/website/doctype/website_template/website_template.py b/frappe/website/doctype/website_template/website_template.py
index c9a8f2af94..12e70eef60 100644
--- a/frappe/website/doctype/website_template/website_template.py
+++ b/frappe/website/doctype/website_template/website_template.py
@@ -11,9 +11,9 @@ from frappe import _
 from frappe.website.doctype.website_route.website_route import add_to_sitemap, update_sitemap, cleanup_sitemap
 from frappe.utils.nestedset import rebuild_tree
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
+from frappe.model.document import Document
+
+class WebsiteTemplate(Document):
 		
 	def after_insert(self):
 		if self.doc.page_or_generator == "Page":

From 516b44d70703b3b6b26ccbf464332450e2209745 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 27 Mar 2014 17:51:26 +0530
Subject: [PATCH 4/5] #478

---
 frappe/__init__.py                            |  45 +-
 frappe/boot.py                                |   4 +-
 frappe/client.py                              |   2 +-
 .../doctype/customize_form/customize_form.py  |   3 +-
 .../core/doctype/print_format/print_format.py |   4 +-
 frappe/core/doctype/user/test_user.py         |  11 +-
 frappe/core/doctype/user/user.py              |   8 +-
 frappe/core/doctype/workflow/workflow.py      |   7 +-
 .../page/data_import_tool/data_import_tool.py |   2 +-
 frappe/core/page/messages/messages.py         |   3 +-
 frappe/memc.py                                |   1 -
 frappe/model/__init__.py                      |   6 +-
 frappe/model/base_document.py                 |   6 +-
 frappe/model/bean.py                          | 521 -------------
 frappe/model/create_new.py                    |   2 +-
 frappe/model/doc.py                           | 735 ------------------
 frappe/model/doclist.py                       | 143 ----
 frappe/model/doctype.py                       | 425 ----------
 frappe/model/document.py                      |  12 +-
 frappe/model/mapper.py                        |   4 +-
 frappe/model/meta.py                          |  16 +-
 frappe/model/naming.py                        |   2 +-
 frappe/model/utils.py                         | 103 ---
 frappe/test_runner.py                         |   6 +-
 frappe/translate.py                           |   8 +-
 frappe/utils/datautils.py                     |  10 +-
 .../doctype/blog_post/test_blog_post.py       |   2 +-
 .../doctype/website_group/website_group.py    |   2 +-
 frappe/widgets/form/utils.py                  |   9 +-
 frappe/widgets/reportview.py                  |   3 +-
 frappe/widgets/search.py                      |   6 +-
 31 files changed, 86 insertions(+), 2025 deletions(-)
 delete mode 100644 frappe/model/bean.py
 delete mode 100755 frappe/model/doc.py
 delete mode 100644 frappe/model/doclist.py
 delete mode 100644 frappe/model/doctype.py

diff --git a/frappe/__init__.py b/frappe/__init__.py
index ca8d58d6ad..cdfa378b1c 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -15,7 +15,6 @@ import os, sys, importlib, inspect
 import json
 import semantic_version
 
-from frappe.core.doctype.print_format.print_format import get_html as get_print_html
 from .exceptions import *
 
 local = Local()
@@ -315,8 +314,7 @@ def get_obj(dt = None, dn = None, doc=None, doclist=None, with_children = True):
 	return get_obj(dt, dn, doc, doclist, with_children)
 
 def doc(doctype=None, name=None, fielddata=None):
-	from frappe.model.doc import Document
-	return Document(doctype, name, fielddata)
+		return Document(doctype, name, fielddata)
 
 def new_doc(doctype, parent_doc=None, parentfield=None):
 	from frappe.model.create_new import get_new_doc
@@ -334,7 +332,7 @@ def bean(doctype=None, name=None, copy=None):
 	"""return an instance of the object, wrapped as a Bean (frappe.model.bean)"""
 	from frappe.model.bean import Bean
 	if copy:
-		return Bean(copy_doclist(copy))
+		return Bean(copy_doc(copy))
 	else:
 		return Bean(doctype, name)
 
@@ -348,10 +346,6 @@ def get_doclist(doctype, name=None):
 def get_doc(arg1, arg2=None):
 	import frappe.model.document
 	return frappe.model.document.get_doc(arg1, arg2)
-
-def get_doctype(doctype, processed=False):
-	import frappe.model.doctype
-	return frappe.model.doctype.get(doctype, processed)
 	
 def get_meta(doctype, cached=True):
 	import frappe.model.meta
@@ -531,26 +525,21 @@ def import_doclist(path, ignore_links=False, ignore_insert=False, insert=False):
 	from frappe.core.page.data_import_tool import data_import_tool
 	data_import_tool.import_doclist(path, ignore_links=ignore_links, ignore_insert=ignore_insert, insert=insert)
 
-def copy_doclist(in_doclist):
-	new_doclist = []
-	parent_doc = None
-	for i, d in enumerate(in_doclist):
-		is_dict = False
-		if isinstance(d, dict):
-			is_dict = True
-			values = _dict(d.copy())
-		else:
-			values = _dict(d.fields.copy())
-		
-		newd = new_doc(values.doctype, parent_doc=(None if i==0 else parent_doc), parentfield=values.parentfield)
-		newd.fields.update(values)
-		
-		if i==0:
-			parent_doc = newd
-		
-		new_doclist.append(newd.fields if is_dict else newd)
-	
-	return doclist(new_doclist)
+def copy_doc(doc):
+	import copy
+	d = doc.as_dict()
+	newdoc = get_doc(copy.deepcopy(d))
+	newdoc.name = None
+	newdoc.set("__islocal", 1)
+	newdoc.owner = None
+	newdoc.creation = None
+	for d in newdoc.get_all_children():
+		d.name = None
+		d.parent = None
+		d.set("__islocal", 1)
+		d.owner = None
+		d.creation = None
+	return newdoc
 
 def compare(val1, condition, val2):
 	import frappe.utils
diff --git a/frappe/boot.py b/frappe/boot.py
index c811d4d7b1..37bd04d338 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -126,7 +126,7 @@ def get_user(bootinfo):
 	"""get user info"""
 	bootinfo['user'] = frappe.user.load_user()
 	
-def add_home_page(bootinfo, doclist):
+def add_home_page(bootinfo, docs):
 	"""load home page"""
 
 	if frappe.session.user=="Guest":
@@ -141,4 +141,4 @@ def add_home_page(bootinfo, doclist):
 		page = frappe.widgets.page.get('desktop')
 
 	bootinfo['home_page'] = page.name
-	doclist.append(page)
+	docs.append(page)
diff --git a/frappe/client.py b/frappe/client.py
index b6bde9e342..ef6caa33d4 100644
--- a/frappe/client.py
+++ b/frappe/client.py
@@ -55,7 +55,7 @@ def insert(doclist):
 		# inserting a child record
 		d = doclist[0]
 		bean = frappe.bean(d["parenttype"], d["parent"])
-		bean.doclist.append(d)
+		bean.append(d)
 		bean.save()
 		return [d]
 	else:
diff --git a/frappe/core/doctype/customize_form/customize_form.py b/frappe/core/doctype/customize_form/customize_form.py
index 82ac597d97..139fedd90d 100644
--- a/frappe/core/doctype/customize_form/customize_form.py
+++ b/frappe/core/doctype/customize_form/customize_form.py
@@ -267,8 +267,7 @@ class CustomizeForm(Document):
 
 			# If the above conditions are fulfilled,
 			# create a property setter doc, but dont save it yet.
-			from frappe.model.doc import Document
-			d = Document('Property Setter')
+			d = frappe.get_doc('Property Setter')
 			d.doctype_or_field = ref_d.doctype=='DocField' and 'DocField' or 'DocType'
 			d.doc_type = self.doc.doc_type
 			d.field_name = ref_d.fieldname
diff --git a/frappe/core/doctype/print_format/print_format.py b/frappe/core/doctype/print_format/print_format.py
index e5787c6584..35fb631727 100644
--- a/frappe/core/doctype/print_format/print_format.py
+++ b/frappe/core/doctype/print_format/print_format.py
@@ -75,12 +75,12 @@ def get_html(doc, doclist, print_format=None):
 
 	template = Environment().from_string(get_print_format_name(doc.doctype, 
 		print_format or frappe.form_dict.format))
-	doctype = frappe.get_doctype(doc.doctype)
+	doctype = frappe.get_meta(doc.doctype)
 	
 	args = {
 		"doc": doc,
 		"doclist": doclist,
-		"doctype": doctype,
+		"meta": meta,
 		"frappe": frappe,
 		"utils": frappe.utils
 	}
diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py
index ca5cfe8470..e1ec25b8da 100644
--- a/frappe/core/doctype/user/test_user.py
+++ b/frappe/core/doctype/user/test_user.py
@@ -46,16 +46,7 @@ class TestUser(unittest.TestCase):
 		frappe.db.set_value("Control Panel", "Control Panel", "_test", "_test_val")
 		self.assertEquals(frappe.db.get_value("Control Panel", None, "_test"), "_test_val")
 		self.assertEquals(frappe.db.get_value("Control Panel", "Control Panel", "_test"), "_test_val")
-		
-	def test_doclist(self):
-		p_meta = frappe.get_doctype("User")
-		
-		self.assertEquals(len(p_meta.get({"doctype": "DocField", "parent": "User", "fieldname": "first_name"})), 1)
-		self.assertEquals(len(p_meta.get({"doctype": "DocField", "parent": "User", "fieldname": "^first"})), 1)
-		self.assertEquals(len(p_meta.get({"fieldname": ["!=", "first_name"]})), len(p_meta) - 1)
-		self.assertEquals(len(p_meta.get({"fieldname": ["in", ["first_name", "last_name"]]})), 2)
-		self.assertEquals(len(p_meta.get({"fieldname": ["not in", ["first_name", "last_name"]]})), len(p_meta) - 2)
-		
+				
 		
 test_records = [
 	[
diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index 88fdc0c7d7..59b9311113 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -54,9 +54,8 @@ class User(Document):
 		if self.doc.user_type == "System User" and not self.get_other_system_managers():
 			msgprint("""Adding System Manager Role as there must 
 				be atleast one 'System Manager'.""")
-			self.doclist.append({
+			self.append("user_roles", {
 				"doctype": "UserRole",
-				"parentfield": "user_roles",
 				"role": "System Manager"
 			})
 	
@@ -244,11 +243,10 @@ class User(Document):
 			
 	def add_roles(self, *roles):
 		for role in roles:
-			if role in [d.role for d in self.doclist.get({"doctype":"UserRole"})]:
+			if role in [d.role for d in self.get("user_roles")]:
 				continue
-			self.bean.doclist.append({
+			self.append("user_roles", {
 				"doctype": "UserRole",
-				"parentfield": "user_roles",
 				"role": role
 			})
 			
diff --git a/frappe/core/doctype/workflow/workflow.py b/frappe/core/doctype/workflow/workflow.py
index 213dca2c02..d4b761485c 100644
--- a/frappe/core/doctype/workflow/workflow.py
+++ b/frappe/core/doctype/workflow/workflow.py
@@ -18,10 +18,8 @@ class Workflow(Document):
 	
 	def create_custom_field_for_workflow_state(self):
 		frappe.clear_cache(doctype=self.doc.document_type)
-		doctypeobj = frappe.get_doctype(self.doc.document_type)
-		if not len(doctypeobj.get({"doctype":"DocField", 
-			"fieldname":self.doc.workflow_state_field})):
-			
+		meta = frappe.get_meta(self.doc.document_type)
+		if not meta.get_field(self.doc.workflow_state_field):
 			# create custom field
 			frappe.bean([{
 				"doctype":"Custom Field",
@@ -32,7 +30,6 @@ class Workflow(Document):
 				"hidden": 1,
 				"fieldtype": "Link",
 				"options": "Workflow State",
-				#"insert_after": doctypeobj.get({"doctype":"DocField"})[-1].fieldname
 			}]).save()
 			
 			frappe.msgprint("Created Custom Field '%s' in '%s'" % (self.doc.workflow_state_field,
diff --git a/frappe/core/page/data_import_tool/data_import_tool.py b/frappe/core/page/data_import_tool/data_import_tool.py
index f6f00fb1d1..d942caeba1 100644
--- a/frappe/core/page/data_import_tool/data_import_tool.py
+++ b/frappe/core/page/data_import_tool/data_import_tool.py
@@ -328,7 +328,7 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False,
 							doclist.append(d)
 				else:
 					break
-				
+
 			return doclist
 		else:
 			d = frappe._dict(zip(columns, rows[start_idx][1:]))
diff --git a/frappe/core/page/messages/messages.py b/frappe/core/page/messages/messages.py
index 9c9363915e..5e5a1b9f49 100644
--- a/frappe/core/page/messages/messages.py
+++ b/frappe/core/page/messages/messages.py
@@ -66,8 +66,7 @@ def post(arg=None):
 		import json
 		arg = json.loads(arg)
 
-	from frappe.model.doc import Document
-	d = Document('Comment')
+		d = frappe.get_doc('Comment')
 	d.parenttype = arg.get("parenttype")
 	d.comment = arg['txt']
 	d.comment_docname = arg['contact']
diff --git a/frappe/memc.py b/frappe/memc.py
index 3d03d1ac12..6471cca959 100644
--- a/frappe/memc.py
+++ b/frappe/memc.py
@@ -3,7 +3,6 @@
 from __future__ import unicode_literals
 
 import memcache, frappe
-from frappe.model.doc import Document
 
 class MClient(memcache.Client):
 	"""memcache client that will automatically prefix conf.db_name"""
diff --git a/frappe/model/__init__.py b/frappe/model/__init__.py
index 10554210bd..133832e3d1 100644
--- a/frappe/model/__init__.py
+++ b/frappe/model/__init__.py
@@ -87,8 +87,8 @@ def delete_fields(args_dict, delete=0):
 def rename_field(doctype, old_fieldname, new_fieldname):
 	"""This functions assumes that doctype is already synced"""
 	
-	doctype_list = frappe.get_doctype(doctype)
-	new_field = doctype_list.get_field(new_fieldname)
+	meta = frappe.get_meta(doctype)
+	new_field = meta.get_field(new_fieldname)
 	if not new_field:
 		print "rename_field: " + (new_fieldname) + " not found in " + doctype
 		return
@@ -99,7 +99,7 @@ def rename_field(doctype, old_fieldname, new_fieldname):
 			where parentfield=%s""" % (new_field.options.split("\n")[0], "%s", "%s"),
 			(new_fieldname, old_fieldname))
 	elif new_field.fieldtype not in no_value_fields:
-		if doctype_list[0].issingle:
+		if meta.issingle:
 			frappe.db.sql("""update `tabSingles` set field=%s
 				where doctype=%s and field=%s""", 
 				(new_fieldname, doctype, old_fieldname))
diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index 3085ffbed0..197e6c2872 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -69,7 +69,7 @@ class BaseDocument(object):
 	def extend(self, key, value):
 		if isinstance(value, list):
 			for v in value:
-				self.append(v)
+				self.append(key, v)
 		else:
 			raise ValueError
 	
@@ -146,6 +146,10 @@ class BaseDocument(object):
 		self.set("__islocal", False)
 
 	def db_update(self):
+		if self.get("__islocal") or not self.name:
+			self.db_insert()
+			return
+			
 		d = self.get_valid_dict()
 		columns = d.keys()
 		frappe.db.sql("""update `tab{doctype}` 
diff --git a/frappe/model/bean.py b/frappe/model/bean.py
deleted file mode 100644
index 33e278b163..0000000000
--- a/frappe/model/bean.py
+++ /dev/null
@@ -1,521 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt 
-
-from __future__ import unicode_literals
-"""
-Transactions are defined as collection of classes, a Bean represents collection of Document
-objects for a transaction with main and children.
-
-Group actions like save, etc are performed on doclists
-"""
-
-import frappe
-from frappe import _, msgprint
-from frappe.utils import cint, cstr, flt
-from frappe.model.doc import Document
-import frappe.permissions
-
-class DocstatusTransitionError(frappe.ValidationError): pass
-class BeanPermissionError(frappe.ValidationError): pass
-class TimestampMismatchError(frappe.ValidationError): pass
-
-class Bean:
-	"""
-	Collection of Documents with one parent and multiple children
-	"""
-	def __init__(self, dt=None, dn=None):
-		self.obj = None
-		self.ignore_permissions = False
-		self.ignore_children_type = []
-		self.ignore_links = False
-		self.ignore_validate = False
-		self.ignore_fields = False
-		self.ignore_mandatory = False
-		self.ignore_restrictions = False
-		
-		if isinstance(dt, basestring) and not dn:
-			dn = dt
-		if dt and dn:
-			if isinstance(dn, dict):
-				dn = frappe.db.get_value(dt, dn, "name")
-				if dn is None:
-					raise frappe.DoesNotExistError
-			
-			self.load_from_db(dt, dn)
-		elif isinstance(dt, list):
-			self.set_doclist(dt)
-		elif isinstance(dt, dict):
-			self.set_doclist([dt])
-
-	def load_from_db(self, dt=None, dn=None):
-		"""
-			Load doclist from dt
-		"""
-
-		if not dt: dt = self.doc.doctype
-		if not dn: dn = self.doc.name
-
-		doc = Document(dt, dn)
-		
-		# get all children types
-		tablefields = frappe.model.meta.get_table_fields(dt)
-
-		# load chilren
-		doclist = frappe.doclist([doc,])
-
-		self.set_doclist(doclist)
-		
-	def __iter__(self):
-		return self.doclist.__iter__()
-
-	@property
-	def meta(self):
-		if not hasattr(self, "_meta"):
-			self._meta = frappe.get_doctype(self.doc.doctype)
-		return self._meta
-
-	def from_compressed(self, data, docname):
-		from frappe.model.utils import expand
-		self.set_doclist(expand(data))
-		
-	def set_doclist(self, doclist):
-		for i, d in enumerate(doclist):
-			if isinstance(d, dict):
-				doclist[i] = Document(fielddata=d)
-		
-		self.doclist = frappe.doclist(doclist)
-		self.doc = self.doclist[0]
-		
-		if self.doc.meta.issingle:
-			self.doc.cast_floats_and_ints()
-		
-		if self.obj:
-			self.obj.doclist = self.doclist
-			self.obj.doc = self.doc
-
-	def make_controller(self):
-		if not self.doc.doctype:
-			raise frappe.DataError("Bean doctype not specified")
-		if self.obj:
-			# update doclist before running any method
-			self.obj.doclist = self.doclist
-			return self.obj
-		
-		self.obj = frappe.get_obj(doc=self.doc, doclist=self.doclist)
-		self.obj.bean = self
-		self.controller = self.obj
-		return self.obj
-
-	def get_controller(self):
-		return self.make_controller()
-
-	def to_dict(self):
-		return [d.fields for d in self.doclist]
-
-	def check_if_latest(self, method="save"):
-		from frappe.model.meta import is_single
-
-		conflict = False
-		if not cint(self.doc.fields.get('__islocal')):
-			if is_single(self.doc.doctype):
-				modified = frappe.db.get_value(self.doc.doctype, self.doc.name, "modified")
-				if isinstance(modified, list):
-					modified = modified[0]
-				if cstr(modified) and cstr(modified) != cstr(self.doc.modified):
-					conflict = True
-			else:
-				tmp = frappe.db.sql("""select modified, docstatus from `tab%s` 
-					where name=%s for update"""
-					% (self.doc.doctype, '%s'), self.doc.name, as_dict=True)
-
-				if not tmp:
-					frappe.msgprint("""This record does not exist. Please refresh.""", raise_exception=1)
-
-				modified = cstr(tmp[0].modified)
-				if modified and modified != cstr(self.doc.modified):
-					conflict = True
-			
-				self.check_docstatus_transition(tmp[0].docstatus, method)
-				
-			if conflict:
-				frappe.msgprint(_("Error: Document has been modified after you have opened it") \
-				+ (" (%s, %s). " % (modified, self.doc.modified)) \
-				+ _("Please refresh to get the latest document."), raise_exception=TimestampMismatchError)
-				
-	def check_docstatus_transition(self, db_docstatus, method):
-		valid = {
-			"save": [0,0],
-			"submit": [0,1],
-			"cancel": [1,2],
-			"update_after_submit": [1,1]
-		}
-		
-		labels = {
-			0: _("Draft"),
-			1: _("Submitted"),
-			2: _("Cancelled")
-		}
-		
-		if not hasattr(self, "to_docstatus"):
-			self.to_docstatus = 0
-		
-		if method != "runserverobj" and [db_docstatus, self.to_docstatus] != valid[method]:
-			frappe.msgprint(_("Cannot change from") + ": " + labels[db_docstatus] + " > " + \
-				labels[self.to_docstatus], raise_exception=DocstatusTransitionError)
-
-	def update_timestamps_and_docstatus(self):
-		from frappe.utils import now
-		ts = now()
-		user = frappe.__dict__.get('session', {}).get('user') or 'Administrator'
-
-		for d in self.doclist:
-			if self.doc.fields.get('__islocal'):
-				if not d.owner:
-					d.owner = user
-				if not d.creation:
-					d.creation = ts
-
-			d.modified_by = user
-			d.modified = ts
-			if d.docstatus != 2 and self.to_docstatus >= int(d.docstatus): # don't update deleted
-				d.docstatus = self.to_docstatus
-
-	def prepare_for_save(self, method):
-		self.check_if_latest(method)
-		
-		self.update_timestamps_and_docstatus()
-		self.update_parent_info()
-		
-		if self.doc.fields.get("__islocal"):
-			# set name before validate
-			self.run_method('before_set_name')
-			self.doc.set_new_name(self)
-			self.run_method('before_insert')
-			
-		if method != "cancel":
-			self.extract_images_from_text_editor()
-	
-	def update_parent_info(self):
-		idx_map = {}
-		is_local = cint(self.doc.fields.get("__islocal"))
-		
-		if not frappe.flags.in_import:
-			parentfields = [d.fieldname for d in self.meta.get({"doctype": "DocField", "fieldtype": "Table"})]
-			
-		for i, d in enumerate(self.doclist[1:]):
-			if d.parentfield:
-				if not frappe.flags.in_import:
-					if not d.parentfield in parentfields:
-						frappe.msgprint("Bad parentfield %s" % d.parentfield, 
-							raise_exception=True)
-				d.parenttype = self.doc.doctype
-				d.parent = self.doc.name
-			if not d.idx:
-				d.idx = idx_map.setdefault(d.parentfield, 0) + 1
-			else:
-				d.idx = cint(d.idx)
-			if is_local:
-				# if parent is new, all children should be new
-				d.fields["__islocal"] = 1
-				d.name = None
-			
-			idx_map[d.parentfield] = d.idx
-
-	def run_method(self, method, *args, **kwargs):
-		if not args:
-			args = []
-		self.make_controller()
-		
-		def add_to_response(out, new_response):
-			if isinstance(new_response, dict):
-				out.update(new_response)
-						
-		if hasattr(self.controller, method):
-			add_to_response(frappe.local.response, 
-				frappe.call(getattr(self.controller, method), *args, **kwargs))
-				
-		self.set_doclist(self.controller.doclist)
-
-		args = [self, method] + list(args)
-		for handler in frappe.get_hooks("bean_event:" + self.doc.doctype + ":" + method) \
-			+ frappe.get_hooks("bean_event:*:" + method):
-			add_to_response(frappe.local.response, frappe.call(frappe.get_attr(handler), *args, **kwargs))
-
-		return frappe.local.response
-		
-	def get_attr(self, method):
-		self.make_controller()
-		return getattr(self.controller, method, None)
-
-	def insert(self, ignore_permissions=None):
-		if ignore_permissions:
-			self.ignore_permissions = True
-			
-		self.doc.fields["__islocal"] = 1
-			
-		self.set_defaults()
-		
-		if frappe.flags.in_test:
-			if self.meta.get_field("naming_series"):
-				self.doc.naming_series = "_T-" + self.doc.doctype + "-"
-		
-		return self.save()
-	
-	def insert_or_update(self):
-		if self.doc.name and frappe.db.exists(self.doc.doctype, self.doc.name):
-			return self.save()
-		else:
-			return self.insert()
-	
-	def set_defaults(self):
-		if frappe.flags.in_import:
-			return
-			
-		new_docs = {}
-		new_doclist = []
-		
-		for d in self.doclist:
-			if not d.doctype in new_docs:
-				new_docs[d.doctype] = frappe.new_doc(d.doctype)
-				
-			newd = frappe.doc(new_docs[d.doctype].fields.copy())
-			newd.fields.update(d.fields)
-			new_doclist.append(newd)
-			
-		self.set_doclist(new_doclist)
-
-	def has_read_perm(self):
-		return self.has_permission("read")
-		
-	def has_permission(self, permtype):
-		if self.ignore_permissions:
-			return True
-		if self.doc.parent and self.doc.parenttype:
-			return frappe.has_permission(self.doc.parenttype, permtype, 
-				frappe.doc(self.doc.parenttype, self.doc.parent))
-		else:
-			return frappe.has_permission(self.doc.doctype, permtype, self.doc)
-		
-	def save(self, check_links=1, ignore_permissions=None):
-		if ignore_permissions!=None:
-			self.ignore_permissions = ignore_permissions
-		perm_to_check = "write"
-		if self.doc.fields.get("__islocal"):
-			perm_to_check = "create"
-			if not self.doc.owner:
-				self.doc.owner = frappe.session.user
-		
-		self.to_docstatus = 0
-		self.prepare_for_save("save")
-		
-		# check permissions after preparing for save, since name might be required
-		if self.has_permission(perm_to_check):
-			if not self.ignore_validate:
-				self.run_method('validate')
-			self.validate_doclist()
-			self.save_main()
-			self.save_children()
-			self.run_method('on_update')
-			if perm_to_check=="create":
-				self.run_method("after_insert")
-		else:
-			self.no_permission_to(_(perm_to_check.title()))
-		
-		return self
-
-	def submit(self):
-		if self.has_permission("submit"):
-			self.to_docstatus = 1
-			self.prepare_for_save("submit")
-			self.run_method('validate')
-			self.validate_doclist()
-			self.save_main()
-			self.save_children()
-			self.run_method('on_update')
-			self.run_method('on_submit')
-		else:
-			self.no_permission_to(_("Submit"))
-			
-		return self
-
-	def cancel(self):
-		if self.has_permission("cancel"):
-			self.to_docstatus = 2
-			self.prepare_for_save("cancel")
-			self.run_method('before_cancel')
-			self.save_main()
-			self.save_children()
-			self.run_method('on_cancel')
-			self.check_no_back_links_exist()
-		else:
-			self.no_permission_to(_("Cancel"))
-			
-		return self
-
-	def update_after_submit(self):
-		if self.doc.docstatus != 1:
-			frappe.msgprint("Only to called after submit", raise_exception=1)
-		if self.has_permission("write"):
-			self.to_docstatus = 1
-			self.prepare_for_save("update_after_submit")
-			self.run_method('validate')
-			self.run_method('before_update_after_submit')
-			self.validate_doclist()
-			self.save_main()
-			self.save_children()
-			self.run_method('on_update_after_submit')
-		else:
-			self.no_permission_to(_("Update"))
-		
-		return self
-
-	def save_main(self):
-		try:
-			self.doc.save(check_links = False, ignore_fields = self.ignore_fields)
-		except NameError, e:
-			frappe.msgprint('%s "%s" already exists' % (self.doc.doctype, self.doc.name))
-
-			# prompt if cancelled
-			if frappe.db.get_value(self.doc.doctype, self.doc.name, 'docstatus')==2:
-				frappe.msgprint('[%s "%s" has been cancelled]' % (self.doc.doctype, self.doc.name))
-			frappe.errprint(frappe.utils.get_traceback())
-			raise
-
-	def save_children(self):
-		child_map = {}
-		for d in self.doclist[1:]:
-			if d.fields.get("parent") or d.fields.get("parentfield"):
-				d.parent = self.doc.name # rename if reqd
-				d.parenttype = self.doc.doctype
-				
-				d.save(check_links=False, ignore_fields = self.ignore_fields)
-			
-			child_map.setdefault(d.doctype, []).append(d.name)
-		
-		# delete all children in database that are not in the child_map
-		
-		# get all children types
-		tablefields = frappe.model.meta.get_table_fields(self.doc.doctype)
-				
-		for dt in tablefields:
-			if dt[0] not in self.ignore_children_type:
-				cnames = child_map.get(dt[0]) or []
-				if cnames:
-					frappe.db.sql("""delete from `tab%s` where parent=%s and parenttype=%s and
-						name not in (%s)""" % (dt[0], '%s', '%s', ','.join(['%s'] * len(cnames))), 
-							tuple([self.doc.name, self.doc.doctype] + cnames))
-				else:
-					frappe.db.sql("""delete from `tab%s` where parent=%s and parenttype=%s""" \
-						% (dt[0], '%s', '%s'), (self.doc.name, self.doc.doctype))
-	
-	def delete(self):
-		frappe.delete_doc(self.doc.doctype, self.doc.name)
-
-	def no_permission_to(self, ptype):
-		frappe.msgprint(("%s (%s): " % (self.doc.name, _(self.doc.doctype))) + \
-			_("No Permission to ") + ptype, raise_exception=BeanPermissionError)
-			
-	def check_no_back_links_exist(self):
-		from frappe.model.delete_doc import check_if_doc_is_linked
-		check_if_doc_is_linked(self.doc.doctype, self.doc.name, method="Cancel")
-		
-	def check_mandatory(self):
-		if self.ignore_mandatory:
-			return
-			
-		missing = []
-		for doc in self.doclist:
-			for df in self.meta:
-				if df.doctype=="DocField" and df.reqd and df.parent==doc.doctype and df.fieldname!="naming_series":
-					msg = ""
-					if df.fieldtype == "Table":
-						if not self.get(df.fieldname):
-							msg = _("Error") + ": " + _("Data missing in table") + ": " + _(df.label)
-				
-					elif doc.fields.get(df.fieldname) is None:
-						msg = _("Error") + ": "
-						if doc.parentfield:
-							msg += _("Row") + (" # %s: " % (doc.idx,))
-			
-						msg += _("Value missing for") + ": " + _(df.label)
-					
-					if msg:
-						missing.append([msg, df.fieldname])
-		
-		if missing:
-			for msg, fieldname in missing:
-				msgprint(msg)
-
-			raise frappe.MandatoryError, ", ".join([fieldname for msg, fieldname in missing])
-			
-	def extract_images_from_text_editor(self):
-		from frappe.utils.file_manager import extract_images_from_html
-		if self.doc.doctype != "DocType":
-			for df in self.meta.get({"doctype": "DocField", "parent": self.doc.doctype, "fieldtype":"Text Editor"}):
-				extract_images_from_html(self.doc, df.fieldname)
-				
-	def validate_doclist(self):
-		self.check_mandatory()
-		self.validate_restrictions()
-		self.check_links()
-	
-	def check_links(self):
-		if self.ignore_links:
-			return
-		ref, err_list = {}, []
-		for d in self.doclist:
-			if not ref.get(d.doctype):
-				ref[d.doctype] = d.make_link_list()
-
-			err_list += d.validate_links(ref[d.doctype])
-			
-		if err_list:
-			frappe.msgprint("""[Link Validation] Could not find the following values: %s.
-			Please correct and resave. Document Not Saved.""" % ', '.join(err_list), raise_exception=1)
-	
-	def validate_restrictions(self):
-		if self.ignore_restrictions:
-			return
-		
-		has_restricted_data = False
-		for d in self.doclist:
-			if not frappe.permissions.has_unrestricted_access(d):
-				has_restricted_data = True
-				
-		if has_restricted_data:
-			raise BeanPermissionError
-
-def clone(source_wrapper):
-	""" make a clone of a document"""
-	if isinstance(source_wrapper, list):
-		source_wrapper = Bean(source_wrapper)
-	
-	new_wrapper = Bean(source_wrapper.doclist.copy())
-	
-	if new_wrapper.doc.fields.get("amended_from"):
-		new_wrapper.doc.fields["amended_from"] = None
-
-	if new_wrapper.doc.fields.get("amendment_date"):
-		new_wrapper.doc.fields["amendment_date"] = None
-	
-	for d in new_wrapper.doclist:
-		d.fields.update({
-			"name": None,
-			"__islocal": 1,
-			"docstatus": 0,
-		})
-	
-	return new_wrapper
-
-# for bc
-def getlist(doclist, parentfield):
-	import frappe.model.utils
-	return frappe.model.utils.getlist(doclist, parentfield)
-
-def copy_doclist(doclist, no_copy = []):
-	"""
-		Make a copy of the doclist
-	"""
-	import frappe.model.utils
-	return frappe.model.utils.copy_doclist(doclist, no_copy)
-
diff --git a/frappe/model/create_new.py b/frappe/model/create_new.py
index 4e909bd56e..9055d78764 100644
--- a/frappe/model/create_new.py
+++ b/frappe/model/create_new.py
@@ -18,7 +18,7 @@ def get_new_doc(doctype, parent_doc = None, parentfield = None):
 		"docstatus": 0
 	})
 	
-	meta = frappe.get_doctype(doctype)
+	meta = frappe.get_meta(doctype)
 	
 	restrictions = frappe.defaults.get_restrictions()
 	
diff --git a/frappe/model/doc.py b/frappe/model/doc.py
deleted file mode 100755
index 1e547fd122..0000000000
--- a/frappe/model/doc.py
+++ /dev/null
@@ -1,735 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt 
-
-from __future__ import unicode_literals
-"""
-Contains the Document class representing an object / record
-"""
-
-import frappe
-from frappe import _
-import frappe.model.meta
-from frappe.utils import *
-
-class Document:
-	"""
-	   The frappe(meta-data)framework equivalent of a Database Record.
-	   Stores,Retrieves,Updates the record in the corresponding table.
-	   Runs the triggers required.
-
-	   The `Document` class represents the basic Object-Relational Mapper (ORM). The object type is defined by
-	   `DocType` and the object ID is represented by `name`:: 
-	   
-	      Please note the anamoly in the Web Notes Framework that `ID` is always called as `name`
-
-	   If both `doctype` and `name` are specified in the constructor, then the object is loaded from the database.
-	   If only `doctype` is given, then the object is not loaded
-	   If `fielddata` is specfied, then the object is created from the given dictionary.
-	       
-	      **Note 1:**
-	      
-		 The getter and setter of the object are overloaded to map to the fields of the object that
-		 are loaded when it is instantiated.
-	       
-		 For example: doc.name will be the `name` field and doc.owner will be the `owner` field
-
-	      **Note 2 - Standard Fields:**
-	      
-		 * `name`: ID / primary key
-		 * `owner`: creator of the record
-		 * `creation`: datetime of creation
-		 * `modified`: datetime of last modification
-		 * `modified_by` : last updating user
-		 * `docstatus` : Status 0 - Saved, 1 - Submitted, 2- Cancelled
-		 * `parent` : if child (table) record, this represents the parent record
-		 * `parenttype` : type of parent record (if any)
-		 * `parentfield` : table fieldname of parent record (if any)
-		 * `idx` : Index (sequence) of the child record	
-	"""
-	
-	def __init__(self, doctype = None, name = None, fielddata = None):
-		self._roles = []
-		self._perms = []
-		self._user_defaults = {}
-		self._new_name_set = False
-		self._meta = None
-		
-		if isinstance(doctype, dict):
-			fielddata = doctype
-			doctype = None
-		if doctype and isinstance(name, dict):
-			name = frappe.db.get_value(doctype, name, "name") or None
-		
-		if fielddata: 
-			self.fields = fielddata
-		else: 
-			self.fields = {}
-		
-		if not self.fields.has_key('name'):
-			self.fields['name']='' # required on save
-		if not self.fields.has_key('doctype'):
-			self.fields['doctype']='' # required on save
-		if not self.fields.has_key('owner'):
-			self.fields['owner']='' # required on save
-
-		if doctype:
-			self.fields['doctype'] = doctype
-		if name:
-			self.fields['name'] = name
-		self.__initialized = 1
-
-		if (doctype and name):
-			self._loadfromdb(doctype, name)
-		else:
-			if not fielddata:
-				self.fields['__islocal'] = 1
-		
-		if not self.fields.get("docstatus"):
-			self.fields["docstatus"] = 0
-
-	def __nonzero__(self):
-		return True
-
-	def __str__(self):
-		return str(self.fields)
-		
-	def __repr__(self):
-		return repr(self.fields)
-		
-	def __unicode__(self):
-		return unicode(self.fields)
-		
-	def __eq__(self, other):
-		if isinstance(other, Document):
-			return self.fields == other.fields
-		else:
-			return False
-
-	def __getstate__(self): 
-		return self.fields
-		
-	def __setstate__(self, d): 
-		self.fields = d
-
-	def encode(self, encoding='utf-8'):
-		"""convert all unicode values to utf-8"""
-		from frappe.utils import encode_dict
-		encode_dict(self.fields)
-
-	def _loadfromdb(self, doctype = None, name = None):
-		if name: self.name = name
-		if doctype: self.doctype = doctype
-		
-		is_single = False
-		try: 
-			is_single = frappe.model.meta.is_single(self.doctype)
-		except Exception, e:
-			pass
-		
-		if is_single:
-			self._loadsingle()
-		else:
-			try:
-				dataset = frappe.db.sql('select * from `tab%s` where name=%s' % 
-					(self.doctype, "%s"), self.name)
-			except frappe.SQLError, e:
-				if e.args[0]==1146:
-					dataset = None
-				else:
-					raise
-
-			if not dataset:
-				raise frappe.DoesNotExistError, '[WNF] %s %s does not exist' % (self.doctype, self.name)
-			self._load_values(dataset[0], frappe.db.get_description())
-
-	def is_new(self):
-		return self.fields.get("__islocal")
-
-	def _load_values(self, data, description):
-		if '__islocal' in self.fields:
-			del self.fields['__islocal']
-		for i in range(len(description)):
-			v = data[i]
-			self.fields[description[i][0]] = frappe.db.convert_to_simple_type(v)
-
-	def _merge_values(self, data, description):
-		for i in range(len(description)):
-			v = data[i]
-			if v: # only if value, over-write
-				self.fields[description[i][0]] = frappe.db.convert_to_simple_type(v)
-			
-	def _loadsingle(self):
-		self.name = self.doctype
-		self.fields.update(getsingle(self.doctype))
-		self.cast_floats_and_ints()
-		
-	def cast_floats_and_ints(self):
-		for df in frappe.get_doctype(self.doctype).get_docfields():
-			if df.fieldtype in ("Int", "Check"):
-				self.fields[df.fieldname] = cint(self.fields.get(df.fieldname))
-			elif df.fieldtype in ("Float", "Currency"):
-				self.fields[df.fieldname] = flt(self.fields.get(df.fieldname))
-		
-		if self.docstatus is not None:	
-			self.docstatus = cint(self.docstatus)
-		
-	def __setattr__(self, name, value):
-		# normal attribute
-		if not self.__dict__.has_key('_Document__initialized'): 
-			self.__dict__[name] = value
-		elif self.__dict__.has_key(name):
-			self.__dict__[name] = value
-		else:
-			# field attribute
-			f = self.__dict__['fields']
-			f[name] = value
-
-	def __getattr__(self, name):
-		if self.__dict__.has_key(name):
-			return self.__dict__[name]
-		elif self.fields.has_key(name):
-			return self.fields[name]	
-		else:
-			if name.startswith("__"):
-				raise AttributeError()
-			return None
-	
-	def get(self, name, value=None):
-		return self.fields.get(name, value)
-
-	def update(self, d):
-		self.fields.update(d)
-		return self
-
-	def update_if_missing(self, d):
-		fields = self.get_valid_fields()
-		for key, value in d.iteritems():
-			if (key in fields) and (not self.fields.get(key)):
-				self.fields[key] = value
-
-	def insert(self):
-		self.fields['__islocal'] = 1
-		self.save()
-		return self
-		
-	def save(self, new=0, check_links=1, ignore_fields=0, make_autoname=1,
-			keep_timestamps=False):
-			
-		if new:
-			self.fields["__islocal"] = 1
-
-		# add missing parentinfo (if reqd)
-		if self.parent and not (self.parenttype and self.parentfield):
-			self.update_parentinfo()
-
-		if self.parent and not self.idx:
-			self.set_idx()
-
-		# if required, make new
-		if not self.meta.issingle:
-			if self.is_new():
-				r = self._insert(make_autoname=make_autoname, keep_timestamps = keep_timestamps)
-				if r: 
-					return r
-			else:
-				if not frappe.db.exists(self.doctype, self.name):
-					frappe.msgprint(frappe._("Cannot update a non-exiting record, try inserting.") + ": " + self.doctype + " / " + self.name, 
-						raise_exception=1)
-				
-				
-		# save the values
-		self._update_values(self.meta.issingle, 
-			check_links and self.make_link_list() or {}, ignore_fields=ignore_fields,
-			keep_timestamps=keep_timestamps)
-		self._clear_temp_fields()
-
-	
-	def _get_amended_name(self):
-		am_id = 1
-		am_prefix = self.amended_from
-		if frappe.db.get_value(self.doctype, self.amended_from, "amended_from"):
-			am_id = cint(self.amended_from.split('-')[-1]) + 1
-			am_prefix = '-'.join(self.amended_from.split('-')[:-1]) # except the last hyphen
-			
-		self.name = am_prefix + '-' + str(am_id)
-
-	def set_new_name(self, bean=None):
-		if self._new_name_set:
-			# already set by bean
-			return
-
-		self._new_name_set = True
-
-		autoname = self.meta.autoname
-		
-		self.localname = self.name
-
-
-		# amendments
-		if self.amended_from: 
-			return self._get_amended_name()
-
-		# by method
-		else:
-			# get my object
-			if not bean:
-				bean = frappe.bean([self])
-			
-			bean.run_method("autoname")
-			if self.name and self.localname != self.name:
-				return
-
-		# based on a field
-		if autoname and autoname.startswith('field:'):
-			n = self.fields[autoname[6:]]
-			if not n:
-				raise Exception, 'Name is required'
-			self.name = n.strip()
-			
-		elif autoname and autoname.startswith("naming_series:"):
-			self.set_naming_series()
-			if not self.naming_series:
-				frappe.msgprint(frappe._("Naming Series mandatory"), raise_exception=True)
-			self.name = make_autoname(self.naming_series+'.#####')
-					
-		# call the method!
-		elif autoname and autoname!='Prompt': 
-			self.name = make_autoname(autoname, self.doctype)
-				
-		# given
-		elif self.fields.get('__newname',''): 
-			self.name = self.fields['__newname']
-
-		# default name for table
-		elif self.meta.istable: 
-			self.name = make_autoname('#########', self.doctype)
-			
-		# unable to determine a name, use global series
-		if not self.name:
-			self.name = make_autoname('#########', self.doctype)
-					
-	def set_naming_series(self):
-		if not self.naming_series:
-			# pick default naming series
-			self.naming_series = get_default_naming_series(self.doctype)
-	
-	def append_number_if_name_exists(self):
-		if frappe.db.exists(self.doctype, self.name):
-			last = frappe.db.sql("""select name from `tab{}`
-				where name regexp '{}-[[:digit:]]+' 
-				order by name desc limit 1""".format(self.doctype, self.name))
-			
-			if last:
-				count = str(cint(last[0][0].rsplit("-", 1)[1]) + 1)
-			else:
-				count = "1"
-				
-			self.name = "{0}-{1}".format(self.name, count)
-	
-	def set(self, key, value):
-		self.modified = now()
-		self.modified_by = frappe.session["user"]
-		frappe.db.set_value(self.doctype, self.name, key, value, self.modified, self.modified_by)
-		self.fields[key] = value
-			
-	def _insert(self, make_autoname=True, keep_timestamps=False):
-		# set name
-		if make_autoname:
-			self.set_new_name()
-		
-		# validate name
-		self.name = validate_name(self.doctype, self.name, self.meta.name_case)
-				
-		# insert!
-		if not keep_timestamps:
-			if not self.owner: 
-				self.owner = frappe.session['user']
-			self.modified_by = frappe.session['user']
-			if not self.creation:
-				self.creation = self.modified = now()
-			else:
-				self.modified = now()
-			
-		frappe.db.sql("insert into `tab%(doctype)s`" % self.fields \
-			+ """ (name, owner, creation, modified, modified_by)
-			values (%(name)s, %(owner)s, %(creation)s, %(modified)s,
-				%(modified_by)s)""", self.fields)
-
-	def _update_single(self, link_list):
-		self.modified = now()
-		update_str, values = [], []
-		
-		frappe.db.sql("delete from tabSingles where doctype=%s", self.doctype)
-		for f in self.fields.keys():
-			if not (f in ('modified', 'doctype', 'name', 'perm', 'localname', 'creation'))\
-				and (not f.startswith('__')): # fields not saved
-
-				# validate links
-				if link_list and link_list.get(f):
-					self.fields[f] = self._validate_link(link_list, f)
-
-				if self.fields[f]==None:
-					update_str.append("(%s,%s,NULL)")
-					values.append(self.doctype)
-					values.append(f)
-				else:
-					update_str.append("(%s,%s,%s)")
-					values.append(self.doctype)
-					values.append(f)
-					values.append(self.fields[f])
-		frappe.db.sql("insert into tabSingles(doctype, field, value) values %s" % (', '.join(update_str)), values)
-
-	def validate_links(self, link_list):
-		err_list = []
-		for f in self.fields.keys():
-			# validate links
-			old_val = self.fields[f]
-			if link_list and link_list.get(f):
-				self.fields[f] = self._validate_link(link_list, f)
-
-			if old_val and not self.fields[f]:
-				err_list.append("{}: {}".format(link_list[f][1], old_val))
-				
-		return err_list
-
-	def make_link_list(self):
-		res = frappe.model.meta.get_link_fields(self.doctype)
-
-		link_list = {}
-		for i in res: link_list[i[0]] = (i[1], i[2]) # options, label
-		return link_list
-	
-	def _validate_link(self, link_list, f):
-		dt = link_list[f][0]
-		dn = self.fields.get(f)
-		
-		if not dt:
-			frappe.throw("Options not set for link field: " + f)
-		
-		if not dt: return dn
-		if not dn: return None
-		if dt=="[Select]": return dn
-		if dt.lower().startswith('link:'):
-			dt = dt[5:]
-		if '\n' in dt:
-			dt = dt.split('\n')[0]
-		tmp = frappe.db.sql("""SELECT name FROM `tab%s` 
-			WHERE name = %s""" % (dt, '%s'), (dn,))
-		return tmp and tmp[0][0] or ''# match case
-	
-	def _update_values(self, issingle, link_list, ignore_fields=0, keep_timestamps=False):
-		self.validate_constants()
-		if issingle:
-			self._update_single(link_list)
-		else:
-			update_str, values = [], []
-			# set modified timestamp
-			if self.modified and not keep_timestamps:
-				self.modified = now()
-				self.modified_by = frappe.session['user']
-			
-			fields_list = ignore_fields and self.get_valid_fields() or self.fields.keys()
-			
-			for f in fields_list:
-				if (not (f in ('doctype', 'name', 'perm', 'localname',
-						'creation','_user_tags', "file_list", "_comments"))) and (not f.startswith('__')): 
-						# fields not saved
-					
-					# validate links
-					if link_list and link_list.get(f):
-						self.fields[f] = self._validate_link(link_list, f)
-
-					if self.fields.get(f) is None or self.fields.get(f)=='':
-						update_str.append("`%s`=NULL" % f)
-					else:
-						values.append(self.fields.get(f))
-						update_str.append("`%s`=%s" % (f, '%s'))
-			if values:
-				values.append(self.name)
-				r = frappe.db.sql("update `tab%s` set %s where name=%s" % \
-					(self.doctype, ', '.join(update_str), "%s"), values)
-					
-	def get_valid_fields(self):
-		import frappe.model.doctype
-		
-		if getattr(frappe.local, "valid_fields_map", None) is None:
-			frappe.local.valid_fields_map = {}
-		
-		valid_fields_map = frappe.local.valid_fields_map
-		
-		if not valid_fields_map.get(self.doctype):
-			if cint(self.meta.issingle):
-				doctypelist = frappe.model.doctype.get(self.doctype)
-				valid_fields_map[self.doctype] = doctypelist.get_fieldnames({
-					"fieldtype": ["not in", frappe.model.no_value_fields]})
-			else:
-				valid_fields_map[self.doctype] = \
-					frappe.db.get_table_columns(self.doctype)
-			
-		return valid_fields_map.get(self.doctype)
-
-	def validate_constants(self):
-		if frappe.flags.in_import:
-			return
-		
-		meta = frappe.get_doctype(self.doctype)
-		constants = [d.fieldname for d in meta.get({"set_only_once": 1})]
-		if constants:
-			values = frappe.db.get_value(self.doctype, self.name, constants, as_dict=True)
-
-		for fieldname in constants:
-			if self.fields.get(fieldname) != values.get(fieldname):
-				frappe.throw("{0}: {1}".format(_("Value cannot be changed for"), 
-					_(meta.get_field(fieldname).label)), frappe.CannotChangeConstantError)
-	
-	@property
-	def meta(self):
-		if not self._meta:
-			self._meta = frappe.db.get_value("DocType", self.doctype, "*", as_dict=True) \
-				or frappe._dict()
-				
-		return self._meta
-		
-	def update_parentinfo(self):
-		"""update parent type and parent field, if not explicitly specified"""
-
-		tmp = frappe.db.sql("""select parent, fieldname from tabDocField 
-			where fieldtype='Table' and options=%s""", (self.doctype,))
-			
-		if len(tmp)==0:
-			raise Exception, 'Incomplete parent info in child table (%s, %s)' \
-				% (self.doctype, self.fields.get('name', '[new]'))
-		
-		elif len(tmp)>1:
-			raise Exception, 'Ambiguous parent info (%s, %s)' \
-				% (self.doctype, self.fields.get('name', '[new]'))
-
-		else:
-			self.parenttype = tmp[0][0]
-			self.parentfield = tmp[0][1]
-
-	def set_idx(self):
-		"""set idx"""
-		self.idx = (frappe.db.sql("""select max(idx) from `tab%s` 
-			where parent=%s and parentfield=%s""" % (self.doctype, '%s', '%s'), 
-			(self.parent, self.parentfield))[0][0] or 0) + 1
-		
-	def _clear_temp_fields(self):
-		# clear temp stuff
-		keys = self.fields.keys()
-		for f in keys:
-			if f.startswith('__'): 
-				del self.fields[f]
-
-	def clear_table(self, doclist, tablefield, save=0):
-		"""
-		Clears the child records from the given `doclist` for a particular `tablefield`
-		"""
-		from frappe.model.utils import getlist
-		
-		table_list = getlist(doclist, tablefield)
-				
-		delete_list = [d.name for d in table_list]
-		
-		if delete_list:
-			#filter doclist
-			doclist = filter(lambda d: d.name not in delete_list, doclist)
-		
-			# delete from db
-			frappe.db.sql("""\
-				delete from `tab%s`
-				where parent=%s and parenttype=%s"""
-				% (table_list[0].doctype, '%s', '%s'),
-				(self.name, self.doctype))
-
-			self.fields['__unsaved'] = 1
-		
-		return frappe.doclist(doclist)
-		
-	def get_values(self):
-		"""get non-null fields dict withouth standard fields"""
-		from frappe.model import default_fields
-		ret = {}
-		for key in self.fields:
-			if key not in default_fields and self.fields[key]:
-				ret[key] = self.fields[key]
-				
-		return ret
-		
-	def get_db_value(self, key):
-		return frappe.db.get_value(self.doctype, self.name, key)
-						
-def make_autoname(key, doctype=''):
-	"""
-   Creates an autoname from the given key:
-   
-   **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
-
-   
-   *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
-	"""
-	if key=="hash":
-		return frappe.generate_hash(doctype)
-	
-	if not "#" in key:
-		key = key + ".#####"
-	
-	n = ''
-	l = key.split('.')
-	series_set = False
-	today = now_datetime()
-	
-	for e in l:
-		en = ''
-		if e.startswith('#'):
-			if not series_set:
-				digits = len(e)
-				en = getseries(n, digits, doctype)
-				series_set = True
-		elif e=='YY': 
-			en = today.strftime('%y')
-		elif e=='MM': 
-			en = today.strftime('%m')
-		elif e=='DD':
-			en = today.strftime("%d")
-		elif e=='YYYY': 
-			en = today.strftime('%Y')		
-		else: en = e
-		n+=en
-	return n
-
-def getseries(key, digits, doctype=''):
-	# 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:
-		current = current[0][0]
-		# yes, update it
-		frappe.db.sql("update tabSeries set current = current+1 where name=%s", (key,))
-		current = cint(current) + 1
-	else:
-		# no, create it
-		frappe.db.sql("insert into tabSeries (name, current) values (%s, 1)", (key,))
-		current = 1
-	return ('%0'+str(digits)+'d') % current
-
-def getchildren(name, childtype, field='', parenttype='', from_doctype=0):
-	import frappe
-	from frappe.model.doclist import DocList
-	
-	condition = ""
-	values = []
-	
-	if field: 
-		condition += ' and parentfield=%s '
-		values.append(field)
-	if parenttype:
-		condition += ' and parenttype=%s '
-		values.append(parenttype)
-
-	dataset = frappe.db.sql("""select * from `tab%s` where parent=%s %s order by idx""" \
-		% (childtype, "%s", condition), tuple([name]+values))
-	desc = frappe.db.get_description()
-
-	l = DocList()
-	
-	for i in dataset:
-		d = Document()
-		d.doctype = childtype
-		d._load_values(i, desc)
-		l.append(d)
-	
-	return l
-
-def check_page_perm(doc):
-	if doc.name=='Login Page':
-		return
-	if doc.publish:
-		return
-
-	if not frappe.db.sql("select name from `tabPage Role` where parent=%s and role='Guest'", (doc.name,)):
-		frappe.response['403'] = 1
-		raise frappe.PermissionError, '[WNF] No read permission for %s %s' % ('Page', doc.name)
-
-def get(dt, dn='', with_children = 1, from_controller = 0):
-	"""
-	Returns a doclist containing the main record and all child records
-	"""	
-	import frappe
-	import frappe.model
-	from frappe.model.doclist import DocList
-	
-	dn = dn or dt
-
-	# load the main doc
-	doc = Document(dt, dn)
-
-	if dt=='Page' and frappe.session['user'] == 'Guest':
-		check_page_perm(doc)
-
-	if not with_children:
-		# done
-		return DocList([doc,])
-	
-	# get all children types
-	tablefields = frappe.model.meta.get_table_fields(dt)
-
-	# load chilren
-	doclist = DocList([doc,])
-	for t in tablefields:
-		doclist += getchildren(doc.name, t[0], t[1], dt)
-
-	return doclist
-
-def getsingle(doctype):
-	"""get single doc as dict"""
-	dataset = frappe.db.sql("select field, value from tabSingles where doctype=%s", (doctype,))
-	return dict(dataset)
-	
-def copy_common_fields(from_doc, to_doc):
-	from frappe.model import default_fields
-	doctype_list = frappe.get_doctype(to_doc.doctype)
-	
-	for fieldname, value in from_doc.fields.items():
-		if fieldname in default_fields:
-			continue
-		
-		if doctype_list.get_field(fieldname) and to_doc.fields[fieldname] != value:
-			to_doc.fields[fieldname] = value
-			
-def validate_name(doctype, name, case=None, merge=False):
-	if not merge:
-		if frappe.db.sql('select name from `tab%s` where name=%s' % (doctype,'%s'), (name,)):
-			raise NameError, 'Name %s already exists' % name
-	
-	# no name
-	if not name: return 'No Name Specified for %s' % doctype
-	
-	# new..
-	if name.startswith('New '+doctype):
-		raise NameError, 'There were some errors setting the name, please contact the administrator'
-	
-	if case=='Title Case': name = name.title()
-	if case=='UPPER CASE': name = name.upper()
-	
-	name = name.strip() # no leading and trailing blanks
-
-	return name
-	
-def get_default_naming_series(doctype):
-	"""get default value for `naming_series` property"""
-	from frappe.model.doctype import get_property
-	naming_series = get_property(doctype, "options", "naming_series")
-	if naming_series:
-		naming_series = naming_series.split("\n")
-		return naming_series[0] or naming_series[1]	
-	else:
-		return None
diff --git a/frappe/model/doclist.py b/frappe/model/doclist.py
deleted file mode 100644
index d04f3f9ea6..0000000000
--- a/frappe/model/doclist.py
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt 
-
-import frappe
-import frappe.model
-from frappe.model.doc import Document
-from frappe import _
-
-class DocList(list):
-	"""DocList object as a wrapper around a list"""
-	def get(self, filters, limit=0):
-		"""pass filters as:
-			{"key": "val", "key": ["!=", "val"],
-			"key": ["in", "val"], "key": ["not in", "val"], "key": "^val",
-			"key" : True (exists), "key": False (does not exist) }"""
-
-		out = []
-		
-		for doc in self:
-			d = isinstance(getattr(doc, "fields", None), dict) and doc.fields or doc
-			add = True
-			for f in filters:
-				fval = filters[f]
-				
-				if fval is True:
-					fval = ["not None", fval]
-				elif fval is False:
-					fval = ["None", fval]
-				elif not isinstance(fval, (tuple, list)):
-					if isinstance(fval, basestring) and fval.startswith("^"):
-						fval = ["^", fval[1:]]
-					else:
-						fval = ["=", fval]
-				
-				if not frappe.compare(d.get(f), fval[0], fval[1]):
-					add = False
-					break
-
-			if add:
-				out.append(doc)
-				if limit and (len(out)-1)==limit:
-					break
-		
-		return DocList(out)
-		
-	def get_distinct_values(self, fieldname):
-		return filter(None, list(set(map(lambda d: d.fields.get(fieldname), self))))
-
-	def remove_items(self, filters):
-		for d in self.get(filters):
-			self.remove(d)
-
-	def getone(self, filters):
-		return self.get(filters, limit=1)[0]
-
-	def copy(self):
-		out = []
-		for d in self:
-			if isinstance(d, dict):
-				fielddata = d
-			else:
-				fielddata = d.fields
-			fielddata.update({"name": None})
-			out.append(Document(fielddata=fielddata))
-		return DocList(out)
-		
-	def get_item_value(self, d, name):
-		if isinstance(d, dict):
-			return d.get(name)
-		else:
-			return d.fields.get(name)
-		
-	def filter_valid_fields(self):
-		import frappe.model
-		fieldnames = {}
-		for d in self:
-			remove = []
-			for f in d:
-				if f not in fieldnames.setdefault(d.doctype,
-						frappe.model.get_fieldnames(d.doctype)):
-					remove.append(f)
-			for f in remove:
-				del d[f]
-				
-	def append(self, doc):
-		if not isinstance(doc, Document):
-			doc = Document(fielddata=doc)
-			
-		self._prepare_doc(doc)
-
-		super(DocList, self).append(doc)
-		
-	def extend(self, doclist):
-		doclist = objectify(doclist)
-		for doc in doclist:
-			self._prepare_doc(doc)
-		
-		super(DocList, self).extend(doclist)
-		
-		return self
-		
-	def _prepare_doc(self, doc):
-		if not doc.name:
-			doc.fields["__islocal"] = 1
-			doc.docstatus = 0
-		if doc.parentfield:
-			if not doc.parenttype:
-				doc.parenttype = self[0].doctype
-			if not doc.parent:
-				doc.parent = self[0].name
-			if not doc.idx:
-				siblings = [int(self.get_item_value(d, "idx") or 0) for d in self.get({"parentfield": doc.parentfield})]
-				doc.idx = (max(siblings) + 1) if siblings else 1
-	
-	def update(self, doclist):
-		for i, d in enumerate(self):
-			if d.get("parent") and d.get("name") not in [t.get("name") for t in doclist]:
-				del self[i]
-				
-		for d in doclist:
-			if not d["name"]:
-				d["__islocal"] = 1
-				self.append(d)
-			else:
-				# child
-				found_in_existing = False
-
-				for ref in self:				
-					if d["name"] and ref.name and ref.name == d["name"]:
-						ref.fields.update(d)
-						found_in_existing = True
-						break
-						
-				if not found_in_existing:
-					d["__islocal"] = 1
-					d["name"] = None
-					self.append(d)
-					
-		return self
-		
-def objectify(doclist):
-	from frappe.model.doc import Document
-	return map(lambda d: isinstance(d, Document) and d or Document(d), doclist)
diff --git a/frappe/model/doctype.py b/frappe/model/doctype.py
deleted file mode 100644
index 5fecaad9d5..0000000000
--- a/frappe/model/doctype.py
+++ /dev/null
@@ -1,425 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt
-
-"""
-Get metadata (main doctype with fields and permissions with all table doctypes)
-
-- if exists in cache, get it from cache
-- add custom fields
-- override properties from PropertySetter
-- sort based on prev_field
-- optionally, post process (add js, css, select fields), or without
-
-"""
-from __future__ import unicode_literals
-
-# imports
-import json, os
-import frappe
-import frappe.model
-import frappe.model.doc
-import frappe.model.doclist
-from frappe.utils import cint, cstr
-
-doctype_cache = frappe.local('doctype_doctype_cache')
-docfield_types = frappe.local('doctype_docfield_types')
-
-# doctype_cache = {}
-# docfield_types = None
-
-def get(doctype, processed=False, cached=True):
-	"""return doclist"""
-	if cached:
-		doclist = from_cache(doctype, processed)
-		if doclist: 
-			if processed:
-				update_language(doclist)
-			return DocTypeDocList(doclist)
-	
-	load_docfield_types()
-	
-	# main doctype doclist
-	doclist = get_doctype_doclist(doctype)
-
-	# add doctypes of table fields
-	table_types = [d.options for d in doclist \
-		if d.doctype=='DocField' and d.fieldtype=='Table']
-		
-	for table_doctype in table_types:
-		doclist += get_doctype_doclist(table_doctype)
-			
-	if processed: 
-		add_code(doctype, doclist)
-		expand_selects(doclist)
-		add_print_formats(doclist)
-		add_search_fields(doclist)
-		add_workflows(doclist)
-		add_linked_with(doclist)
-	
-	to_cache(doctype, processed, doclist)
-
-	if processed:
-		update_language(doclist)
-
-	return DocTypeDocList(doclist)
-
-def load_docfield_types():
-	frappe.local.doctype_docfield_types = dict(frappe.db.sql("""select fieldname, fieldtype from tabDocField
-		where parent='DocField'"""))
-
-def add_workflows(doclist):
-	from frappe.model.workflow import get_workflow_name
-	doctype = doclist[0].name
-	
-	# get active workflow
-	workflow_name = get_workflow_name(doctype)
-
-	if workflow_name and frappe.db.exists("Workflow", workflow_name):
-		doclist += frappe.get_doclist("Workflow", workflow_name)
-		
-		# add workflow states (for icons and style)
-		for state in map(lambda d: d.state, doclist.get({"doctype":"Workflow Document State"})):
-			doclist += frappe.get_doclist("Workflow State", state)
-	
-def get_doctype_doclist(doctype):
-	"""get doclist of single doctype"""
-	doclist = frappe.get_doclist('DocType', doctype)
-	add_custom_fields(doctype, doclist)
-	apply_property_setters(doctype, doclist)
-	sort_fields(doclist)
-	return doclist
-
-def sort_fields(doclist):
-	"""sort on basis of previous_field"""
-
-	from frappe.model.doclist import DocList
-	newlist = DocList([])
-	pending = doclist.get({"doctype":"DocField"})
-
-	if doclist[0].get("_idx"):
-		for fieldname in json.loads(doclist[0].get("_idx")):
-			d = doclist.get({"fieldname": fieldname})
-			if d:
-				newlist.append(d[0])
-				pending.remove(d[0])
-	else:
-		maxloops = 20
-		while (pending and maxloops>0):
-			maxloops -= 1
-			for d in pending[:]:
-				if d.previous_field:
-					# field already added
-					for n in newlist:
-						if n.fieldname==d.previous_field:
-							newlist.insert(newlist.index(n)+1, d)
-							pending.remove(d)
-							break
-				else:
-					newlist.append(d)
-					pending.remove(d)
-
-	# recurring at end	
-	if pending:
-		newlist += pending
-
-	# renum
-	idx = 1
-	for d in newlist:
-		d.idx = idx
-		idx += 1
-
-	doclist.get({"doctype":["!=", "DocField"]}).extend(newlist)
-			
-def apply_property_setters(doctype, doclist):		
-	for ps in frappe.db.sql("""select * from `tabProperty Setter` where
-		doc_type=%s""", (doctype,), as_dict=1):
-		if ps['doctype_or_field']=='DocType':
-			if ps.get('property_type', None) in ('Int', 'Check'):
-				ps['value'] = cint(ps['value'])
-			doclist[0].fields[ps['property']] = ps['value']
-		else:
-			docfield = filter(lambda d: d.doctype=="DocField" and d.fieldname==ps['field_name'], 
-				doclist)
-			if not docfield: continue
-			if docfield_types.get(ps['property'], None) in ('Int', 'Check'):
-				ps['value'] = cint(ps['value'])
-				
-			docfield[0].fields[ps['property']] = ps['value']
-
-def add_custom_fields(doctype, doclist):
-	try:
-		res = frappe.db.sql("""SELECT * FROM `tabCustom Field`
-			WHERE dt = %s AND docstatus < 2""", (doctype,), as_dict=1)
-	except Exception, e:
-		if e.args[0]==1146:
-			return doclist
-		else:
-			raise
-
-	for r in res:
-		custom_field = frappe.model.doc.Document(fielddata=r)
-		
-		# convert to DocField
-		custom_field.fields.update({
-			'doctype': 'DocField',
-			'parent': doctype,
-			'parentfield': 'fields',
-			'parenttype': 'DocType',
-			'__custom_field': 1
-		})
-		doclist.append(custom_field)
-
-	return doclist
-
-def add_linked_with(doclist):
-	"""add list of doctypes this doctype is 'linked' with"""
-	doctype = doclist[0].name
-	links = frappe.db.sql("""select parent, fieldname from tabDocField
-		where (fieldtype="Link" and options=%s)
-		or (fieldtype="Select" and options=%s)""", (doctype, "link:"+ doctype))
-	links += frappe.db.sql("""select dt as parent, fieldname from `tabCustom Field`
-		where (fieldtype="Link" and options=%s)
-		or (fieldtype="Select" and options=%s)""", (doctype, "link:"+ doctype))
-
-	links = dict(links)
-
-	if not links: 
-		return {}
-
-	ret = {}
-
-	for dt in links:
-		ret[dt] = { "fieldname": links[dt] }
-
-	for grand_parent, options in frappe.db.sql("""select parent, options from tabDocField 
-		where fieldtype="Table" 
-			and options in (select name from tabDocType 
-				where istable=1 and name in (%s))""" % ", ".join(["%s"] * len(links)) ,tuple(links)):
-
-		ret[grand_parent] = {"child_doctype": options, "fieldname": links[options] }
-		if options in ret:
-			del ret[options]
-		
-	doclist[0].fields["__linked_with"] = ret
-
-def from_cache(doctype, processed):
-	""" load doclist from cache.
-		sets flag __from_cache in first doc of doclist if loaded from cache"""
-
-	# from memory
-	if doctype_cache and not processed and doctype in doctype_cache:
-		doclist = doctype_cache[doctype]
-		doclist[0].fields["__from_cache"] = 1
-		return doclist
-
-	doclist = frappe.cache().get_value(cache_name(doctype, processed))
-	if doclist:
-		from frappe.model.doclist import DocList
-		doclist = DocList([frappe.model.doc.Document(fielddata=d)
-				for d in doclist])
-		doclist[0].fields["__from_cache"] = 1
-		return doclist
-
-def to_cache(doctype, processed, doclist):
-
-	if not doctype_cache:
-		frappe.local.doctype_doctype_cache = {}
-
-	frappe.cache().set_value(cache_name(doctype, processed), 
-		[d.fields for d in doclist])
-
-	if not processed:
-		doctype_cache[doctype] = doclist
-
-def cache_name(doctype, processed):
-	"""returns cache key"""
-	suffix = ""
-	if processed:
-		suffix = ":Raw"
-	return "doctype:" + doctype + suffix
-
-def clear_cache(doctype=None):
-	def clear_single(dt):
-		frappe.cache().delete_value(cache_name(dt, False))
-		frappe.cache().delete_value(cache_name(dt, True))
-		frappe.cache().delete_value("meta:" + dt)
-		frappe.cache().delete_value("form_meta:" + dt)
-
-		if doctype_cache and (dt in doctype_cache):
-			del doctype_cache[dt]
-
-	if doctype:
-		clear_single(doctype)
-	
-		# clear all parent doctypes
-		for dt in frappe.db.sql("""select parent from tabDocField 
-			where fieldtype="Table" and options=%s""", (doctype,)):
-			clear_single(dt[0])
-		
-		# clear all notifications
-		from frappe.core.doctype.notification_count.notification_count import delete_notification_count_for
-		delete_notification_count_for(doctype)
-		
-	else:
-		# clear all
-		for dt in frappe.db.sql("""select name from tabDocType"""):
-			clear_single(dt[0])
-			
-	frappe.cache().delete_value("is_table")
-
-def add_code(doctype, doclist):
-	import os
-	from frappe.modules import scrub, get_module_path
-	
-	doc = doclist[0]
-	
-	path = os.path.join(get_module_path(doc.module), 'doctype', scrub(doc.name))
-	def _get_path(fname):
-		return os.path.join(path, scrub(fname))
-	
-	_add_code(doc, _get_path(doc.name + '.js'), '__js')
-	_add_code(doc, _get_path(doc.name + '.css'), "__css")
-	_add_code(doc, _get_path(doc.name + '_list.js'), '__list_js')
-	_add_code(doc, _get_path(doc.name + '_calendar.js'), '__calendar_js')
-	_add_code(doc, _get_path(doc.name + '_map.js'), '__map_js')
-	
-	add_custom_script(doc)
-	add_code_via_hook(doc, "doctype_js", "__js")
-	
-def _add_code(doc, path, fieldname):
-	js = frappe.read_file(path)
-	if js:
-		doc.fields[fieldname] = (doc.fields.get(fieldname) or "") + "\n\n" + render_jinja(js)
-		
-def add_code_via_hook(doc, hook, fieldname):
-	hook = "{}:{}".format(hook, doc.name)
-	for app_name in frappe.get_installed_apps():
-		for file in frappe.get_hooks(hook, app_name=app_name):
-			path = frappe.get_app_path(app_name, *file.strip("/").split("/"))
-			_add_code(doc, path, fieldname)
-	
-def add_custom_script(doc):
-	"""embed all require files"""
-	# custom script
-	custom = frappe.db.get_value("Custom Script", {"dt": doc.name, 
-		"script_type": "Client"}, "script") or ""
-	
-	doc.fields["__js"] = (doc.fields.get('__js') or '') + "\n\n".join(custom)
-	
-def render_jinja(content):
-	if "{% include" in content:
-		content = frappe.get_jenv().from_string(content).render()
-	return content
-	
-def expand_selects(doclist):
-	for d in filter(lambda d: d.fieldtype=='Select' \
-		and (d.options or '').startswith('link:'), doclist):
-		doctype = d.options.split("\n")[0][5:]
-		d.link_doctype = doctype
-		d.options = '\n'.join([''] + [o.name for o in frappe.db.sql("""select 
-			name from `tab%s` where docstatus<2 order by name asc""" % doctype, as_dict=1)])
-
-def add_print_formats(doclist):
-	print_formats = frappe.db.sql("""select * FROM `tabPrint Format`
-		WHERE doc_type=%s AND docstatus<2""", (doclist[0].name,), as_dict=1)
-	for pf in print_formats:
-		doclist.append(frappe.model.doc.Document('Print Format', fielddata=pf))
-
-def get_property(dt, prop, fieldname=None):
-	"""get a doctype property"""
-	doctypelist = get(dt)
-	if fieldname:
-		field = doctypelist.get_field(fieldname)
-		return field and field.fields.get(prop) or None
-	else:
-		return doctypelist[0].fields.get(prop)
-		
-def get_link_fields(doctype):
-	"""get docfields of links and selects with "link:"
-	for main doctype and child doctypes"""
-	doctypelist = get(doctype)
-	return doctypelist.get({"fieldtype":"Link"}).extend(doctypelist.get({"fieldtype":"Select",
-		"options": "^link:"}))
-
-def add_validators(doctype, doclist):
-	for validator in frappe.db.sql("""select name from `tabDocType Validator` where
-		for_doctype=%s""", (doctype,), as_dict=1):
-		doclist.extend(frappe.get_doclist('DocType Validator', validator.name))
-		
-def add_search_fields(doclist):
-	"""add search fields found in the doctypes indicated by link fields' options"""
-	for lf in doclist.get({"fieldtype": "Link", "options":["!=", "[Select]"]}):
-		if lf.options:
-			search_fields = get(lf.options)[0].search_fields
-			if search_fields:
-				lf.search_fields = map(lambda sf: sf.strip(), search_fields.split(","))
-
-def update_language(doclist):
-	"""update language"""
-	if frappe.local.lang != 'en':
-		doclist[0].fields["__messages"] = frappe.get_lang_dict("doctype", doclist[0].name)
-
-class DocTypeDocList(frappe.model.doclist.DocList):
-	def get_field(self, fieldname, parent=None, parentfield=None):
-		filters = {"doctype":"DocField"}
-		if isinstance(fieldname, dict):
-			filters.update(fieldname)
-		else:
-			filters["fieldname"] = fieldname
-		
-		# if parentfield, get the name of the parent table
-		if parentfield:
-			parent = self.get_options(parentfield)
-
-		if parent:
-			filters["parent"] = parent
-		else:
-			filters["parent"] = self[0].name
-		
-		fields = self.get(filters)
-		if fields:
-			return fields[0]
-			
-	def has_field(self, fieldname):
-		return fieldname in self.get_fieldnames()
-		
-	def get_fieldnames(self, filters=None):
-		return map(lambda df: df.fieldname, self.get_docfields(filters))
-		
-	def get_docfields(self, filters=None):
-		if not filters: filters = {}
-		filters.update({"doctype": "DocField", "parent": self[0].name})
-		return self.get(filters)
-	
-	def get_options(self, fieldname, parent=None, parentfield=None):
-		return self.get_field(fieldname, parent, parentfield).options
-		
-	def get_label(self, fieldname, parent=None, parentfield=None):
-		return self.get_field(fieldname, parent, parentfield).label
-		
-	def get_table_fields(self):
-		return self.get({"doctype": "DocField", "fieldtype": "Table"})
-		
-	def get_parent_doclist(self):
-		return frappe.doclist([self[0]] + self.get({"parent": self[0].name}))
-		
-	def get_restricted_fields(self, restricted_types):
-		restricted_fields = self.get({
-			"doctype":"DocField", 
-			"fieldtype":"Link", 
-			"parent": self[0].name, 
-			"ignore_restrictions":("!=", 1), 
-			"options":("in", restricted_types)
-		})
-		if self[0].name in restricted_types:
-			restricted_fields.append(frappe._dict({"label":"Name", "fieldname":"name", "options": self[0].name}))
-		return restricted_fields
-		
-	def get_permissions(self, user=None):
-		user_roles = frappe.get_roles(user)
-		return [p for p in self.get({"doctype": "DocPerm"})
-				if cint(p.permlevel)==0 and (p.role=="All" or p.role in user_roles)]
-				
-	def get_link_fields(self):
-		return self.get({"fieldtype":"Link", "parent": self[0].name})\
-			.extend(self.get({"fieldtype":"Select", "options": "^link:", "parent": self[0].name}))
diff --git a/frappe/model/document.py b/frappe/model/document.py
index f46849d54c..d859988672 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -12,7 +12,9 @@ from frappe.model.base_document import BaseDocument
 # methods
 
 def get_doc(arg1, arg2=None):
-	if isinstance(arg1, basestring):
+	if isinstance(arg1, BaseDocument):
+		return arg1
+	elif isinstance(arg1, basestring):
 		doctype = arg1
 	else:
 		doctype = arg1.get("doctype")
@@ -315,6 +317,14 @@ class Document(BaseDocument):
 		if hasattr(self, method):
 			fn = lambda self, *args, **kwargs: getattr(self, method)(*args, **kwargs)
 			return Document.hook(fn)(self, *args, **kwargs)
+			
+	def submit(self):
+		self.docstatus = 1
+		self.save()
+
+	def cancel(self):
+		self.docstatus = 2
+		self.save()
 	
 	def run_before_save_methods(self):
 		if self._action=="save":
diff --git a/frappe/model/mapper.py b/frappe/model/mapper.py
index 388673b3d5..6dd5cbbd86 100644
--- a/frappe/model/mapper.py
+++ b/frappe/model/mapper.py
@@ -20,8 +20,8 @@ def get_mapped_doclist(from_doctype, from_docname, table_maps, target_doclist=No
 	if not ignore_permissions and not frappe.has_permission(from_doctype, "read", source.doc):
 		frappe.msgprint("No Permission", raise_exception=frappe.PermissionError)
 
-	source_meta = frappe.get_doctype(from_doctype)
-	target_meta = frappe.get_doctype(table_maps[from_doctype]["doctype"])
+	source_meta = frappe.get_meta(from_doctype)
+	target_meta = frappe.get_meta(table_maps[from_doctype]["doctype"])
 	
 	# main
 	if target_doclist:
diff --git a/frappe/model/meta.py b/frappe/model/meta.py
index 380d02e31d..b63c2a96dc 100644
--- a/frappe/model/meta.py
+++ b/frappe/model/meta.py
@@ -46,7 +46,17 @@ class Meta(Document):
 		
 	def get_table_field_doctype(self, fieldname):
 		return { "fields": "DocField", "permissions": "DocPerm"}.get(fieldname)
+	
+	def get_field(self, fieldname):
+		fields = self.get("fields", {"fieldname":fieldname})
+		return fields[0] if fields else None
 
+	def get_label(self, fieldname):
+		return self.get_field(fieldname).label
+		
+	def get_options(self, fieldname):
+		return self.get_field(fieldname).options
+		
 	def process(self):
 		self.add_custom_fields()
 		self.apply_property_setters()
@@ -174,11 +184,7 @@ def get_table_fields(doctype):
 
 def has_field(doctype, fieldname, parent=None, parentfield=None):
 	return get_field(doctype, fieldname, parent=None, parentfield=None) and True or False
-		
-def get_field(doctype, fieldname, parent=None, parentfield=None):
-	doclist = frappe.get_doctype(doctype)
-	return doclist.get_field(fieldname, parent, parentfield)
-	
+			
 def get_field_currency(df, doc):
 	"""get currency based on DocField options and fieldvalue in doc"""
 	currency = None
diff --git a/frappe/model/naming.py b/frappe/model/naming.py
index 1540c80deb..32e348accf 100644
--- a/frappe/model/naming.py
+++ b/frappe/model/naming.py
@@ -12,7 +12,7 @@ def set_new_name(doc):
 		return
 
 	doc._new_name_set = True
-	autoname = frappe.get_doctype(doc.doctype)[0].autoname
+	autoname = frappe.get_meta(doc.doctype).autoname
 	doc.localname = doc.name # for passing back to client
 
 	# amendments
diff --git a/frappe/model/utils.py b/frappe/model/utils.py
index 88d6039157..da98f1ae35 100644
--- a/frappe/model/utils.py
+++ b/frappe/model/utils.py
@@ -4,113 +4,10 @@
 from __future__ import unicode_literals
 import frappe, json
 from frappe import _
-from frappe.model.doc import Document
 """
 Model utilities, unclassified functions
 """
 
-def expand(docs):
-	"""
-		Expand a doclist sent from the client side. (Internally used by the request handler)
-	"""
-	def xzip(a,b):
-		d = {}
-		for i in range(len(a)):
-			d[a[i]] = b[i]
-		return d
-
-	docs = json.loads(docs)
-	clist = []
-	for d in docs['_vl']:
-		doc = xzip(docs['_kl'][d[0]], d);
-		clist.append(doc)
-	return clist
-
-def compress(doclist):
-	"""
-	   Compress a doclist before sending it to the client side. (Internally used by the request handler)
-
-	"""
-	docs = [isinstance(d, Document) and d.fields or d for d in doclist]
-
-	kl, vl = {}, []
-	forbidden = ['server_code_compiled']
-
-	# scan for keys & values
-	for d in docs:
-		dt = d['doctype']
-		if not (dt in kl.keys()):
-			kl[dt] = ['doctype','localname','__oldparent','__unsaved']	
-
-		# add client script for doctype, doctype due to ambiguity
-		if dt=='DocType' and '__client_script' not in kl[dt]: 
-			kl[dt].append('__client_script')
-
-		for f in d.keys():
-			if not (f in kl[dt]) and not (f in forbidden):
-				# if key missing, then append
-				kl[dt].append(f)
-
-		# build values
-		tmp = []
-		for f in kl[dt]:
-			v = d.get(f)
-			if type(v)==long:
-				v=int(v)
-			tmp.append(v)
-
-		vl.append(tmp)
-	return {'_vl':vl,'_kl':kl}
-
-
-def getlist(doclist, field):
-	from frappe.utils import cint
-	l = []
-	for d in doclist:
-		if d.parentfield == field:
-			l.append(d)
-	l.sort(lambda a, b: cint(a.idx) - cint(b.idx))
-	return l
-
-def copy_doclist(doclist, no_copy = []):
-	"""
-      Save & return a copy of the given doclist
-      Pass fields that are not to be copied in `no_copy`
-	"""
-
-	cl = []
-
-	# main doc
-	c = Document(fielddata = doclist[0].fields.copy())
-
-	# clear no_copy fields
-	for f in no_copy:
-		if c.fields.has_key(f):
-			c.fields[f] = None
-
-	c.name = None
-	c.save(1)
-	cl.append(c)
-
-	# new parent name
-	parent = c.name
-
-	# children
-	for d in doclist[1:]:
-		c = Document(fielddata = d.fields.copy())
-		c.name = None
-
-		# clear no_copy fields
-		for f in no_copy:
-			if c.fields.has_key(f):
-				c.fields[f] = None
-
-		c.parent = parent
-		c.save(1)
-		cl.append(c)
-
-	return cl
-
 def set_default(doc, key):
 	if not doc.is_default:
 		frappe.db.set(doc, "is_default", 1)
diff --git a/frappe/test_runner.py b/frappe/test_runner.py
index 9a9fe36e09..8ffc2e9fa7 100644
--- a/frappe/test_runner.py
+++ b/frappe/test_runner.py
@@ -165,10 +165,10 @@ def make_test_objects(doctype, test_records, verbose=None):
 def print_mandatory_fields(doctype):
 	print "Please setup make_test_records for: " + doctype
 	print "-" * 60
-	doctype_obj = frappe.get_doctype(doctype)
-	print "Autoname: " + (doctype_obj[0].autoname or "")
+	meta = frappe.get_meta(doctype)
+	print "Autoname: " + (meta.autoname or "")
 	print "Mandatory Fields: "
-	for d in doctype_obj.get({"reqd":1}):
+	for d in meta.get({"reqd":1}):
 		print d.parent + ":" + d.fieldname + " | " + d.fieldtype + " | " + (d.options or "")
 	print		
 
diff --git a/frappe/translate.py b/frappe/translate.py
index 223bb4c83e..b02b447b37 100644
--- a/frappe/translate.py
+++ b/frappe/translate.py
@@ -141,11 +141,11 @@ def get_messages_for_app(app):
 
 def get_messages_from_doctype(name):
 	messages = []
-	meta = frappe.get_doctype(name)
+	meta = frappe.get_meta(name)
 	
-	messages = [meta[0].name, meta[0].description, meta[0].module]
+	messages = [meta.name, meta.description, meta.module]
 	
-	for d in meta.get({"doctype":"DocField"}):
+	for d in meta.get("fields"):
 		messages.extend([d.label, d.description])
 		
 		if d.fieldtype=='Select' and d.options \
@@ -156,7 +156,7 @@ def get_messages_from_doctype(name):
 				messages.extend(options)
 				
 	# extract from js, py files
-	doctype_file_path = frappe.get_module_path(meta[0].module, "doctype", meta[0].name, meta[0].name)
+	doctype_file_path = frappe.get_module_path(meta.module, "doctype", meta.name, meta.name)
 	messages.extend(get_messages_from_file(doctype_file_path + ".js"))
 	return clean(messages)
 	
diff --git a/frappe/utils/datautils.py b/frappe/utils/datautils.py
index 028391acdd..5bc9a1abfc 100644
--- a/frappe/utils/datautils.py
+++ b/frappe/utils/datautils.py
@@ -92,17 +92,13 @@ class UnicodeWriter:
 	def getvalue(self):
 		return self.queue.getvalue()
 		
-def check_record(d, parenttype=None, doctype_dl=None):
+def check_record(d):
 	"""check for mandatory, select options, dates. these should ideally be in doclist"""
 	from frappe.utils.dateutils import parse_date
-	if parenttype and not d.get('parent'):
-		frappe.msgprint(_("Parent is required."), raise_exception=1)
-
-	if not doctype_dl:
-		doctype_dl = frappe.model.doctype.get(d.doctype)
+	d = frappe.get_doc(d)
 
 	for key in d:
-		docfield = doctype_dl.get_field(key)
+		docfield = d.meta.get_field(key)
 		val = d[key]
 		if docfield:
 			if docfield.reqd and (val=='' or val==None):
diff --git a/frappe/website/doctype/blog_post/test_blog_post.py b/frappe/website/doctype/blog_post/test_blog_post.py
index ac42ccb289..6d99d5c67a 100644
--- a/frappe/website/doctype/blog_post/test_blog_post.py
+++ b/frappe/website/doctype/blog_post/test_blog_post.py
@@ -163,7 +163,7 @@ class TestBlogPost(unittest.TestCase):
 		self.assertTrue(bean.has_read_perm())
 		
 	def test_set_only_once(self):
-		blog_post = frappe.get_doctype("Blog Post")
+		blog_post = frappe.get_meta("Blog Post")
 		blog_post.get_field("title").set_only_once = 1
 		bean = frappe.bean("Blog Post", "_test-blog-post-1")
 		bean.doc.title = "New"
diff --git a/frappe/website/doctype/website_group/website_group.py b/frappe/website/doctype/website_group/website_group.py
index 536ae27943..fdf4132b24 100644
--- a/frappe/website/doctype/website_group/website_group.py
+++ b/frappe/website/doctype/website_group/website_group.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
 import frappe
 from frappe.website.website_generator import WebsiteGenerator
 from frappe.templates.generators.website_group import clear_cache
-from frappe.model.doc import make_autoname
+from frappe.model.naming import make_autoname
 
 class WebsiteGroup(WebsiteGenerator):
 		
diff --git a/frappe/widgets/form/utils.py b/frappe/widgets/form/utils.py
index 9731bf7f01..91bcc3f012 100644
--- a/frappe/widgets/form/utils.py
+++ b/frappe/widgets/form/utils.py
@@ -3,6 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe, json
+import frappe.widgets.form.meta
 
 from frappe import _
 
@@ -87,13 +88,13 @@ def get_next(doctype, name, prev):
 @frappe.whitelist()
 def get_linked_docs(doctype, name, metadata_loaded=None):
 	if not metadata_loaded: metadata_loaded = []
-	meta = frappe.get_doctype(doctype, True)
-	linkinfo = meta[0].get("__linked_with")
+	meta = frappe.widgets.form.meta.get_meta(doctype)
+	linkinfo = meta.get("__linked_with")
 	results = {}
 	for dt, link in linkinfo.items():
 		link["doctype"] = dt
-		linkmeta = frappe.get_doctype(dt, True)
-		if not linkmeta[0].get("issingle"):
+		linkmeta = frappe.widgets.form.meta.get_meta(dt)
+		if not linkmeta.get("issingle"):
 			fields = [d.fieldname for d in linkmeta.get({"parent":dt, "in_list_view":1, 
 				"fieldtype": ["not in", ["Image", "HTML", "Button", "Table"]]})] \
 				+ ["name", "modified", "docstatus"]
diff --git a/frappe/widgets/reportview.py b/frappe/widgets/reportview.py
index a2a193cb20..74ef85dac2 100644
--- a/frappe/widgets/reportview.py
+++ b/frappe/widgets/reportview.py
@@ -52,8 +52,7 @@ def compress(data):
 @frappe.whitelist()
 def save_report():
 	"""save report"""
-	from frappe.model.doc import Document
-	
+		
 	data = frappe.local.form_dict
 	if frappe.db.exists('Report', data['name']):
 		d = Document('Report', data['name'])
diff --git a/frappe/widgets/search.py b/frappe/widgets/search.py
index f740e2a6a3..d166f3cd03 100644
--- a/frappe/widgets/search.py
+++ b/frappe/widgets/search.py
@@ -22,7 +22,7 @@ def search_widget(doctype, txt, query=None, searchfield="name", start=0,
 		import json
 		filters = json.loads(filters)
 
-	meta = frappe.get_doctype(doctype)
+	meta = frappe.get_meta(doctype)
 
 	standard_queries = frappe.get_hooks().standard_queries or []
 	if standard_queries:
@@ -68,12 +68,12 @@ def search_widget(doctype, txt, query=None, searchfield="name", start=0,
 
 def get_std_fields_list(meta, key):
 	# get additional search fields
-	sflist = meta[0].search_fields and meta[0].search_fields.split(",") or []
+	sflist = meta.search_fields and meta.search_fields.split(",") or []
 	sflist = ['name'] + sflist
 	if not key in sflist:
 		sflist = sflist + [key]
 
-	return ['`tab%s`.`%s`' % (meta[0].name, f.strip()) for f in sflist]
+	return ['`tab%s`.`%s`' % (meta.name, f.strip()) for f in sflist]
 
 def build_for_autosuggest(res):
 	results = []

From 16187266a4fde15230a98a43324b4139bbef636f Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 27 Mar 2014 17:53:44 +0530
Subject: [PATCH 5/5] frappe/frappe#478

---
 frappe/core/doctype/bulk_email/bulk_email.txt |  167 ++-
 frappe/core/doctype/comment/comment.txt       |  255 ++---
 .../doctype/communication/communication.txt   |  449 ++++----
 .../doctype/control_panel/control_panel.txt   |  433 ++++---
 .../doctype/custom_field/custom_field.txt     |  598 +++++-----
 .../doctype/custom_script/custom_script.txt   |  158 ++-
 .../doctype/customize_form/customize_form.txt |  287 +++--
 .../customize_form_field.txt                  |  485 ++++----
 .../default_home_page/default_home_page.txt   |   78 +-
 .../doctype/defaultvalue/defaultvalue.txt     |  104 +-
 frappe/core/doctype/docfield/docfield.txt     |  637 +++++------
 frappe/core/doctype/docperm/docperm.txt       |  445 ++++----
 frappe/core/doctype/doctype/doctype.txt       |  737 ++++++------
 frappe/core/doctype/event/event.txt           |  575 +++++-----
 frappe/core/doctype/event_role/event_role.txt |   67 +-
 frappe/core/doctype/event_user/event_user.txt |   69 +-
 frappe/core/doctype/file_data/file_data.txt   |  159 ++-
 .../core/doctype/letter_head/letter_head.txt  |  175 ++-
 frappe/core/doctype/module_def/module_def.txt |  111 +-
 .../notification_count/notification_count.txt |   79 +-
 .../outgoing_email_settings.txt               |  195 ++--
 frappe/core/doctype/page/page.txt             |  242 ++--
 frappe/core/doctype/page_role/page_role.txt   |   79 +-
 frappe/core/doctype/patch_log/patch_log.txt   |   85 +-
 .../doctype/print_format/print_format.txt     |  337 +++---
 .../property_setter/property_setter.txt       |  250 ++--
 frappe/core/doctype/report/report.txt         |  323 +++---
 frappe/core/doctype/role/role.txt             |  127 +--
 .../doctype/scheduler_log/scheduler_log.txt   |  109 +-
 .../social_login_keys/social_login_keys.txt   |  177 ++-
 frappe/core/doctype/tag/tag.txt               |   89 +-
 frappe/core/doctype/todo/todo.txt             |  408 ++++---
 frappe/core/doctype/user/user.txt             | 1004 ++++++++---------
 frappe/core/doctype/userrole/userrole.txt     |   83 +-
 frappe/core/doctype/version/version.txt       |  109 +-
 frappe/core/doctype/workflow/workflow.txt     |  207 ++--
 .../workflow_action/workflow_action.txt       |   91 +-
 .../workflow_document_state.txt               |  154 ++-
 .../doctype/workflow_state/workflow_state.txt |  131 +--
 .../workflow_transition.txt                   |  116 +-
 .../core/page/applications/applications.txt   |   53 +-
 .../data_import_tool/data_import_tool.txt     |   53 +-
 frappe/core/page/desktop/desktop.txt          |   53 +-
 frappe/core/page/messages/messages.txt        |   53 +-
 .../core/page/modules_setup/modules_setup.txt |   53 +-
 .../permission_manager/permission_manager.txt |   53 +-
 .../page/user_properties/user_properties.txt  |   53 +-
 frappe/core/report/todo/todo.txt              |   37 +-
 .../about_us_settings/about_us_settings.txt   |  213 ++--
 .../about_us_team_member.txt                  |   93 +-
 .../doctype/blog_category/blog_category.txt   |  165 ++-
 .../website/doctype/blog_post/blog_post.txt   |  293 +++--
 .../doctype/blog_settings/blog_settings.txt   |  109 +-
 frappe/website/doctype/blogger/blogger.txt    |  193 ++--
 .../company_history/company_history.txt       |   72 +-
 .../contact_us_settings.txt                   |  255 ++---
 frappe/website/doctype/post/post.txt          |  275 +++--
 .../doctype/style_settings/style_settings.txt |  390 +++----
 .../doctype/top_bar_item/top_bar_item.txt     |  110 +-
 .../website/doctype/user_vote/user_vote.txt   |  104 +-
 frappe/website/doctype/web_page/web_page.txt  |  351 +++---
 .../doctype/website_group/website_group.txt   |  265 ++---
 .../doctype/website_route/website_route.txt   |  283 +++--
 .../website_route_permission.txt              |  155 ++-
 .../doctype/website_script/website_script.txt |   89 +-
 .../website_settings/website_settings.txt     |  517 +++++----
 .../website_slideshow/website_slideshow.txt   |  151 ++-
 .../website_slideshow_item.txt                |   95 +-
 .../website_template/website_template.txt     |  279 +++--
 .../page/sitemap_browser/sitemap_browser.txt  |   60 +-
 70 files changed, 7151 insertions(+), 8158 deletions(-)

diff --git a/frappe/core/doctype/bulk_email/bulk_email.txt b/frappe/core/doctype/bulk_email/bulk_email.txt
index c47da6d4d3..282fa2aeaf 100644
--- a/frappe/core/doctype/bulk_email/bulk_email.txt
+++ b/frappe/core/doctype/bulk_email/bulk_email.txt
@@ -1,93 +1,74 @@
-[
- {
-  "creation": "2012-08-02 15:17:28", 
-  "docstatus": 0, 
-  "modified": "2014-02-12 21:11:05", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "description": "Bulk Email records.", 
-  "doctype": "DocType", 
-  "document_type": "System", 
-  "icon": "icon-envelope", 
-  "in_create": 1, 
-  "module": "Core", 
-  "name": "__common__", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Bulk Email", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Bulk Email", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "role": "System Manager"
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Bulk Email"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "sender", 
-  "fieldtype": "Data", 
-  "label": "Sender"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "recipient", 
-  "fieldtype": "Data", 
-  "label": "Recipient"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "message", 
-  "fieldtype": "Long Text", 
-  "label": "Message"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "status", 
-  "fieldtype": "Data", 
-  "label": "Status"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "error", 
-  "fieldtype": "Text", 
-  "label": "Error"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "ref_doctype", 
-  "fieldtype": "Link", 
-  "label": "Reference DocType", 
-  "options": "DocType", 
-  "read_only": 1, 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "ref_docname", 
-  "fieldtype": "Data", 
-  "label": "Reference DocName", 
-  "read_only": 1, 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "creation": "2012-08-02 15:17:28", 
+ "description": "Bulk Email records.", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "System", 
+ "fields": [
+  {
+   "fieldname": "sender", 
+   "fieldtype": "Data", 
+   "label": "Sender", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "recipient", 
+   "fieldtype": "Data", 
+   "label": "Recipient", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "message", 
+   "fieldtype": "Long Text", 
+   "label": "Message", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "status", 
+   "fieldtype": "Data", 
+   "label": "Status", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "error", 
+   "fieldtype": "Text", 
+   "label": "Error", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "ref_doctype", 
+   "fieldtype": "Link", 
+   "label": "Reference DocType", 
+   "options": "DocType", 
+   "permlevel": 0, 
+   "read_only": 1, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "ref_docname", 
+   "fieldtype": "Data", 
+   "label": "Reference DocName", 
+   "permlevel": 0, 
+   "read_only": 1, 
+   "reqd": 1
+  }
+ ], 
+ "icon": "icon-envelope", 
+ "idx": 1, 
+ "in_create": 1, 
+ "modified": "2014-02-12 21:11:05", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Bulk Email", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "role": "System Manager"
+  }
+ ], 
+ "read_only": 1
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/comment/comment.txt b/frappe/core/doctype/comment/comment.txt
index 2f44641886..23439f92b2 100644
--- a/frappe/core/doctype/comment/comment.txt
+++ b/frappe/core/doctype/comment/comment.txt
@@ -1,137 +1,118 @@
-[
- {
-  "creation": "2012-08-08 10:40:11", 
-  "docstatus": 0, 
-  "modified": "2014-01-24 13:00:20", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "autoname": "CWR/.#####", 
-  "doctype": "DocType", 
-  "icon": "icon-comments", 
-  "issingle": 0, 
-  "module": "Core", 
-  "name": "__common__", 
-  "title_field": "comment"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Comment", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "cancel": 0, 
-  "create": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Comment", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "report": 1, 
-  "role": "System Manager", 
-  "submit": 0, 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Comment"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "comment", 
-  "fieldtype": "Text", 
-  "label": "Comment", 
-  "no_copy": 0, 
-  "oldfieldname": "comment", 
-  "oldfieldtype": "Text", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "comment_by", 
-  "fieldtype": "Data", 
-  "label": "Comment By", 
-  "no_copy": 0, 
-  "oldfieldname": "comment_by", 
-  "oldfieldtype": "Data", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "comment_by_fullname", 
-  "fieldtype": "Data", 
-  "label": "Comment By Fullname", 
-  "no_copy": 0, 
-  "oldfieldname": "comment_by_fullname", 
-  "oldfieldtype": "Data", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "comment_date", 
-  "fieldtype": "Date", 
-  "label": "Comment Date", 
-  "no_copy": 0, 
-  "oldfieldname": "comment_date", 
-  "oldfieldtype": "Date", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "comment_time", 
-  "fieldtype": "Data", 
-  "label": "Comment Time", 
-  "no_copy": 0, 
-  "oldfieldname": "comment_time", 
-  "oldfieldtype": "Data", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "comment_doctype", 
-  "fieldtype": "Data", 
-  "label": "Comment Doctype", 
-  "no_copy": 0, 
-  "oldfieldname": "comment_doctype", 
-  "oldfieldtype": "Data", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "comment_docname", 
-  "fieldtype": "Data", 
-  "label": "Comment Docname", 
-  "no_copy": 0, 
-  "oldfieldname": "comment_docname", 
-  "oldfieldtype": "Data", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "post_topic", 
-  "fieldtype": "Data", 
-  "label": "Post Topic", 
-  "no_copy": 0, 
-  "oldfieldname": "post_topic", 
-  "oldfieldtype": "Data", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "unsubscribed", 
-  "fieldtype": "Check", 
-  "label": "Unsubscribed"
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "autoname": "CWR/.#####", 
+ "creation": "2012-08-08 10:40:11", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "comment", 
+   "fieldtype": "Text", 
+   "label": "Comment", 
+   "no_copy": 0, 
+   "oldfieldname": "comment", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "comment_by", 
+   "fieldtype": "Data", 
+   "label": "Comment By", 
+   "no_copy": 0, 
+   "oldfieldname": "comment_by", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "comment_by_fullname", 
+   "fieldtype": "Data", 
+   "label": "Comment By Fullname", 
+   "no_copy": 0, 
+   "oldfieldname": "comment_by_fullname", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "comment_date", 
+   "fieldtype": "Date", 
+   "label": "Comment Date", 
+   "no_copy": 0, 
+   "oldfieldname": "comment_date", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "comment_time", 
+   "fieldtype": "Data", 
+   "label": "Comment Time", 
+   "no_copy": 0, 
+   "oldfieldname": "comment_time", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "comment_doctype", 
+   "fieldtype": "Data", 
+   "label": "Comment Doctype", 
+   "no_copy": 0, 
+   "oldfieldname": "comment_doctype", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "comment_docname", 
+   "fieldtype": "Data", 
+   "label": "Comment Docname", 
+   "no_copy": 0, 
+   "oldfieldname": "comment_docname", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "post_topic", 
+   "fieldtype": "Data", 
+   "label": "Post Topic", 
+   "no_copy": 0, 
+   "oldfieldname": "post_topic", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "unsubscribed", 
+   "fieldtype": "Check", 
+   "label": "Unsubscribed", 
+   "permlevel": 0
+  }
+ ], 
+ "icon": "icon-comments", 
+ "idx": 1, 
+ "issingle": 0, 
+ "modified": "2014-01-24 13:00:20", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Comment", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "title_field": "comment"
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/communication/communication.txt b/frappe/core/doctype/communication/communication.txt
index 2d6457e1df..990550a03d 100644
--- a/frappe/core/doctype/communication/communication.txt
+++ b/frappe/core/doctype/communication/communication.txt
@@ -1,216 +1,233 @@
-[
- {
-  "creation": "2013-01-29 10:47:14", 
-  "docstatus": 0, 
-  "modified": "2014-01-24 13:01:25", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_attach": 1, 
-  "allow_import": 1, 
-  "autoname": "naming_series:", 
-  "description": "Keep a track of all communications", 
-  "doctype": "DocType", 
-  "document_type": "Master", 
-  "icon": "icon-comment", 
-  "in_dialog": 0, 
-  "issingle": 0, 
-  "module": "Core", 
-  "name": "__common__", 
-  "title_field": "subject"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Communication", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "cancel": 0, 
-  "create": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Communication", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "report": 1, 
-  "submit": 0, 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Communication"
- }, 
- {
-  "default": "COMM-", 
-  "doctype": "DocField", 
-  "fieldname": "naming_series", 
-  "fieldtype": "Select", 
-  "hidden": 1, 
-  "label": "Series", 
-  "options": "COMM-"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "sent_or_received", 
-  "fieldtype": "Select", 
-  "label": "Sent or Received", 
-  "options": "Sent\nReceived", 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "subject", 
-  "fieldtype": "Data", 
-  "in_list_view": 1, 
-  "label": "Subject", 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "content", 
-  "fieldtype": "Text Editor", 
-  "label": "Content", 
-  "reqd": 0, 
-  "width": "400"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "section_break1", 
-  "fieldtype": "Section Break", 
-  "options": "simple"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "category", 
-  "fieldtype": "Select", 
-  "label": "Category", 
-  "options": "\nSales\nComplaint\nHelp\nSuggestion\nMiscellaneous\nSent Mail", 
-  "reqd": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break2", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "next_communication_date", 
-  "fieldtype": "Date", 
-  "label": "Next Communcation On"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "action", 
-  "fieldtype": "Select", 
-  "label": "Action", 
-  "options": "\nCreated Opportunity\nSent Quotation\nCreated Support Ticket\nCreated Customer Issue\nNo Action\nSent Mail", 
-  "reqd": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "additional_info", 
-  "fieldtype": "Section Break", 
-  "label": "Additional Info"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "recipients", 
-  "fieldtype": "Data", 
-  "label": "Recipients"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "sender", 
-  "fieldtype": "Data", 
-  "label": "Sender"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "communication_medium", 
-  "fieldtype": "Select", 
-  "in_list_view": 1, 
-  "label": "Communication Medium", 
-  "options": "\nChat\nPhone\nEmail\nSMS\nVisit\nOther"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "phone_no", 
-  "fieldtype": "Data", 
-  "label": "Phone No."
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "section_break2", 
-  "fieldtype": "Section Break", 
-  "options": "simple"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break4", 
-  "fieldtype": "Column Break", 
-  "label": "By"
- }, 
- {
-  "default": "__user", 
-  "doctype": "DocField", 
-  "fieldname": "user", 
-  "fieldtype": "Link", 
-  "label": "User", 
-  "options": "User", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break5", 
-  "fieldtype": "Column Break", 
-  "label": "On"
- }, 
- {
-  "default": "Today", 
-  "doctype": "DocField", 
-  "fieldname": "communication_date", 
-  "fieldtype": "Datetime", 
-  "label": "Date"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "_user_tags", 
-  "fieldtype": "Data", 
-  "hidden": 1, 
-  "label": "User Tags", 
-  "no_copy": 1, 
-  "print_hide": 1
- }, 
- {
-  "amend": 0, 
-  "doctype": "DocPerm", 
-  "role": "Support Team"
- }, 
- {
-  "amend": 0, 
-  "doctype": "DocPerm", 
-  "role": "Sales Manager"
- }, 
- {
-  "amend": 0, 
-  "doctype": "DocPerm", 
-  "role": "Sales User"
- }, 
- {
-  "doctype": "DocPerm", 
-  "role": "Support Manager"
- }, 
- {
-  "doctype": "DocPerm", 
-  "role": "System Manager"
- }
-]
\ No newline at end of file
+{
+ "allow_attach": 1, 
+ "allow_import": 1, 
+ "autoname": "naming_series:", 
+ "creation": "2013-01-29 10:47:14", 
+ "description": "Keep a track of all communications", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Master", 
+ "fields": [
+  {
+   "default": "COMM-", 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 1, 
+   "label": "Series", 
+   "options": "COMM-", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "sent_or_received", 
+   "fieldtype": "Select", 
+   "label": "Sent or Received", 
+   "options": "Sent\nReceived", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "subject", 
+   "fieldtype": "Data", 
+   "in_list_view": 1, 
+   "label": "Subject", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "content", 
+   "fieldtype": "Text Editor", 
+   "label": "Content", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "width": "400"
+  }, 
+  {
+   "fieldname": "section_break1", 
+   "fieldtype": "Section Break", 
+   "options": "simple", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "category", 
+   "fieldtype": "Select", 
+   "label": "Category", 
+   "options": "\nSales\nComplaint\nHelp\nSuggestion\nMiscellaneous\nSent Mail", 
+   "permlevel": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "column_break2", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "next_communication_date", 
+   "fieldtype": "Date", 
+   "label": "Next Communcation On", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "action", 
+   "fieldtype": "Select", 
+   "label": "Action", 
+   "options": "\nCreated Opportunity\nSent Quotation\nCreated Support Ticket\nCreated Customer Issue\nNo Action\nSent Mail", 
+   "permlevel": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "additional_info", 
+   "fieldtype": "Section Break", 
+   "label": "Additional Info", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "recipients", 
+   "fieldtype": "Data", 
+   "label": "Recipients", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "sender", 
+   "fieldtype": "Data", 
+   "label": "Sender", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "communication_medium", 
+   "fieldtype": "Select", 
+   "in_list_view": 1, 
+   "label": "Communication Medium", 
+   "options": "\nChat\nPhone\nEmail\nSMS\nVisit\nOther", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "phone_no", 
+   "fieldtype": "Data", 
+   "label": "Phone No.", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "section_break2", 
+   "fieldtype": "Section Break", 
+   "options": "simple", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "column_break4", 
+   "fieldtype": "Column Break", 
+   "label": "By", 
+   "permlevel": 0
+  }, 
+  {
+   "default": "__user", 
+   "fieldname": "user", 
+   "fieldtype": "Link", 
+   "label": "User", 
+   "options": "User", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "column_break5", 
+   "fieldtype": "Column Break", 
+   "label": "On", 
+   "permlevel": 0
+  }, 
+  {
+   "default": "Today", 
+   "fieldname": "communication_date", 
+   "fieldtype": "Datetime", 
+   "label": "Date", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "_user_tags", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "label": "User Tags", 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 1
+  }
+ ], 
+ "icon": "icon-comment", 
+ "idx": 1, 
+ "in_dialog": 0, 
+ "issingle": 0, 
+ "modified": "2014-01-24 13:01:25", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Communication", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Support Team", 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Sales Manager", 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Sales User", 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Support Manager", 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "title_field": "subject"
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/control_panel/control_panel.txt b/frappe/core/doctype/control_panel/control_panel.txt
index 6bdad0d86c..fea1f92f89 100644
--- a/frappe/core/doctype/control_panel/control_panel.txt
+++ b/frappe/core/doctype/control_panel/control_panel.txt
@@ -1,226 +1,207 @@
-[
- {
-  "creation": "2013-01-10 16:34:01", 
-  "docstatus": 0, 
-  "modified": "2013-12-20 19:23:02", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_copy": 0, 
-  "doctype": "DocType", 
-  "hide_heading": 0, 
-  "hide_toolbar": 0, 
-  "in_create": 1, 
-  "issingle": 1, 
-  "istable": 0, 
-  "module": "Core", 
-  "name": "__common__", 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Control Panel", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "cancel": 0, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "export": 0, 
-  "import": 0, 
-  "name": "__common__", 
-  "parent": "Control Panel", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "report": 0, 
-  "role": "Administrator", 
-  "submit": 0, 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Control Panel"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "general", 
-  "fieldtype": "Section Break", 
-  "label": "General"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "date_format", 
-  "fieldtype": "Select", 
-  "label": "Date Format", 
-  "options": "yyyy-mm-dd\ndd-mm-yyyy\ndd/mm/yyyy\nmm/dd/yyyy\nmm-dd-yyyy"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "currency_format", 
-  "fieldtype": "Select", 
-  "label": "Currency Format", 
-  "options": "Millions\nLacs"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "password_expiry_days", 
-  "fieldtype": "Int", 
-  "label": "Password Expires in (days)"
- }, 
- {
-  "description": "Format: hh:mm example for one hour expiry set as 01:00. \nMax expiry will be 72 hours. Default is 24 hours", 
-  "doctype": "DocField", 
-  "fieldname": "session_expiry", 
-  "fieldtype": "Data", 
-  "label": "Session Expires in (time)"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break0", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "title", 
-  "fieldtype": "Data", 
-  "label": "Title"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "account_id", 
-  "fieldtype": "Data", 
-  "label": "Account Id"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "company_name", 
-  "fieldtype": "Data", 
-  "label": "Company Name"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "industry", 
-  "fieldtype": "Data", 
-  "label": "Industry"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "time_zone", 
-  "fieldtype": "Data", 
-  "label": "Time Zone"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "country", 
-  "fieldtype": "Data", 
-  "label": "Country"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "total_sms_sent", 
-  "fieldtype": "Int", 
-  "label": "Total SMS Sent", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "mail_server", 
-  "fieldtype": "Section Break", 
-  "label": "Mail Server"
- }, 
- {
-  "description": "Email Id where users will send support request e.g. support@example.com", 
-  "doctype": "DocField", 
-  "fieldname": "support_email_id", 
-  "fieldtype": "Data", 
-  "label": "Support Email Id"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "letter_head_image", 
-  "fieldtype": "Data", 
-  "label": "Letter Head Image"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break1", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "mail_footer", 
-  "fieldtype": "Text", 
-  "label": "Mail Footer"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "defaults", 
-  "fieldtype": "Section Break", 
-  "label": "Defaults"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "system_defaults", 
-  "fieldtype": "Table", 
-  "hidden": 0, 
-  "label": "System Defaults", 
-  "options": "DefaultValue", 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "banner", 
-  "fieldtype": "Section Break", 
-  "label": "Banner"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "client_name", 
-  "fieldtype": "Text", 
-  "label": "Banner HTML"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "startup", 
-  "fieldtype": "Section Break", 
-  "label": "Startup"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "custom_startup_code", 
-  "fieldtype": "Code", 
-  "label": "Custom Startup Code"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "home_pages", 
-  "fieldtype": "Section Break", 
-  "label": "Home Pages"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "home_page", 
-  "fieldtype": "Link", 
-  "label": "Home Page", 
-  "options": "Page"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "default_home_pages", 
-  "fieldtype": "Table", 
-  "label": "Default Home Pages", 
-  "options": "Default Home Page"
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "allow_copy": 0, 
+ "creation": "2013-01-10 16:34:01", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "general", 
+   "fieldtype": "Section Break", 
+   "label": "General", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "date_format", 
+   "fieldtype": "Select", 
+   "label": "Date Format", 
+   "options": "yyyy-mm-dd\ndd-mm-yyyy\ndd/mm/yyyy\nmm/dd/yyyy\nmm-dd-yyyy", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "currency_format", 
+   "fieldtype": "Select", 
+   "label": "Currency Format", 
+   "options": "Millions\nLacs", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "password_expiry_days", 
+   "fieldtype": "Int", 
+   "label": "Password Expires in (days)", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Format: hh:mm example for one hour expiry set as 01:00. \nMax expiry will be 72 hours. Default is 24 hours", 
+   "fieldname": "session_expiry", 
+   "fieldtype": "Data", 
+   "label": "Session Expires in (time)", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "column_break0", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "title", 
+   "fieldtype": "Data", 
+   "label": "Title", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "account_id", 
+   "fieldtype": "Data", 
+   "label": "Account Id", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "company_name", 
+   "fieldtype": "Data", 
+   "label": "Company Name", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "industry", 
+   "fieldtype": "Data", 
+   "label": "Industry", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "time_zone", 
+   "fieldtype": "Data", 
+   "label": "Time Zone", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "country", 
+   "fieldtype": "Data", 
+   "label": "Country", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "total_sms_sent", 
+   "fieldtype": "Int", 
+   "label": "Total SMS Sent", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "mail_server", 
+   "fieldtype": "Section Break", 
+   "label": "Mail Server", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Email Id where users will send support request e.g. support@example.com", 
+   "fieldname": "support_email_id", 
+   "fieldtype": "Data", 
+   "label": "Support Email Id", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "letter_head_image", 
+   "fieldtype": "Data", 
+   "label": "Letter Head Image", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "mail_footer", 
+   "fieldtype": "Text", 
+   "label": "Mail Footer", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "defaults", 
+   "fieldtype": "Section Break", 
+   "label": "Defaults", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "system_defaults", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "label": "System Defaults", 
+   "options": "DefaultValue", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "banner", 
+   "fieldtype": "Section Break", 
+   "label": "Banner", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "client_name", 
+   "fieldtype": "Text", 
+   "label": "Banner HTML", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "startup", 
+   "fieldtype": "Section Break", 
+   "label": "Startup", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "custom_startup_code", 
+   "fieldtype": "Code", 
+   "label": "Custom Startup Code", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "home_pages", 
+   "fieldtype": "Section Break", 
+   "label": "Home Pages", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "home_page", 
+   "fieldtype": "Link", 
+   "label": "Home Page", 
+   "options": "Page", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "default_home_pages", 
+   "fieldtype": "Table", 
+   "label": "Default Home Pages", 
+   "options": "Default Home Page", 
+   "permlevel": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 1, 
+ "in_create": 1, 
+ "issingle": 1, 
+ "istable": 0, 
+ "modified": "2013-12-20 19:23:02", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Control Panel", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "email": 1, 
+   "export": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Administrator", 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "read_only": 0
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/custom_field/custom_field.txt b/frappe/core/doctype/custom_field/custom_field.txt
index 75ae2da1ea..57baf68da3 100644
--- a/frappe/core/doctype/custom_field/custom_field.txt
+++ b/frappe/core/doctype/custom_field/custom_field.txt
@@ -1,304 +1,294 @@
-[
- {
-  "creation": "2013-01-10 16:34:01", 
-  "docstatus": 0, 
-  "modified": "2014-01-20 17:48:31", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "description": "Adds a custom field to a DocType", 
-  "doctype": "DocType", 
-  "icon": "icon-glass", 
-  "module": "Core", 
-  "name": "__common__", 
-  "search_fields": "dt,label,fieldtype,options"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Custom Field", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "cancel": 0, 
-  "create": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Custom Field", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "report": 1, 
-  "submit": 0, 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Custom Field"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "dt", 
-  "fieldtype": "Link", 
-  "in_filter": 1, 
-  "in_list_view": 1, 
-  "label": "Document", 
-  "no_copy": 0, 
-  "oldfieldname": "dt", 
-  "oldfieldtype": "Link", 
-  "options": "DocType", 
-  "reqd": 1, 
-  "search_index": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "label", 
-  "fieldtype": "Data", 
-  "in_filter": 1, 
-  "label": "Label", 
-  "no_copy": 1, 
-  "oldfieldname": "label", 
-  "oldfieldtype": "Data", 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "label_help", 
-  "fieldtype": "HTML", 
-  "label": "Label Help", 
-  "oldfieldtype": "HTML"
- }, 
- {
-  "description": "Select the label after which you want to insert new field.", 
-  "doctype": "DocField", 
-  "fieldname": "insert_after", 
-  "fieldtype": "Select", 
-  "label": "Insert After", 
-  "no_copy": 1, 
-  "oldfieldname": "insert_after", 
-  "oldfieldtype": "Select", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "fieldtype", 
-  "fieldtype": "Select", 
-  "in_filter": 1, 
-  "in_list_view": 1, 
-  "label": "Field Type", 
-  "no_copy": 0, 
-  "oldfieldname": "fieldtype", 
-  "oldfieldtype": "Select", 
-  "options": "Button\nCheck\nCode\nColumn Break\nCurrency\nData\nDate\nDatetime\nFloat\nHTML\nImage\nInt\nLink\nLong Text\nPassword\nPercent\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nText\nText Editor\nTime", 
-  "reqd": 1, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "options_help", 
-  "fieldtype": "HTML", 
-  "label": "Options Help", 
-  "oldfieldtype": "HTML"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "options", 
-  "fieldtype": "Text", 
-  "in_list_view": 1, 
-  "label": "Options", 
-  "no_copy": 0, 
-  "oldfieldname": "options", 
-  "oldfieldtype": "Text", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "description", 
-  "fieldtype": "Text", 
-  "label": "Field Description", 
-  "no_copy": 0, 
-  "oldfieldname": "description", 
-  "oldfieldtype": "Text", 
-  "print_width": "300px", 
-  "search_index": 0, 
-  "width": "300px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "fieldname", 
-  "fieldtype": "Data", 
-  "in_list_view": 1, 
-  "label": "Fieldname", 
-  "no_copy": 1, 
-  "oldfieldname": "fieldname", 
-  "oldfieldtype": "Data", 
-  "read_only": 1, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "properties", 
-  "fieldtype": "Column Break", 
-  "label": "Properties", 
-  "oldfieldtype": "Column Break", 
-  "print_width": "50%", 
-  "width": "50%"
- }, 
- {
-  "default": "0", 
-  "doctype": "DocField", 
-  "fieldname": "permlevel", 
-  "fieldtype": "Int", 
-  "label": "Permission Level", 
-  "no_copy": 0, 
-  "oldfieldname": "permlevel", 
-  "oldfieldtype": "Int", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "reqd", 
-  "fieldtype": "Check", 
-  "in_list_view": 1, 
-  "label": "Is Mandatory Field", 
-  "no_copy": 0, 
-  "oldfieldname": "reqd", 
-  "oldfieldtype": "Check", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "read_only", 
-  "fieldtype": "Check", 
-  "label": "Read Only"
- }, 
- {
-  "depends_on": "eval:doc.fieldtype===\"Link\"", 
-  "doctype": "DocField", 
-  "fieldname": "ignore_restrictions", 
-  "fieldtype": "Check", 
-  "label": "Ignore Restrictions"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "width", 
-  "fieldtype": "Data", 
-  "label": "Width", 
-  "no_copy": 0, 
-  "oldfieldname": "width", 
-  "oldfieldtype": "Data", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "default", 
-  "fieldtype": "Text", 
-  "label": "Default Value", 
-  "no_copy": 0, 
-  "oldfieldname": "default", 
-  "oldfieldtype": "Text", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "hidden", 
-  "fieldtype": "Check", 
-  "label": "Hidden"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "depends_on", 
-  "fieldtype": "Data", 
-  "label": "Depends On"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "print_hide", 
-  "fieldtype": "Check", 
-  "label": "Print Hide", 
-  "no_copy": 0, 
-  "oldfieldname": "print_hide", 
-  "oldfieldtype": "Check", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "print_width", 
-  "fieldtype": "Data", 
-  "hidden": 1, 
-  "label": "Print Width", 
-  "no_copy": 1, 
-  "print_hide": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "no_copy", 
-  "fieldtype": "Check", 
-  "label": "No Copy", 
-  "no_copy": 0, 
-  "oldfieldname": "no_copy", 
-  "oldfieldtype": "Check", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "allow_on_submit", 
-  "fieldtype": "Check", 
-  "label": "Allow on Submit", 
-  "no_copy": 0, 
-  "oldfieldname": "allow_on_submit", 
-  "oldfieldtype": "Check", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "in_filter", 
-  "fieldtype": "Check", 
-  "label": "In Report Filter", 
-  "no_copy": 0, 
-  "oldfieldname": "in_filter", 
-  "oldfieldtype": "Check", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "in_list_view", 
-  "fieldtype": "Check", 
-  "label": "In List View"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "report_hide", 
-  "fieldtype": "Check", 
-  "label": "Report Hide", 
-  "no_copy": 0, 
-  "oldfieldname": "report_hide", 
-  "oldfieldtype": "Check", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "search_index", 
-  "fieldtype": "Check", 
-  "hidden": 1, 
-  "label": "Index", 
-  "no_copy": 1, 
-  "print_hide": 1
- }, 
- {
-  "doctype": "DocPerm", 
-  "role": "Administrator"
- }, 
- {
-  "doctype": "DocPerm", 
-  "role": "System Manager"
- }
-]
\ No newline at end of file
+{
+ "creation": "2013-01-10 16:34:01", 
+ "description": "Adds a custom field to a DocType", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "dt", 
+   "fieldtype": "Link", 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "Document", 
+   "no_copy": 0, 
+   "oldfieldname": "dt", 
+   "oldfieldtype": "Link", 
+   "options": "DocType", 
+   "permlevel": 0, 
+   "reqd": 1, 
+   "search_index": 1
+  }, 
+  {
+   "fieldname": "label", 
+   "fieldtype": "Data", 
+   "in_filter": 1, 
+   "label": "Label", 
+   "no_copy": 1, 
+   "oldfieldname": "label", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "label_help", 
+   "fieldtype": "HTML", 
+   "label": "Label Help", 
+   "oldfieldtype": "HTML", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Select the label after which you want to insert new field.", 
+   "fieldname": "insert_after", 
+   "fieldtype": "Select", 
+   "label": "Insert After", 
+   "no_copy": 1, 
+   "oldfieldname": "insert_after", 
+   "oldfieldtype": "Select", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "fieldtype", 
+   "fieldtype": "Select", 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "Field Type", 
+   "no_copy": 0, 
+   "oldfieldname": "fieldtype", 
+   "oldfieldtype": "Select", 
+   "options": "Button\nCheck\nCode\nColumn Break\nCurrency\nData\nDate\nDatetime\nFloat\nHTML\nImage\nInt\nLink\nLong Text\nPassword\nPercent\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nText\nText Editor\nTime", 
+   "permlevel": 0, 
+   "reqd": 1, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "options_help", 
+   "fieldtype": "HTML", 
+   "label": "Options Help", 
+   "oldfieldtype": "HTML", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "options", 
+   "fieldtype": "Text", 
+   "in_list_view": 1, 
+   "label": "Options", 
+   "no_copy": 0, 
+   "oldfieldname": "options", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "description", 
+   "fieldtype": "Text", 
+   "label": "Field Description", 
+   "no_copy": 0, 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "print_width": "300px", 
+   "search_index": 0, 
+   "width": "300px"
+  }, 
+  {
+   "fieldname": "fieldname", 
+   "fieldtype": "Data", 
+   "in_list_view": 1, 
+   "label": "Fieldname", 
+   "no_copy": 1, 
+   "oldfieldname": "fieldname", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "read_only": 1, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "properties", 
+   "fieldtype": "Column Break", 
+   "label": "Properties", 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
+   "print_width": "50%", 
+   "width": "50%"
+  }, 
+  {
+   "default": "0", 
+   "fieldname": "permlevel", 
+   "fieldtype": "Int", 
+   "label": "Permission Level", 
+   "no_copy": 0, 
+   "oldfieldname": "permlevel", 
+   "oldfieldtype": "Int", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "reqd", 
+   "fieldtype": "Check", 
+   "in_list_view": 1, 
+   "label": "Is Mandatory Field", 
+   "no_copy": 0, 
+   "oldfieldname": "reqd", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "read_only", 
+   "fieldtype": "Check", 
+   "label": "Read Only", 
+   "permlevel": 0
+  }, 
+  {
+   "depends_on": "eval:doc.fieldtype===\"Link\"", 
+   "fieldname": "ignore_restrictions", 
+   "fieldtype": "Check", 
+   "label": "Ignore Restrictions", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "width", 
+   "fieldtype": "Data", 
+   "label": "Width", 
+   "no_copy": 0, 
+   "oldfieldname": "width", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "default", 
+   "fieldtype": "Text", 
+   "label": "Default Value", 
+   "no_copy": 0, 
+   "oldfieldname": "default", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "hidden", 
+   "fieldtype": "Check", 
+   "label": "Hidden", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "depends_on", 
+   "fieldtype": "Data", 
+   "label": "Depends On", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "print_hide", 
+   "fieldtype": "Check", 
+   "label": "Print Hide", 
+   "no_copy": 0, 
+   "oldfieldname": "print_hide", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "print_width", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "label": "Print Width", 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 1
+  }, 
+  {
+   "fieldname": "no_copy", 
+   "fieldtype": "Check", 
+   "label": "No Copy", 
+   "no_copy": 0, 
+   "oldfieldname": "no_copy", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "allow_on_submit", 
+   "fieldtype": "Check", 
+   "label": "Allow on Submit", 
+   "no_copy": 0, 
+   "oldfieldname": "allow_on_submit", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "in_filter", 
+   "fieldtype": "Check", 
+   "label": "In Report Filter", 
+   "no_copy": 0, 
+   "oldfieldname": "in_filter", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "in_list_view", 
+   "fieldtype": "Check", 
+   "label": "In List View", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "report_hide", 
+   "fieldtype": "Check", 
+   "label": "Report Hide", 
+   "no_copy": 0, 
+   "oldfieldname": "report_hide", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "search_index", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "label": "Index", 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 1
+  }
+ ], 
+ "icon": "icon-glass", 
+ "idx": 1, 
+ "modified": "2014-01-20 17:48:31", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Custom Field", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Administrator", 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "search_fields": "dt,label,fieldtype,options"
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/custom_script/custom_script.txt b/frappe/core/doctype/custom_script/custom_script.txt
index 72689ff9e4..520c619d50 100644
--- a/frappe/core/doctype/custom_script/custom_script.txt
+++ b/frappe/core/doctype/custom_script/custom_script.txt
@@ -1,84 +1,74 @@
-[
- {
-  "creation": "2013-01-10 16:34:01", 
-  "docstatus": 0, 
-  "modified": "2014-01-20 17:48:31", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "autoname": "CustomScript.####", 
-  "description": "Adds a custom script (client or server) to a DocType", 
-  "doctype": "DocType", 
-  "icon": "icon-glass", 
-  "module": "Core", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Custom Script", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "cancel": 0, 
-  "create": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Custom Script", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "report": 1, 
-  "submit": 0, 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Custom Script"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "dt", 
-  "fieldtype": "Link", 
-  "label": "DocType", 
-  "oldfieldname": "dt", 
-  "oldfieldtype": "Link", 
-  "options": "DocType"
- }, 
- {
-  "default": "Client", 
-  "doctype": "DocField", 
-  "fieldname": "script_type", 
-  "fieldtype": "Select", 
-  "hidden": 1, 
-  "label": "Script Type", 
-  "oldfieldname": "script_type", 
-  "oldfieldtype": "Select", 
-  "options": "Client", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "script", 
-  "fieldtype": "Code", 
-  "label": "Script", 
-  "oldfieldname": "script", 
-  "oldfieldtype": "Code", 
-  "options": "Script"
- }, 
- {
-  "doctype": "DocPerm", 
-  "role": "System Manager"
- }, 
- {
-  "doctype": "DocPerm", 
-  "role": "Administrator"
- }
-]
\ No newline at end of file
+{
+ "autoname": "CustomScript.####", 
+ "creation": "2013-01-10 16:34:01", 
+ "description": "Adds a custom script (client or server) to a DocType", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "dt", 
+   "fieldtype": "Link", 
+   "label": "DocType", 
+   "oldfieldname": "dt", 
+   "oldfieldtype": "Link", 
+   "options": "DocType", 
+   "permlevel": 0
+  }, 
+  {
+   "default": "Client", 
+   "fieldname": "script_type", 
+   "fieldtype": "Select", 
+   "hidden": 1, 
+   "label": "Script Type", 
+   "oldfieldname": "script_type", 
+   "oldfieldtype": "Select", 
+   "options": "Client", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "script", 
+   "fieldtype": "Code", 
+   "label": "Script", 
+   "oldfieldname": "script", 
+   "oldfieldtype": "Code", 
+   "options": "Script", 
+   "permlevel": 0
+  }
+ ], 
+ "icon": "icon-glass", 
+ "idx": 1, 
+ "modified": "2014-01-20 17:48:31", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Custom Script", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Administrator", 
+   "submit": 0, 
+   "write": 1
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/customize_form/customize_form.txt b/frappe/core/doctype/customize_form/customize_form.txt
index dbffb3887d..e35e1a5c7c 100644
--- a/frappe/core/doctype/customize_form/customize_form.txt
+++ b/frappe/core/doctype/customize_form/customize_form.txt
@@ -1,153 +1,134 @@
-[
- {
-  "creation": "2013-01-29 17:54:08", 
-  "docstatus": 0, 
-  "modified": "2014-01-15 16:16:23", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "autoname": "DL.####", 
-  "doctype": "DocType", 
-  "hide_toolbar": 1, 
-  "icon": "icon-glass", 
-  "issingle": 1, 
-  "module": "Core", 
-  "name": "__common__", 
-  "search_fields": "doc_type"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Customize Form", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Customize Form", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "report": 0, 
-  "role": "System Manager", 
-  "submit": 0, 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Customize Form"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "doc_type", 
-  "fieldtype": "Link", 
-  "hidden": 0, 
-  "label": "Enter Form Type", 
-  "no_copy": 0, 
-  "options": "DocType", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "properties", 
-  "fieldtype": "Section Break", 
-  "label": "Properties"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break0", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "description": "Fields separated by comma (,) will be included in the<br /><b>Search By</b> list of Search dialog box", 
-  "doctype": "DocField", 
-  "fieldname": "search_fields", 
-  "fieldtype": "Data", 
-  "label": "Search Fields", 
-  "no_copy": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "default_print_format", 
-  "fieldtype": "Link", 
-  "label": "Default Print Format", 
-  "no_copy": 0, 
-  "options": "Print Format", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break1", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "allow_print", 
-  "fieldtype": "Check", 
-  "label": "Hide Print", 
-  "no_copy": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "allow_email", 
-  "fieldtype": "Check", 
-  "label": "Hide Email", 
-  "no_copy": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "allow_copy", 
-  "fieldtype": "Check", 
-  "label": "Hide Copy", 
-  "no_copy": 0, 
-  "search_index": 0
- }, 
- {
-  "description": "Note: maximum attachment size = 1mb", 
-  "doctype": "DocField", 
-  "fieldname": "allow_attach", 
-  "fieldtype": "Check", 
-  "label": "Allow Attach", 
-  "no_copy": 0, 
-  "search_index": 0
- }, 
- {
-  "depends_on": "eval:cint(doc.allow_attach)", 
-  "doctype": "DocField", 
-  "fieldname": "max_attachments", 
-  "fieldtype": "Int", 
-  "label": "Max Attachments", 
-  "no_copy": 0, 
-  "search_index": 0
- }, 
- {
-  "description": "Customize Label, Print Hide, Default etc.", 
-  "doctype": "DocField", 
-  "fieldname": "fields_section_break", 
-  "fieldtype": "Section Break", 
-  "label": "Fields"
- }, 
- {
-  "default": "no add rows", 
-  "doctype": "DocField", 
-  "fieldname": "fields", 
-  "fieldtype": "Table", 
-  "label": "Fields", 
-  "no_copy": 0, 
-  "options": "Customize Form Field", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "autoname": "DL.####", 
+ "creation": "2013-01-29 17:54:08", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "doc_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "label": "Enter Form Type", 
+   "no_copy": 0, 
+   "options": "DocType", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "properties", 
+   "fieldtype": "Section Break", 
+   "label": "Properties", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "column_break0", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Fields separated by comma (,) will be included in the<br /><b>Search By</b> list of Search dialog box", 
+   "fieldname": "search_fields", 
+   "fieldtype": "Data", 
+   "label": "Search Fields", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "default_print_format", 
+   "fieldtype": "Link", 
+   "label": "Default Print Format", 
+   "no_copy": 0, 
+   "options": "Print Format", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "allow_print", 
+   "fieldtype": "Check", 
+   "label": "Hide Print", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "allow_email", 
+   "fieldtype": "Check", 
+   "label": "Hide Email", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "allow_copy", 
+   "fieldtype": "Check", 
+   "label": "Hide Copy", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "description": "Note: maximum attachment size = 1mb", 
+   "fieldname": "allow_attach", 
+   "fieldtype": "Check", 
+   "label": "Allow Attach", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "depends_on": "eval:cint(doc.allow_attach)", 
+   "fieldname": "max_attachments", 
+   "fieldtype": "Int", 
+   "label": "Max Attachments", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "description": "Customize Label, Print Hide, Default etc.", 
+   "fieldname": "fields_section_break", 
+   "fieldtype": "Section Break", 
+   "label": "Fields", 
+   "permlevel": 0
+  }, 
+  {
+   "default": "no add rows", 
+   "fieldname": "fields", 
+   "fieldtype": "Table", 
+   "label": "Fields", 
+   "no_copy": 0, 
+   "options": "Customize Form Field", 
+   "permlevel": 0, 
+   "search_index": 0
+  }
+ ], 
+ "hide_toolbar": 1, 
+ "icon": "icon-glass", 
+ "idx": 1, 
+ "issingle": 1, 
+ "modified": "2014-01-15 16:16:23", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Customize Form", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "create": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 0, 
+   "role": "System Manager", 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "search_fields": "doc_type"
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/customize_form_field/customize_form_field.txt b/frappe/core/doctype/customize_form_field/customize_form_field.txt
index 35af5f5ec3..d441833106 100644
--- a/frappe/core/doctype/customize_form_field/customize_form_field.txt
+++ b/frappe/core/doctype/customize_form_field/customize_form_field.txt
@@ -1,249 +1,236 @@
-[
- {
-  "creation": "2013-02-22 01:27:32", 
-  "docstatus": 0, 
-  "modified": "2013-12-23 16:12:45", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_copy": 0, 
-  "autoname": "DLF.#####", 
-  "doctype": "DocType", 
-  "hide_heading": 0, 
-  "hide_toolbar": 0, 
-  "issingle": 0, 
-  "istable": 1, 
-  "module": "Core", 
-  "name": "__common__", 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Customize Form Field", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Customize Form Field"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "label", 
-  "fieldtype": "Data", 
-  "hidden": 0, 
-  "in_list_view": 1, 
-  "label": "Label", 
-  "oldfieldname": "label", 
-  "oldfieldtype": "Data", 
-  "print_hide": 0, 
-  "reqd": 0, 
-  "search_index": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "fieldtype", 
-  "fieldtype": "Select", 
-  "hidden": 0, 
-  "in_list_view": 1, 
-  "label": "Type", 
-  "oldfieldname": "fieldtype", 
-  "oldfieldtype": "Select", 
-  "options": "Button\nCheck\nCode\nColumn Break\nCurrency\nData\nDate\nDatetime\nFloat\nHTML\nImage\nInt\nLink\nLong Text\nPassword\nPercent\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nText\nText Editor\nTime", 
-  "print_hide": 0, 
-  "reqd": 1, 
-  "search_index": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "fieldname", 
-  "fieldtype": "Data", 
-  "hidden": 0, 
-  "in_list_view": 1, 
-  "label": "Name", 
-  "oldfieldname": "fieldname", 
-  "oldfieldtype": "Data", 
-  "print_hide": 0, 
-  "read_only": 1, 
-  "reqd": 0, 
-  "search_index": 1
- }, 
- {
-  "description": "For Links, enter the DocType as range\nFor Select, enter list of Options separated by comma", 
-  "doctype": "DocField", 
-  "fieldname": "options", 
-  "fieldtype": "Text", 
-  "hidden": 0, 
-  "in_list_view": 1, 
-  "label": "Options", 
-  "oldfieldname": "options", 
-  "oldfieldtype": "Text", 
-  "print_hide": 0, 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "default": "0", 
-  "doctype": "DocField", 
-  "fieldname": "permlevel", 
-  "fieldtype": "Int", 
-  "hidden": 0, 
-  "in_list_view": 1, 
-  "label": "Perm Level", 
-  "oldfieldname": "permlevel", 
-  "oldfieldtype": "Int", 
-  "print_hide": 0, 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "width", 
-  "fieldtype": "Data", 
-  "hidden": 0, 
-  "in_list_view": 1, 
-  "label": "Width", 
-  "oldfieldname": "width", 
-  "oldfieldtype": "Data", 
-  "print_hide": 0, 
-  "print_width": "50px", 
-  "reqd": 0, 
-  "search_index": 0, 
-  "width": "50px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "print_width", 
-  "fieldtype": "Data", 
-  "label": "Print Width", 
-  "print_width": "50px", 
-  "width": "50px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "reqd", 
-  "fieldtype": "Check", 
-  "hidden": 0, 
-  "label": "Reqd", 
-  "oldfieldname": "reqd", 
-  "oldfieldtype": "Check", 
-  "print_hide": 0, 
-  "print_width": "50px", 
-  "reqd": 0, 
-  "search_index": 0, 
-  "width": "50px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "ignore_restrictions", 
-  "fieldtype": "Check", 
-  "label": "Ignore Restrictions"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "in_filter", 
-  "fieldtype": "Check", 
-  "hidden": 0, 
-  "label": "In Filter", 
-  "oldfieldname": "in_filter", 
-  "oldfieldtype": "Check", 
-  "print_hide": 0, 
-  "print_width": "50px", 
-  "reqd": 0, 
-  "width": "50px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "in_list_view", 
-  "fieldtype": "Check", 
-  "label": "In List View"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "hidden", 
-  "fieldtype": "Check", 
-  "hidden": 0, 
-  "label": "Hidden", 
-  "oldfieldname": "hidden", 
-  "oldfieldtype": "Check", 
-  "print_hide": 0, 
-  "print_width": "50px", 
-  "reqd": 0, 
-  "search_index": 0, 
-  "width": "50px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "print_hide", 
-  "fieldtype": "Check", 
-  "hidden": 0, 
-  "label": "Print Hide", 
-  "oldfieldname": "print_hide", 
-  "oldfieldtype": "Check", 
-  "print_hide": 0, 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "report_hide", 
-  "fieldtype": "Check", 
-  "hidden": 0, 
-  "label": "Report Hide", 
-  "oldfieldname": "report_hide", 
-  "oldfieldtype": "Check", 
-  "print_hide": 0, 
-  "reqd": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "allow_on_submit", 
-  "fieldtype": "Check", 
-  "hidden": 0, 
-  "label": "Allow on Submit", 
-  "oldfieldname": "allow_on_submit", 
-  "oldfieldtype": "Check", 
-  "print_hide": 0, 
-  "reqd": 0
- }, 
- {
-  "description": "This field will appear only if the fieldname defined here has value OR the rules are true (examples): <br>\nmyfield\neval:doc.myfield=='My Value'<br>\neval:doc.age>18", 
-  "doctype": "DocField", 
-  "fieldname": "depends_on", 
-  "fieldtype": "Data", 
-  "hidden": 0, 
-  "label": "Depends On", 
-  "oldfieldname": "depends_on", 
-  "oldfieldtype": "Data", 
-  "print_hide": 0, 
-  "reqd": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "description", 
-  "fieldtype": "Text", 
-  "hidden": 0, 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "oldfieldtype": "Text", 
-  "print_hide": 0, 
-  "print_width": "300px", 
-  "reqd": 0, 
-  "width": "300px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "default", 
-  "fieldtype": "Text", 
-  "hidden": 0, 
-  "label": "Default", 
-  "oldfieldname": "default", 
-  "oldfieldtype": "Text", 
-  "print_hide": 0, 
-  "reqd": 0, 
-  "search_index": 0
- }
-]
\ No newline at end of file
+{
+ "allow_copy": 0, 
+ "autoname": "DLF.#####", 
+ "creation": "2013-02-22 01:27:32", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "label", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "in_list_view": 1, 
+   "label": "Label", 
+   "oldfieldname": "label", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1
+  }, 
+  {
+   "fieldname": "fieldtype", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "in_list_view": 1, 
+   "label": "Type", 
+   "oldfieldname": "fieldtype", 
+   "oldfieldtype": "Select", 
+   "options": "Button\nCheck\nCode\nColumn Break\nCurrency\nData\nDate\nDatetime\nFloat\nHTML\nImage\nInt\nLink\nLong Text\nPassword\nPercent\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nText\nText Editor\nTime", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "reqd": 1, 
+   "search_index": 1
+  }, 
+  {
+   "fieldname": "fieldname", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "in_list_view": 1, 
+   "label": "Name", 
+   "oldfieldname": "fieldname", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 1, 
+   "reqd": 0, 
+   "search_index": 1
+  }, 
+  {
+   "description": "For Links, enter the DocType as range\nFor Select, enter list of Options separated by comma", 
+   "fieldname": "options", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "in_list_view": 1, 
+   "label": "Options", 
+   "oldfieldname": "options", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "default": "0", 
+   "fieldname": "permlevel", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "in_list_view": 1, 
+   "label": "Perm Level", 
+   "oldfieldname": "permlevel", 
+   "oldfieldtype": "Int", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "width", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "in_list_view": 1, 
+   "label": "Width", 
+   "oldfieldname": "width", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_width": "50px", 
+   "reqd": 0, 
+   "search_index": 0, 
+   "width": "50px"
+  }, 
+  {
+   "fieldname": "print_width", 
+   "fieldtype": "Data", 
+   "label": "Print Width", 
+   "permlevel": 0, 
+   "print_width": "50px", 
+   "width": "50px"
+  }, 
+  {
+   "fieldname": "reqd", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "label": "Reqd", 
+   "oldfieldname": "reqd", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_width": "50px", 
+   "reqd": 0, 
+   "search_index": 0, 
+   "width": "50px"
+  }, 
+  {
+   "fieldname": "ignore_restrictions", 
+   "fieldtype": "Check", 
+   "label": "Ignore Restrictions", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "in_filter", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "label": "In Filter", 
+   "oldfieldname": "in_filter", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_width": "50px", 
+   "reqd": 0, 
+   "width": "50px"
+  }, 
+  {
+   "fieldname": "in_list_view", 
+   "fieldtype": "Check", 
+   "label": "In List View", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "hidden", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "label": "Hidden", 
+   "oldfieldname": "hidden", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_width": "50px", 
+   "reqd": 0, 
+   "search_index": 0, 
+   "width": "50px"
+  }, 
+  {
+   "fieldname": "print_hide", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "label": "Print Hide", 
+   "oldfieldname": "print_hide", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "report_hide", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "label": "Report Hide", 
+   "oldfieldname": "report_hide", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "allow_on_submit", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "label": "Allow on Submit", 
+   "oldfieldname": "allow_on_submit", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "reqd": 0
+  }, 
+  {
+   "description": "This field will appear only if the fieldname defined here has value OR the rules are true (examples): <br>\nmyfield\neval:doc.myfield=='My Value'<br>\neval:doc.age>18", 
+   "fieldname": "depends_on", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Depends On", 
+   "oldfieldname": "depends_on", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "description", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "label": "Description", 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_width": "300px", 
+   "reqd": 0, 
+   "width": "300px"
+  }, 
+  {
+   "fieldname": "default", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "label": "Default", 
+   "oldfieldname": "default", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 1, 
+ "issingle": 0, 
+ "istable": 1, 
+ "modified": "2013-12-23 16:12:45", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Customize Form Field", 
+ "owner": "Administrator", 
+ "read_only": 0
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/default_home_page/default_home_page.txt b/frappe/core/doctype/default_home_page/default_home_page.txt
index 5b014b4c16..faf4b48edc 100644
--- a/frappe/core/doctype/default_home_page/default_home_page.txt
+++ b/frappe/core/doctype/default_home_page/default_home_page.txt
@@ -1,44 +1,34 @@
-[
- {
-  "creation": "2013-02-22 01:27:32", 
-  "docstatus": 0, 
-  "modified": "2013-12-20 19:23:05", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "doctype": "DocType", 
-  "istable": 1, 
-  "module": "Core", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldtype": "Link", 
-  "in_list_view": 1, 
-  "name": "__common__", 
-  "oldfieldtype": "Link", 
-  "parent": "Default Home Page", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Default Home Page"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "role", 
-  "label": "Role", 
-  "oldfieldname": "role", 
-  "options": "Role"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "home_page", 
-  "label": "Home Page", 
-  "oldfieldname": "home_page", 
-  "options": "Page"
- }
-]
\ No newline at end of file
+{
+ "creation": "2013-02-22 01:27:32", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "role", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Role", 
+   "oldfieldname": "role", 
+   "oldfieldtype": "Link", 
+   "options": "Role", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "home_page", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Home Page", 
+   "oldfieldname": "home_page", 
+   "oldfieldtype": "Link", 
+   "options": "Page", 
+   "permlevel": 0
+  }
+ ], 
+ "idx": 1, 
+ "istable": 1, 
+ "modified": "2013-12-20 19:23:05", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Default Home Page", 
+ "owner": "Administrator"
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/defaultvalue/defaultvalue.txt b/frappe/core/doctype/defaultvalue/defaultvalue.txt
index d7019194a8..089968f414 100644
--- a/frappe/core/doctype/defaultvalue/defaultvalue.txt
+++ b/frappe/core/doctype/defaultvalue/defaultvalue.txt
@@ -1,56 +1,48 @@
-[
- {
-  "creation": "2013-02-22 01:27:32", 
-  "docstatus": 0, 
-  "modified": "2013-12-20 19:23:05", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_copy": 0, 
-  "autoname": "DEF.######", 
-  "doctype": "DocType", 
-  "hide_heading": 0, 
-  "hide_toolbar": 0, 
-  "issingle": 0, 
-  "istable": 1, 
-  "module": "Core", 
-  "name": "__common__", 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
-  "hidden": 0, 
-  "in_list_view": 1, 
-  "name": "__common__", 
-  "parent": "DefaultValue", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print_width": "200px", 
-  "search_index": 0, 
-  "width": "200px"
- }, 
- {
-  "doctype": "DocType", 
-  "name": "DefaultValue"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "defkey", 
-  "fieldtype": "Data", 
-  "label": "Key", 
-  "oldfieldname": "defkey", 
-  "oldfieldtype": "Data", 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "defvalue", 
-  "fieldtype": "Text", 
-  "label": "Value", 
-  "oldfieldname": "defvalue", 
-  "oldfieldtype": "Text", 
-  "reqd": 0
- }
-]
\ No newline at end of file
+{
+ "allow_copy": 0, 
+ "autoname": "DEF.######", 
+ "creation": "2013-02-22 01:27:32", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "defkey", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "in_list_view": 1, 
+   "label": "Key", 
+   "oldfieldname": "defkey", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_width": "200px", 
+   "reqd": 1, 
+   "search_index": 0, 
+   "width": "200px"
+  }, 
+  {
+   "fieldname": "defvalue", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "in_list_view": 1, 
+   "label": "Value", 
+   "oldfieldname": "defvalue", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "print_width": "200px", 
+   "reqd": 0, 
+   "search_index": 0, 
+   "width": "200px"
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 1, 
+ "issingle": 0, 
+ "istable": 1, 
+ "modified": "2013-12-20 19:23:05", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "DefaultValue", 
+ "owner": "Administrator", 
+ "read_only": 0
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/docfield/docfield.txt b/frappe/core/doctype/docfield/docfield.txt
index 2dd3a6e819..626970edd7 100644
--- a/frappe/core/doctype/docfield/docfield.txt
+++ b/frappe/core/doctype/docfield/docfield.txt
@@ -1,325 +1,312 @@
-[
- {
-  "creation": "2013-02-22 01:27:33", 
-  "docstatus": 0, 
-  "modified": "2014-03-05 14:58:43", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_copy": 0, 
-  "autoname": "FL.#####", 
-  "doctype": "DocType", 
-  "hide_heading": 0, 
-  "hide_toolbar": 0, 
-  "in_dialog": 1, 
-  "issingle": 0, 
-  "istable": 1, 
-  "module": "Core", 
-  "name": "__common__", 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "DocField", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocType", 
-  "name": "DocField"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "label_and_type", 
-  "fieldtype": "Section Break", 
-  "label": "Label and Type"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "label", 
-  "fieldtype": "Data", 
-  "hidden": 0, 
-  "in_list_view": 1, 
-  "label": "Label", 
-  "oldfieldname": "label", 
-  "oldfieldtype": "Data", 
-  "print_width": "163", 
-  "reqd": 0, 
-  "search_index": 1, 
-  "width": "163"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "fieldtype", 
-  "fieldtype": "Select", 
-  "hidden": 0, 
-  "in_list_view": 1, 
-  "label": "Type", 
-  "oldfieldname": "fieldtype", 
-  "oldfieldtype": "Select", 
-  "options": "Attach\nButton\nCheck\nCode\nColumn Break\nCurrency\nData\nDate\nDatetime\nFloat\nHTML\nImage\nInt\nLink\nLong Text\nPassword\nPercent\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nText\nText Editor\nTime", 
-  "reqd": 1, 
-  "search_index": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "fieldname", 
-  "fieldtype": "Data", 
-  "hidden": 0, 
-  "in_list_view": 1, 
-  "label": "Name", 
-  "oldfieldname": "fieldname", 
-  "oldfieldtype": "Data", 
-  "reqd": 0, 
-  "search_index": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "reqd", 
-  "fieldtype": "Check", 
-  "hidden": 0, 
-  "in_list_view": 1, 
-  "label": "Mandatory", 
-  "oldfieldname": "reqd", 
-  "oldfieldtype": "Check", 
-  "print_width": "50px", 
-  "reqd": 0, 
-  "search_index": 0, 
-  "width": "50px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "search_index", 
-  "fieldtype": "Check", 
-  "hidden": 0, 
-  "label": "Index", 
-  "oldfieldname": "search_index", 
-  "oldfieldtype": "Check", 
-  "print_width": "50px", 
-  "reqd": 0, 
-  "search_index": 0, 
-  "width": "50px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "in_list_view", 
-  "fieldtype": "Check", 
-  "label": "In List View", 
-  "print_width": "70px", 
-  "width": "70px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break_6", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "description": "For Links, enter the DocType as range\nFor Select, enter list of Options separated by comma", 
-  "doctype": "DocField", 
-  "fieldname": "options", 
-  "fieldtype": "Text", 
-  "hidden": 0, 
-  "in_list_view": 1, 
-  "label": "Options", 
-  "oldfieldname": "options", 
-  "oldfieldtype": "Text", 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "permissions", 
-  "fieldtype": "Section Break", 
-  "label": "Permissions"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "depends_on", 
-  "fieldtype": "Data", 
-  "label": "Depends On", 
-  "oldfieldname": "depends_on", 
-  "oldfieldtype": "Data"
- }, 
- {
-  "default": "0", 
-  "doctype": "DocField", 
-  "fieldname": "permlevel", 
-  "fieldtype": "Int", 
-  "hidden": 0, 
-  "label": "Perm Level", 
-  "oldfieldname": "permlevel", 
-  "oldfieldtype": "Int", 
-  "print_width": "50px", 
-  "reqd": 0, 
-  "search_index": 0, 
-  "width": "50px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "hidden", 
-  "fieldtype": "Check", 
-  "hidden": 0, 
-  "label": "Hidden", 
-  "oldfieldname": "hidden", 
-  "oldfieldtype": "Check", 
-  "print_width": "50px", 
-  "reqd": 0, 
-  "search_index": 0, 
-  "width": "50px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "read_only", 
-  "fieldtype": "Check", 
-  "label": "Read Only", 
-  "print_width": "50px", 
-  "width": "50px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "set_only_once", 
-  "fieldtype": "Check",
-  "label": "Set Only Once", 
-  "description": "Do not allow user to change after set the first time"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break_13", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "description": "User restrictions should not apply for this Link", 
-  "doctype": "DocField", 
-  "fieldname": "ignore_restrictions", 
-  "fieldtype": "Check", 
-  "label": "Ignore Restrictions"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "allow_on_submit", 
-  "fieldtype": "Check", 
-  "label": "Allow on Submit", 
-  "oldfieldname": "allow_on_submit", 
-  "oldfieldtype": "Check", 
-  "print_width": "50px", 
-  "width": "50px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "report_hide", 
-  "fieldtype": "Check", 
-  "label": "Report Hide", 
-  "oldfieldname": "report_hide", 
-  "oldfieldtype": "Check", 
-  "print_width": "50px", 
-  "width": "50px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "display", 
-  "fieldtype": "Section Break", 
-  "label": "Display"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "default", 
-  "fieldtype": "Text", 
-  "hidden": 0, 
-  "label": "Default", 
-  "oldfieldname": "default", 
-  "oldfieldtype": "Text", 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "in_filter", 
-  "fieldtype": "Check", 
-  "label": "In Filter", 
-  "oldfieldname": "in_filter", 
-  "oldfieldtype": "Check", 
-  "print_width": "50px", 
-  "width": "50px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "no_copy", 
-  "fieldtype": "Check", 
-  "label": "No Copy", 
-  "oldfieldname": "no_copy", 
-  "oldfieldtype": "Check", 
-  "print_width": "50px", 
-  "width": "50px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break_22", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "description", 
-  "fieldtype": "Text", 
-  "in_list_view": 1, 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "oldfieldtype": "Text", 
-  "print_width": "300px", 
-  "width": "300px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "print_hide", 
-  "fieldtype": "Check", 
-  "hidden": 0, 
-  "label": "Print Hide", 
-  "oldfieldname": "print_hide", 
-  "oldfieldtype": "Check", 
-  "print_width": "50px", 
-  "reqd": 0, 
-  "search_index": 0, 
-  "width": "50px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "print_width", 
-  "fieldtype": "Data", 
-  "label": "Print Width"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "width", 
-  "fieldtype": "Data", 
-  "hidden": 0, 
-  "label": "Width", 
-  "oldfieldname": "width", 
-  "oldfieldtype": "Data", 
-  "print_width": "50px", 
-  "reqd": 0, 
-  "search_index": 0, 
-  "width": "50px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "oldfieldname", 
-  "fieldtype": "Data", 
-  "hidden": 1, 
-  "oldfieldname": "oldfieldname", 
-  "oldfieldtype": "Data", 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "oldfieldtype", 
-  "fieldtype": "Data", 
-  "hidden": 1, 
-  "oldfieldname": "oldfieldtype", 
-  "oldfieldtype": "Data", 
-  "reqd": 0, 
-  "search_index": 0
- }
-]
\ No newline at end of file
+{
+ "allow_copy": 0, 
+ "autoname": "FL.#####", 
+ "creation": "2013-02-22 01:27:33", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "label_and_type", 
+   "fieldtype": "Section Break", 
+   "label": "Label and Type", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "label", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "in_list_view": 1, 
+   "label": "Label", 
+   "oldfieldname": "label", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_width": "163", 
+   "reqd": 0, 
+   "search_index": 1, 
+   "width": "163"
+  }, 
+  {
+   "fieldname": "fieldtype", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "in_list_view": 1, 
+   "label": "Type", 
+   "oldfieldname": "fieldtype", 
+   "oldfieldtype": "Select", 
+   "options": "Attach\nButton\nCheck\nCode\nColumn Break\nCurrency\nData\nDate\nDatetime\nFloat\nHTML\nImage\nInt\nLink\nLong Text\nPassword\nPercent\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nText\nText Editor\nTime", 
+   "permlevel": 0, 
+   "reqd": 1, 
+   "search_index": 1
+  }, 
+  {
+   "fieldname": "fieldname", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "in_list_view": 1, 
+   "label": "Name", 
+   "oldfieldname": "fieldname", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 1
+  }, 
+  {
+   "fieldname": "reqd", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "in_list_view": 1, 
+   "label": "Mandatory", 
+   "oldfieldname": "reqd", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "print_width": "50px", 
+   "reqd": 0, 
+   "search_index": 0, 
+   "width": "50px"
+  }, 
+  {
+   "fieldname": "search_index", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "label": "Index", 
+   "oldfieldname": "search_index", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "print_width": "50px", 
+   "reqd": 0, 
+   "search_index": 0, 
+   "width": "50px"
+  }, 
+  {
+   "fieldname": "in_list_view", 
+   "fieldtype": "Check", 
+   "label": "In List View", 
+   "permlevel": 0, 
+   "print_width": "70px", 
+   "width": "70px"
+  }, 
+  {
+   "fieldname": "column_break_6", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "For Links, enter the DocType as range\nFor Select, enter list of Options separated by comma", 
+   "fieldname": "options", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "in_list_view": 1, 
+   "label": "Options", 
+   "oldfieldname": "options", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "permissions", 
+   "fieldtype": "Section Break", 
+   "label": "Permissions", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "depends_on", 
+   "fieldtype": "Data", 
+   "label": "Depends On", 
+   "oldfieldname": "depends_on", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0
+  }, 
+  {
+   "default": "0", 
+   "fieldname": "permlevel", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "label": "Perm Level", 
+   "oldfieldname": "permlevel", 
+   "oldfieldtype": "Int", 
+   "permlevel": 0, 
+   "print_width": "50px", 
+   "reqd": 0, 
+   "search_index": 0, 
+   "width": "50px"
+  }, 
+  {
+   "fieldname": "hidden", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "label": "Hidden", 
+   "oldfieldname": "hidden", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "print_width": "50px", 
+   "reqd": 0, 
+   "search_index": 0, 
+   "width": "50px"
+  }, 
+  {
+   "fieldname": "read_only", 
+   "fieldtype": "Check", 
+   "label": "Read Only", 
+   "permlevel": 0, 
+   "print_width": "50px", 
+   "width": "50px"
+  }, 
+  {
+   "description": "Do not allow user to change after set the first time", 
+   "fieldname": "set_only_once", 
+   "fieldtype": "Check", 
+   "label": "Set Only Once", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "column_break_13", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "User restrictions should not apply for this Link", 
+   "fieldname": "ignore_restrictions", 
+   "fieldtype": "Check", 
+   "label": "Ignore Restrictions", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "allow_on_submit", 
+   "fieldtype": "Check", 
+   "label": "Allow on Submit", 
+   "oldfieldname": "allow_on_submit", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "print_width": "50px", 
+   "width": "50px"
+  }, 
+  {
+   "fieldname": "report_hide", 
+   "fieldtype": "Check", 
+   "label": "Report Hide", 
+   "oldfieldname": "report_hide", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "print_width": "50px", 
+   "width": "50px"
+  }, 
+  {
+   "fieldname": "display", 
+   "fieldtype": "Section Break", 
+   "label": "Display", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "default", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "label": "Default", 
+   "oldfieldname": "default", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "in_filter", 
+   "fieldtype": "Check", 
+   "label": "In Filter", 
+   "oldfieldname": "in_filter", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "print_width": "50px", 
+   "width": "50px"
+  }, 
+  {
+   "fieldname": "no_copy", 
+   "fieldtype": "Check", 
+   "label": "No Copy", 
+   "oldfieldname": "no_copy", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "print_width": "50px", 
+   "width": "50px"
+  }, 
+  {
+   "fieldname": "column_break_22", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "description", 
+   "fieldtype": "Text", 
+   "in_list_view": 1, 
+   "label": "Description", 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "print_width": "300px", 
+   "width": "300px"
+  }, 
+  {
+   "fieldname": "print_hide", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "label": "Print Hide", 
+   "oldfieldname": "print_hide", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "print_width": "50px", 
+   "reqd": 0, 
+   "search_index": 0, 
+   "width": "50px"
+  }, 
+  {
+   "fieldname": "print_width", 
+   "fieldtype": "Data", 
+   "label": "Print Width", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "width", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Width", 
+   "oldfieldname": "width", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_width": "50px", 
+   "reqd": 0, 
+   "search_index": 0, 
+   "width": "50px"
+  }, 
+  {
+   "fieldname": "oldfieldname", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "oldfieldname": "oldfieldname", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "oldfieldtype", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "oldfieldname": "oldfieldtype", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 1, 
+ "in_dialog": 1, 
+ "issingle": 0, 
+ "istable": 1, 
+ "modified": "2014-03-05 14:58:43", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "DocField", 
+ "owner": "Administrator", 
+ "read_only": 0
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/docperm/docperm.txt b/frappe/core/doctype/docperm/docperm.txt
index f03bba0ba8..63db5cd7a7 100644
--- a/frappe/core/doctype/docperm/docperm.txt
+++ b/frappe/core/doctype/docperm/docperm.txt
@@ -1,229 +1,216 @@
-[
- {
-  "creation": "2013-02-22 01:27:33", 
-  "docstatus": 0, 
-  "modified": "2014-01-22 14:32:34", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_copy": 0, 
-  "autoname": "PERM.#####", 
-  "doctype": "DocType", 
-  "hide_heading": 0, 
-  "hide_toolbar": 0, 
-  "issingle": 0, 
-  "istable": 1, 
-  "module": "Core", 
-  "name": "__common__", 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "DocPerm", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocType", 
-  "name": "DocPerm"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "role_and_level", 
-  "fieldtype": "Section Break", 
-  "label": "Role and Level"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "role", 
-  "fieldtype": "Link", 
-  "hidden": 0, 
-  "in_list_view": 1, 
-  "label": "Role", 
-  "oldfieldname": "role", 
-  "oldfieldtype": "Link", 
-  "options": "Role", 
-  "print_width": "150px", 
-  "reqd": 1, 
-  "search_index": 0, 
-  "width": "150px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break_2", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "default": "0", 
-  "doctype": "DocField", 
-  "fieldname": "permlevel", 
-  "fieldtype": "Int", 
-  "hidden": 0, 
-  "in_list_view": 1, 
-  "label": "Level", 
-  "oldfieldname": "permlevel", 
-  "oldfieldtype": "Int", 
-  "print_width": "40px", 
-  "reqd": 0, 
-  "search_index": 0, 
-  "width": "40px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "section_break_4", 
-  "fieldtype": "Section Break", 
-  "label": "Permissions"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "read", 
-  "fieldtype": "Check", 
-  "hidden": 0, 
-  "in_list_view": 1, 
-  "label": "Read", 
-  "oldfieldname": "read", 
-  "oldfieldtype": "Check", 
-  "print_width": "32px", 
-  "reqd": 0, 
-  "search_index": 0, 
-  "width": "32px"
- }, 
- {
-  "description": "Only restricted users can access", 
-  "doctype": "DocField", 
-  "fieldname": "restricted", 
-  "fieldtype": "Check", 
-  "label": "Restricted"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "write", 
-  "fieldtype": "Check", 
-  "hidden": 0, 
-  "in_list_view": 1, 
-  "label": "Write", 
-  "oldfieldname": "write", 
-  "oldfieldtype": "Check", 
-  "print_width": "32px", 
-  "reqd": 0, 
-  "search_index": 0, 
-  "width": "32px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "create", 
-  "fieldtype": "Check", 
-  "hidden": 0, 
-  "in_list_view": 1, 
-  "label": "Create", 
-  "oldfieldname": "create", 
-  "oldfieldtype": "Check", 
-  "print_width": "32px", 
-  "reqd": 0, 
-  "search_index": 0, 
-  "width": "32px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "delete", 
-  "fieldtype": "Check", 
-  "in_list_view": 1, 
-  "label": "Delete"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break_8", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "submit", 
-  "fieldtype": "Check", 
-  "hidden": 0, 
-  "in_list_view": 1, 
-  "label": "Submit", 
-  "oldfieldname": "submit", 
-  "oldfieldtype": "Check", 
-  "print_width": "32px", 
-  "reqd": 0, 
-  "search_index": 0, 
-  "width": "32px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "cancel", 
-  "fieldtype": "Check", 
-  "hidden": 0, 
-  "in_list_view": 1, 
-  "label": "Cancel", 
-  "oldfieldname": "cancel", 
-  "oldfieldtype": "Check", 
-  "print_width": "32px", 
-  "reqd": 0, 
-  "search_index": 0, 
-  "width": "32px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "amend", 
-  "fieldtype": "Check", 
-  "label": "Amend", 
-  "oldfieldname": "amend", 
-  "oldfieldtype": "Check", 
-  "print_width": "32px", 
-  "width": "32px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "additional_permissions", 
-  "fieldtype": "Section Break", 
-  "label": "Additional Permissions"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "report", 
-  "fieldtype": "Check", 
-  "label": "Report", 
-  "print_width": "32px", 
-  "width": "32px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "export", 
-  "fieldtype": "Check", 
-  "label": "Export"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "import", 
-  "fieldtype": "Check", 
-  "label": "Import"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break_19", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "print", 
-  "fieldtype": "Check", 
-  "label": "Print"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "email", 
-  "fieldtype": "Check", 
-  "label": "Email"
- }, 
- {
-  "description": "This role can restrict users for accessing the record.", 
-  "doctype": "DocField", 
-  "fieldname": "restrict", 
-  "fieldtype": "Check", 
-  "label": "Can Restrict"
- }
-]
\ No newline at end of file
+{
+ "allow_copy": 0, 
+ "autoname": "PERM.#####", 
+ "creation": "2013-02-22 01:27:33", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "role_and_level", 
+   "fieldtype": "Section Break", 
+   "label": "Role and Level", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "role", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "in_list_view": 1, 
+   "label": "Role", 
+   "oldfieldname": "role", 
+   "oldfieldtype": "Link", 
+   "options": "Role", 
+   "permlevel": 0, 
+   "print_width": "150px", 
+   "reqd": 1, 
+   "search_index": 0, 
+   "width": "150px"
+  }, 
+  {
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "default": "0", 
+   "fieldname": "permlevel", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "in_list_view": 1, 
+   "label": "Level", 
+   "oldfieldname": "permlevel", 
+   "oldfieldtype": "Int", 
+   "permlevel": 0, 
+   "print_width": "40px", 
+   "reqd": 0, 
+   "search_index": 0, 
+   "width": "40px"
+  }, 
+  {
+   "fieldname": "section_break_4", 
+   "fieldtype": "Section Break", 
+   "label": "Permissions", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "read", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "in_list_view": 1, 
+   "label": "Read", 
+   "oldfieldname": "read", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "print_width": "32px", 
+   "reqd": 0, 
+   "search_index": 0, 
+   "width": "32px"
+  }, 
+  {
+   "description": "Only restricted users can access", 
+   "fieldname": "restricted", 
+   "fieldtype": "Check", 
+   "label": "Restricted", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "write", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "in_list_view": 1, 
+   "label": "Write", 
+   "oldfieldname": "write", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "print_width": "32px", 
+   "reqd": 0, 
+   "search_index": 0, 
+   "width": "32px"
+  }, 
+  {
+   "fieldname": "create", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "in_list_view": 1, 
+   "label": "Create", 
+   "oldfieldname": "create", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "print_width": "32px", 
+   "reqd": 0, 
+   "search_index": 0, 
+   "width": "32px"
+  }, 
+  {
+   "fieldname": "delete", 
+   "fieldtype": "Check", 
+   "in_list_view": 1, 
+   "label": "Delete", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "column_break_8", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "submit", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "in_list_view": 1, 
+   "label": "Submit", 
+   "oldfieldname": "submit", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "print_width": "32px", 
+   "reqd": 0, 
+   "search_index": 0, 
+   "width": "32px"
+  }, 
+  {
+   "fieldname": "cancel", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "in_list_view": 1, 
+   "label": "Cancel", 
+   "oldfieldname": "cancel", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "print_width": "32px", 
+   "reqd": 0, 
+   "search_index": 0, 
+   "width": "32px"
+  }, 
+  {
+   "fieldname": "amend", 
+   "fieldtype": "Check", 
+   "label": "Amend", 
+   "oldfieldname": "amend", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "print_width": "32px", 
+   "width": "32px"
+  }, 
+  {
+   "fieldname": "additional_permissions", 
+   "fieldtype": "Section Break", 
+   "label": "Additional Permissions", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "report", 
+   "fieldtype": "Check", 
+   "label": "Report", 
+   "permlevel": 0, 
+   "print_width": "32px", 
+   "width": "32px"
+  }, 
+  {
+   "fieldname": "export", 
+   "fieldtype": "Check", 
+   "label": "Export", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "import", 
+   "fieldtype": "Check", 
+   "label": "Import", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "column_break_19", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "print", 
+   "fieldtype": "Check", 
+   "label": "Print", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "email", 
+   "fieldtype": "Check", 
+   "label": "Email", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "This role can restrict users for accessing the record.", 
+   "fieldname": "restrict", 
+   "fieldtype": "Check", 
+   "label": "Can Restrict", 
+   "permlevel": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 1, 
+ "issingle": 0, 
+ "istable": 1, 
+ "modified": "2014-01-22 14:32:34", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "DocPerm", 
+ "owner": "Administrator", 
+ "read_only": 0
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/doctype/doctype.txt b/frappe/core/doctype/doctype/doctype.txt
index a155cf9ace..dbce3f3845 100644
--- a/frappe/core/doctype/doctype/doctype.txt
+++ b/frappe/core/doctype/doctype/doctype.txt
@@ -1,375 +1,362 @@
-[
- {
-  "creation": "2013-02-18 13:36:19", 
-  "docstatus": 0, 
-  "modified": "2014-01-27 11:57:14", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_attach": 0, 
-  "allow_copy": 0, 
-  "autoname": "Prompt", 
-  "custom": 0, 
-  "description": "DocType is a Table / Form in the application.", 
-  "doctype": "DocType", 
-  "hide_heading": 0, 
-  "hide_toolbar": 0, 
-  "icon": "icon-bolt", 
-  "issingle": 0, 
-  "istable": 0, 
-  "module": "Core", 
-  "name": "__common__", 
-  "read_only": 0, 
-  "search_fields": "module"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "DocType", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "cancel": 0, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "DocType", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "report": 1, 
-  "submit": 0
- }, 
- {
-  "doctype": "DocType", 
-  "name": "DocType"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "sb0", 
-  "fieldtype": "Section Break", 
-  "hidden": 0, 
-  "label": "DocType Details", 
-  "oldfieldtype": "Section Break", 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "module", 
-  "fieldtype": "Link", 
-  "in_list_view": 1, 
-  "label": "Module", 
-  "oldfieldname": "module", 
-  "oldfieldtype": "Link", 
-  "options": "Module Def", 
-  "reqd": 1, 
-  "search_index": 1
- }, 
- {
-  "description": "Child Tables are shown as a Grid in other DocTypes.", 
-  "doctype": "DocField", 
-  "fieldname": "istable", 
-  "fieldtype": "Check", 
-  "hidden": 0, 
-  "label": "Is Child Table", 
-  "oldfieldname": "istable", 
-  "oldfieldtype": "Check", 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "description": "Single Types have only one record no tables associated. Values are stored in tabSingles", 
-  "doctype": "DocField", 
-  "fieldname": "issingle", 
-  "fieldtype": "Check", 
-  "hidden": 0, 
-  "label": "Is Single", 
-  "oldfieldname": "issingle", 
-  "oldfieldtype": "Check", 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "cb01", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "document_type", 
-  "fieldtype": "Select", 
-  "label": "Document Type", 
-  "oldfieldname": "document_type", 
-  "oldfieldtype": "Select", 
-  "options": "\nMaster\nTransaction\nSystem\nOther"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "icon", 
-  "fieldtype": "Data", 
-  "label": "Icon"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "custom", 
-  "fieldtype": "Check", 
-  "label": "Custom?", 
-  "no_copy": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "plugin", 
-  "fieldtype": "Data", 
-  "hidden": 1, 
-  "label": "Plugin", 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "fields_section_break", 
-  "fieldtype": "Section Break", 
-  "hidden": 0, 
-  "label": "Fields", 
-  "oldfieldtype": "Section Break", 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "fields", 
-  "fieldtype": "Table", 
-  "hidden": 0, 
-  "label": "Fields", 
-  "oldfieldname": "fields", 
-  "oldfieldtype": "Table", 
-  "options": "DocField", 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "sb1", 
-  "fieldtype": "Section Break", 
-  "label": "Naming"
- }, 
- {
-  "description": "<a onclick=\"msgprint('<ol>\\\n<li><b>field:[fieldname]</b> - By Field\\\n<li><b>naming_series:</b> - By Naming Series (field called naming_series must be present\\\n<li><b>Prompt</b> - Prompt user for a name\\\n<li><b>[series]</b> - Series by prefix (separated by a dot); for example PRE.#####\\\n</ol>')\">Naming Options</a>", 
-  "doctype": "DocField", 
-  "fieldname": "autoname", 
-  "fieldtype": "Data", 
-  "hidden": 0, 
-  "label": "Auto Name", 
-  "oldfieldname": "autoname", 
-  "oldfieldtype": "Data", 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "name_case", 
-  "fieldtype": "Select", 
-  "label": "Name Case", 
-  "oldfieldname": "name_case", 
-  "oldfieldtype": "Select", 
-  "options": "\nTitle Case\nUPPER CASE"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break_15", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "description": "Show this field as title", 
-  "doctype": "DocField", 
-  "fieldname": "title_field", 
-  "fieldtype": "Data", 
-  "label": "Title Field"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "search_fields", 
-  "fieldtype": "Data", 
-  "hidden": 0, 
-  "label": "Search Fields", 
-  "oldfieldname": "search_fields", 
-  "oldfieldtype": "Data", 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "sb2", 
-  "fieldtype": "Section Break", 
-  "label": "Permission Rules"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "permissions", 
-  "fieldtype": "Table", 
-  "hidden": 0, 
-  "label": "Permissions", 
-  "oldfieldname": "permissions", 
-  "oldfieldtype": "Table", 
-  "options": "DocPerm", 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "sb3", 
-  "fieldtype": "Section Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "cb30", 
-  "fieldtype": "Column Break", 
-  "label": "Permissions Settings"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "in_create", 
-  "fieldtype": "Check", 
-  "label": "User Cannot Create", 
-  "oldfieldname": "in_create", 
-  "oldfieldtype": "Check"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "read_only", 
-  "fieldtype": "Check", 
-  "hidden": 0, 
-  "label": "User Cannot Search", 
-  "oldfieldname": "read_only", 
-  "oldfieldtype": "Check", 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "is_submittable", 
-  "fieldtype": "Check", 
-  "label": "Is Submittable"
- }, 
- {
-  "description": "Allow Import via Data Import Tool", 
-  "doctype": "DocField", 
-  "fieldname": "allow_import", 
-  "fieldtype": "Check", 
-  "label": "Allow Import"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "allow_rename", 
-  "fieldtype": "Check", 
-  "label": "Allow Rename", 
-  "oldfieldname": "allow_rename", 
-  "oldfieldtype": "Check"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "in_dialog", 
-  "fieldtype": "Check", 
-  "label": "In Dialog", 
-  "oldfieldname": "in_dialog", 
-  "oldfieldtype": "Check"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "read_only_onload", 
-  "fieldtype": "Check", 
-  "label": "Show Print First", 
-  "oldfieldname": "read_only_onload", 
-  "oldfieldtype": "Check"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "allow_attach", 
-  "fieldtype": "Check", 
-  "label": "Allow Attach", 
-  "oldfieldname": "allow_attach", 
-  "oldfieldtype": "Check"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "max_attachments", 
-  "fieldtype": "Int", 
-  "hidden": 1, 
-  "label": "Max Attachments", 
-  "oldfieldname": "max_attachments", 
-  "oldfieldtype": "Int"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "cb31", 
-  "fieldtype": "Column Break", 
-  "label": "Hide Actions"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "hide_heading", 
-  "fieldtype": "Check", 
-  "hidden": 0, 
-  "label": "Hide Heading", 
-  "oldfieldname": "hide_heading", 
-  "oldfieldtype": "Check", 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "hide_toolbar", 
-  "fieldtype": "Check", 
-  "hidden": 0, 
-  "label": "Hide Toolbar", 
-  "oldfieldname": "hide_toolbar", 
-  "oldfieldtype": "Check", 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "allow_copy", 
-  "fieldtype": "Check", 
-  "hidden": 0, 
-  "label": "Hide Copy", 
-  "oldfieldname": "allow_copy", 
-  "oldfieldtype": "Check", 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "default_print_format", 
-  "fieldtype": "Data", 
-  "label": "Default Print Format"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "description", 
-  "fieldtype": "Small Text", 
-  "hidden": 0, 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "oldfieldtype": "Text", 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "delete": 0, 
-  "doctype": "DocPerm", 
-  "role": "System Manager"
- }, 
- {
-  "create": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "role": "Administrator", 
-  "write": 1
- }
-]
\ No newline at end of file
+{
+ "allow_attach": 0, 
+ "allow_copy": 0, 
+ "autoname": "Prompt", 
+ "creation": "2013-02-18 13:36:19", 
+ "custom": 0, 
+ "description": "DocType is a Table / Form in the application.", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "sb0", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "label": "DocType Details", 
+   "oldfieldtype": "Section Break", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "module", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Module", 
+   "oldfieldname": "module", 
+   "oldfieldtype": "Link", 
+   "options": "Module Def", 
+   "permlevel": 0, 
+   "reqd": 1, 
+   "search_index": 1
+  }, 
+  {
+   "description": "Child Tables are shown as a Grid in other DocTypes.", 
+   "fieldname": "istable", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "label": "Is Child Table", 
+   "oldfieldname": "istable", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "description": "Single Types have only one record no tables associated. Values are stored in tabSingles", 
+   "fieldname": "issingle", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "label": "Is Single", 
+   "oldfieldname": "issingle", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "cb01", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "document_type", 
+   "fieldtype": "Select", 
+   "label": "Document Type", 
+   "oldfieldname": "document_type", 
+   "oldfieldtype": "Select", 
+   "options": "\nMaster\nTransaction\nSystem\nOther", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "icon", 
+   "fieldtype": "Data", 
+   "label": "Icon", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "custom", 
+   "fieldtype": "Check", 
+   "label": "Custom?", 
+   "no_copy": 0, 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "plugin", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "label": "Plugin", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
+  {
+   "fieldname": "fields_section_break", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "label": "Fields", 
+   "oldfieldtype": "Section Break", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "fields", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "label": "Fields", 
+   "oldfieldname": "fields", 
+   "oldfieldtype": "Table", 
+   "options": "DocField", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "sb1", 
+   "fieldtype": "Section Break", 
+   "label": "Naming", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "<a onclick=\"msgprint('<ol>\\\n<li><b>field:[fieldname]</b> - By Field\\\n<li><b>naming_series:</b> - By Naming Series (field called naming_series must be present\\\n<li><b>Prompt</b> - Prompt user for a name\\\n<li><b>[series]</b> - Series by prefix (separated by a dot); for example PRE.#####\\\n</ol>')\">Naming Options</a>", 
+   "fieldname": "autoname", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Auto Name", 
+   "oldfieldname": "autoname", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "name_case", 
+   "fieldtype": "Select", 
+   "label": "Name Case", 
+   "oldfieldname": "name_case", 
+   "oldfieldtype": "Select", 
+   "options": "\nTitle Case\nUPPER CASE", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "column_break_15", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Show this field as title", 
+   "fieldname": "title_field", 
+   "fieldtype": "Data", 
+   "label": "Title Field", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "search_fields", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Search Fields", 
+   "oldfieldname": "search_fields", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "sb2", 
+   "fieldtype": "Section Break", 
+   "label": "Permission Rules", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "permissions", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "label": "Permissions", 
+   "oldfieldname": "permissions", 
+   "oldfieldtype": "Table", 
+   "options": "DocPerm", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "sb3", 
+   "fieldtype": "Section Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "cb30", 
+   "fieldtype": "Column Break", 
+   "label": "Permissions Settings", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "in_create", 
+   "fieldtype": "Check", 
+   "label": "User Cannot Create", 
+   "oldfieldname": "in_create", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "read_only", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "label": "User Cannot Search", 
+   "oldfieldname": "read_only", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "is_submittable", 
+   "fieldtype": "Check", 
+   "label": "Is Submittable", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Allow Import via Data Import Tool", 
+   "fieldname": "allow_import", 
+   "fieldtype": "Check", 
+   "label": "Allow Import", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "allow_rename", 
+   "fieldtype": "Check", 
+   "label": "Allow Rename", 
+   "oldfieldname": "allow_rename", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "in_dialog", 
+   "fieldtype": "Check", 
+   "label": "In Dialog", 
+   "oldfieldname": "in_dialog", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "read_only_onload", 
+   "fieldtype": "Check", 
+   "label": "Show Print First", 
+   "oldfieldname": "read_only_onload", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "allow_attach", 
+   "fieldtype": "Check", 
+   "label": "Allow Attach", 
+   "oldfieldname": "allow_attach", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "max_attachments", 
+   "fieldtype": "Int", 
+   "hidden": 1, 
+   "label": "Max Attachments", 
+   "oldfieldname": "max_attachments", 
+   "oldfieldtype": "Int", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "cb31", 
+   "fieldtype": "Column Break", 
+   "label": "Hide Actions", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "hide_heading", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "label": "Hide Heading", 
+   "oldfieldname": "hide_heading", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "hide_toolbar", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "label": "Hide Toolbar", 
+   "oldfieldname": "hide_toolbar", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "allow_copy", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "label": "Hide Copy", 
+   "oldfieldname": "allow_copy", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "default_print_format", 
+   "fieldtype": "Data", 
+   "label": "Default Print Format", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "description", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "label": "Description", 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "icon-bolt", 
+ "idx": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "modified": "2014-01-27 11:57:14", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "DocType", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "submit": 0
+  }, 
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Administrator", 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "read_only": 0, 
+ "search_fields": "module"
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/event/event.txt b/frappe/core/doctype/event/event.txt
index 77f8fdd6ad..380250f52b 100644
--- a/frappe/core/doctype/event/event.txt
+++ b/frappe/core/doctype/event/event.txt
@@ -1,293 +1,282 @@
-[
- {
-  "creation": "2013-06-10 13:17:47", 
-  "docstatus": 0, 
-  "modified": "2014-01-24 13:00:01", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "autoname": "EV.#####", 
-  "doctype": "DocType", 
-  "icon": "icon-calendar", 
-  "in_create": 1, 
-  "module": "Core", 
-  "name": "__common__", 
-  "read_only": 1, 
-  "title_field": "subject"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Event", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "cancel": 0, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Event", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "report": 1, 
-  "submit": 0, 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Event"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "details", 
-  "fieldtype": "Section Break", 
-  "label": "Details", 
-  "oldfieldtype": "Section Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "subject", 
-  "fieldtype": "Data", 
-  "in_list_view": 1, 
-  "label": "Subject", 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "event_type", 
-  "fieldtype": "Select", 
-  "in_list_view": 1, 
-  "label": "Event Type", 
-  "no_copy": 0, 
-  "oldfieldname": "event_type", 
-  "oldfieldtype": "Select", 
-  "options": "Private\nPublic\nCancel", 
-  "reqd": 1, 
-  "search_index": 1
- }, 
- {
-  "default": "1", 
-  "doctype": "DocField", 
-  "fieldname": "send_reminder", 
-  "fieldtype": "Check", 
-  "label": "Send an email reminder in the morning"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break_4", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "all_day", 
-  "fieldtype": "Check", 
-  "label": "All Day"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "starts_on", 
-  "fieldtype": "Datetime", 
-  "label": "Starts on", 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "ends_on", 
-  "fieldtype": "Datetime", 
-  "label": "Ends on", 
-  "reqd": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "section_break_8", 
-  "fieldtype": "Section Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "repeat_this_event", 
-  "fieldtype": "Check", 
-  "label": "Repeat this Event"
- }, 
- {
-  "depends_on": "repeat_this_event", 
-  "doctype": "DocField", 
-  "fieldname": "section_break_11", 
-  "fieldtype": "Section Break"
- }, 
- {
-  "depends_on": "repeat_this_event", 
-  "doctype": "DocField", 
-  "fieldname": "repeat_on", 
-  "fieldtype": "Select", 
-  "label": "Repeat On", 
-  "options": "\nEvery Day\nEvery Week\nEvery Month\nEvery Year"
- }, 
- {
-  "depends_on": "repeat_this_event", 
-  "description": "Leave blank to repeat always", 
-  "doctype": "DocField", 
-  "fieldname": "repeat_till", 
-  "fieldtype": "Date", 
-  "label": "Repeat Till"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break_11", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "depends_on": "eval:doc.repeat_this_event && doc.repeat_on===\"Every Day\"", 
-  "doctype": "DocField", 
-  "fieldname": "monday", 
-  "fieldtype": "Check", 
-  "label": "Monday"
- }, 
- {
-  "depends_on": "eval:doc.repeat_this_event && doc.repeat_on===\"Every Day\"", 
-  "doctype": "DocField", 
-  "fieldname": "tuesday", 
-  "fieldtype": "Check", 
-  "label": "Tuesday"
- }, 
- {
-  "depends_on": "eval:doc.repeat_this_event && doc.repeat_on===\"Every Day\"", 
-  "doctype": "DocField", 
-  "fieldname": "wednesday", 
-  "fieldtype": "Check", 
-  "label": "Wednesday"
- }, 
- {
-  "depends_on": "eval:doc.repeat_this_event && doc.repeat_on===\"Every Day\"", 
-  "doctype": "DocField", 
-  "fieldname": "thursday", 
-  "fieldtype": "Check", 
-  "label": "Thursday"
- }, 
- {
-  "depends_on": "eval:doc.repeat_this_event && doc.repeat_on===\"Every Day\"", 
-  "doctype": "DocField", 
-  "fieldname": "friday", 
-  "fieldtype": "Check", 
-  "label": "Friday"
- }, 
- {
-  "depends_on": "eval:doc.repeat_this_event && doc.repeat_on===\"Every Day\"", 
-  "doctype": "DocField", 
-  "fieldname": "saturday", 
-  "fieldtype": "Check", 
-  "label": "Saturday"
- }, 
- {
-  "depends_on": "eval:doc.repeat_this_event && doc.repeat_on===\"Every Day\"", 
-  "doctype": "DocField", 
-  "fieldname": "sunday", 
-  "fieldtype": "Check", 
-  "label": "Sunday"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "section_break_6", 
-  "fieldtype": "Section Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "description", 
-  "fieldtype": "Text Editor", 
-  "in_list_view": 0, 
-  "label": "Description", 
-  "no_copy": 0, 
-  "oldfieldname": "description", 
-  "oldfieldtype": "Text", 
-  "print_width": "300px", 
-  "search_index": 0, 
-  "width": "300px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "participants", 
-  "fieldtype": "Section Break", 
-  "label": "Participants", 
-  "oldfieldtype": "Section Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "individuals", 
-  "fieldtype": "Column Break", 
-  "label": "Individuals", 
-  "oldfieldtype": "Column Break", 
-  "print_width": "50%", 
-  "width": "50%"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "event_individuals", 
-  "fieldtype": "Table", 
-  "label": "Event Individuals", 
-  "no_copy": 0, 
-  "oldfieldname": "event_individuals", 
-  "oldfieldtype": "Table", 
-  "options": "Event User", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "groups", 
-  "fieldtype": "Column Break", 
-  "label": "Groups", 
-  "oldfieldtype": "Column Break", 
-  "print_width": "50%", 
-  "width": "50%"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "event_roles", 
-  "fieldtype": "Table", 
-  "label": "Event Roles", 
-  "no_copy": 0, 
-  "oldfieldname": "event_roles", 
-  "oldfieldtype": "Table", 
-  "options": "Event Role", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "ref_type", 
-  "fieldtype": "Data", 
-  "hidden": 0, 
-  "label": "Ref Type", 
-  "no_copy": 0, 
-  "oldfieldname": "ref_type", 
-  "oldfieldtype": "Data", 
-  "read_only": 1, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "ref_name", 
-  "fieldtype": "Data", 
-  "hidden": 0, 
-  "label": "Ref Name", 
-  "no_copy": 0, 
-  "oldfieldname": "ref_name", 
-  "oldfieldtype": "Data", 
-  "read_only": 1, 
-  "search_index": 0
- }, 
- {
-  "delete": 0, 
-  "doctype": "DocPerm", 
-  "role": "All"
- }, 
- {
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "role": "System Manager"
- }
-]
\ No newline at end of file
+{
+ "autoname": "EV.#####", 
+ "creation": "2013-06-10 13:17:47", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "details", 
+   "fieldtype": "Section Break", 
+   "label": "Details", 
+   "oldfieldtype": "Section Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "subject", 
+   "fieldtype": "Data", 
+   "in_list_view": 1, 
+   "label": "Subject", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "event_type", 
+   "fieldtype": "Select", 
+   "in_list_view": 1, 
+   "label": "Event Type", 
+   "no_copy": 0, 
+   "oldfieldname": "event_type", 
+   "oldfieldtype": "Select", 
+   "options": "Private\nPublic\nCancel", 
+   "permlevel": 0, 
+   "reqd": 1, 
+   "search_index": 1
+  }, 
+  {
+   "default": "1", 
+   "fieldname": "send_reminder", 
+   "fieldtype": "Check", 
+   "label": "Send an email reminder in the morning", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "all_day", 
+   "fieldtype": "Check", 
+   "label": "All Day", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "starts_on", 
+   "fieldtype": "Datetime", 
+   "label": "Starts on", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "ends_on", 
+   "fieldtype": "Datetime", 
+   "label": "Ends on", 
+   "permlevel": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "section_break_8", 
+   "fieldtype": "Section Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "repeat_this_event", 
+   "fieldtype": "Check", 
+   "label": "Repeat this Event", 
+   "permlevel": 0
+  }, 
+  {
+   "depends_on": "repeat_this_event", 
+   "fieldname": "section_break_11", 
+   "fieldtype": "Section Break", 
+   "permlevel": 0
+  }, 
+  {
+   "depends_on": "repeat_this_event", 
+   "fieldname": "repeat_on", 
+   "fieldtype": "Select", 
+   "label": "Repeat On", 
+   "options": "\nEvery Day\nEvery Week\nEvery Month\nEvery Year", 
+   "permlevel": 0
+  }, 
+  {
+   "depends_on": "repeat_this_event", 
+   "description": "Leave blank to repeat always", 
+   "fieldname": "repeat_till", 
+   "fieldtype": "Date", 
+   "label": "Repeat Till", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "column_break_11", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "depends_on": "eval:doc.repeat_this_event && doc.repeat_on===\"Every Day\"", 
+   "fieldname": "monday", 
+   "fieldtype": "Check", 
+   "label": "Monday", 
+   "permlevel": 0
+  }, 
+  {
+   "depends_on": "eval:doc.repeat_this_event && doc.repeat_on===\"Every Day\"", 
+   "fieldname": "tuesday", 
+   "fieldtype": "Check", 
+   "label": "Tuesday", 
+   "permlevel": 0
+  }, 
+  {
+   "depends_on": "eval:doc.repeat_this_event && doc.repeat_on===\"Every Day\"", 
+   "fieldname": "wednesday", 
+   "fieldtype": "Check", 
+   "label": "Wednesday", 
+   "permlevel": 0
+  }, 
+  {
+   "depends_on": "eval:doc.repeat_this_event && doc.repeat_on===\"Every Day\"", 
+   "fieldname": "thursday", 
+   "fieldtype": "Check", 
+   "label": "Thursday", 
+   "permlevel": 0
+  }, 
+  {
+   "depends_on": "eval:doc.repeat_this_event && doc.repeat_on===\"Every Day\"", 
+   "fieldname": "friday", 
+   "fieldtype": "Check", 
+   "label": "Friday", 
+   "permlevel": 0
+  }, 
+  {
+   "depends_on": "eval:doc.repeat_this_event && doc.repeat_on===\"Every Day\"", 
+   "fieldname": "saturday", 
+   "fieldtype": "Check", 
+   "label": "Saturday", 
+   "permlevel": 0
+  }, 
+  {
+   "depends_on": "eval:doc.repeat_this_event && doc.repeat_on===\"Every Day\"", 
+   "fieldname": "sunday", 
+   "fieldtype": "Check", 
+   "label": "Sunday", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "description", 
+   "fieldtype": "Text Editor", 
+   "in_list_view": 0, 
+   "label": "Description", 
+   "no_copy": 0, 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "print_width": "300px", 
+   "search_index": 0, 
+   "width": "300px"
+  }, 
+  {
+   "fieldname": "participants", 
+   "fieldtype": "Section Break", 
+   "label": "Participants", 
+   "oldfieldtype": "Section Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "individuals", 
+   "fieldtype": "Column Break", 
+   "label": "Individuals", 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
+   "print_width": "50%", 
+   "width": "50%"
+  }, 
+  {
+   "fieldname": "event_individuals", 
+   "fieldtype": "Table", 
+   "label": "Event Individuals", 
+   "no_copy": 0, 
+   "oldfieldname": "event_individuals", 
+   "oldfieldtype": "Table", 
+   "options": "Event User", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "groups", 
+   "fieldtype": "Column Break", 
+   "label": "Groups", 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
+   "print_width": "50%", 
+   "width": "50%"
+  }, 
+  {
+   "fieldname": "event_roles", 
+   "fieldtype": "Table", 
+   "label": "Event Roles", 
+   "no_copy": 0, 
+   "oldfieldname": "event_roles", 
+   "oldfieldtype": "Table", 
+   "options": "Event Role", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "ref_type", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Ref Type", 
+   "no_copy": 0, 
+   "oldfieldname": "ref_type", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "read_only": 1, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "ref_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Ref Name", 
+   "no_copy": 0, 
+   "oldfieldname": "ref_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "read_only": 1, 
+   "search_index": 0
+  }
+ ], 
+ "icon": "icon-calendar", 
+ "idx": 1, 
+ "in_create": 1, 
+ "modified": "2014-01-24 13:00:01", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Event", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "All", 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "read_only": 1, 
+ "title_field": "subject"
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/event_role/event_role.txt b/frappe/core/doctype/event_role/event_role.txt
index 1ef3da2cab..0492af9ff6 100644
--- a/frappe/core/doctype/event_role/event_role.txt
+++ b/frappe/core/doctype/event_role/event_role.txt
@@ -1,40 +1,27 @@
-[
- {
-  "creation": "2013-02-22 01:27:33", 
-  "docstatus": 0, 
-  "modified": "2013-12-20 19:23:12", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "autoname": "__EVR.#####", 
-  "doctype": "DocType", 
-  "istable": 1, 
-  "module": "Core", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "role", 
-  "fieldtype": "Link", 
-  "in_list_view": 1, 
-  "label": "Role", 
-  "name": "__common__", 
-  "oldfieldname": "role", 
-  "oldfieldtype": "Link", 
-  "options": "Role", 
-  "parent": "Event Role", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print_width": "240px", 
-  "width": "240px"
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Event Role"
- }, 
- {
-  "doctype": "DocField"
- }
-]
\ No newline at end of file
+{
+ "autoname": "__EVR.#####", 
+ "creation": "2013-02-22 01:27:33", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "role", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Role", 
+   "oldfieldname": "role", 
+   "oldfieldtype": "Link", 
+   "options": "Role", 
+   "permlevel": 0, 
+   "print_width": "240px", 
+   "width": "240px"
+  }
+ ], 
+ "idx": 1, 
+ "istable": 1, 
+ "modified": "2013-12-20 19:23:12", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Event Role", 
+ "owner": "Administrator"
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/event_user/event_user.txt b/frappe/core/doctype/event_user/event_user.txt
index d69d954284..a3a6d93989 100644
--- a/frappe/core/doctype/event_user/event_user.txt
+++ b/frappe/core/doctype/event_user/event_user.txt
@@ -1,41 +1,28 @@
-[
- {
-  "creation": "2013-02-22 01:27:33", 
-  "docstatus": 0, 
-  "modified": "2013-12-20 19:23:14", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "autoname": "EVP.#####", 
-  "doctype": "DocType", 
-  "istable": 1, 
-  "module": "Core", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "person", 
-  "fieldtype": "Select", 
-  "in_list_view": 1, 
-  "label": "Person", 
-  "name": "__common__", 
-  "oldfieldname": "person", 
-  "oldfieldtype": "Select", 
-  "options": "link:User", 
-  "parent": "Event User", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print_width": "240px", 
-  "search_index": 1, 
-  "width": "240px"
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Event User"
- }, 
- {
-  "doctype": "DocField"
- }
-]
\ No newline at end of file
+{
+ "autoname": "EVP.#####", 
+ "creation": "2013-02-22 01:27:33", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "person", 
+   "fieldtype": "Select", 
+   "in_list_view": 1, 
+   "label": "Person", 
+   "oldfieldname": "person", 
+   "oldfieldtype": "Select", 
+   "options": "link:User", 
+   "permlevel": 0, 
+   "print_width": "240px", 
+   "search_index": 1, 
+   "width": "240px"
+  }
+ ], 
+ "idx": 1, 
+ "istable": 1, 
+ "modified": "2013-12-20 19:23:14", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Event User", 
+ "owner": "Administrator"
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/file_data/file_data.txt b/frappe/core/doctype/file_data/file_data.txt
index e22a6a595e..98defbc51c 100644
--- a/frappe/core/doctype/file_data/file_data.txt
+++ b/frappe/core/doctype/file_data/file_data.txt
@@ -1,87 +1,72 @@
-[
- {
-  "creation": "2012-12-12 11:19:22", 
-  "docstatus": 0, 
-  "modified": "2014-01-20 17:48:46", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "autoname": "File.######", 
-  "doctype": "DocType", 
-  "icon": "icon-file", 
-  "module": "Core", 
-  "name": "__common__", 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "File Data", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "read_only": 1
- }, 
- {
-  "cancel": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "File Data", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "role": "System Manager", 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "File Data"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "file_name", 
-  "fieldtype": "Data", 
-  "label": "File Name", 
-  "oldfieldname": "file_name", 
-  "oldfieldtype": "Data"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "file_url", 
-  "fieldtype": "Data", 
-  "in_list_view": 1, 
-  "label": "File URL"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "attached_to_doctype", 
-  "fieldtype": "Link", 
-  "in_list_view": 1, 
-  "label": "Attached To DocType", 
-  "options": "DocType", 
-  "search_index": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "attached_to_name", 
-  "fieldtype": "Data", 
-  "in_list_view": 1, 
-  "label": "Attached To Name", 
-  "search_index": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "file_size", 
-  "fieldtype": "Int", 
-  "in_list_view": 1, 
-  "label": "File Size"
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "autoname": "File.######", 
+ "creation": "2012-12-12 11:19:22", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "file_name", 
+   "fieldtype": "Data", 
+   "label": "File Name", 
+   "oldfieldname": "file_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "file_url", 
+   "fieldtype": "Data", 
+   "in_list_view": 1, 
+   "label": "File URL", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "attached_to_doctype", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Attached To DocType", 
+   "options": "DocType", 
+   "permlevel": 0, 
+   "read_only": 1, 
+   "search_index": 1
+  }, 
+  {
+   "fieldname": "attached_to_name", 
+   "fieldtype": "Data", 
+   "in_list_view": 1, 
+   "label": "Attached To Name", 
+   "permlevel": 0, 
+   "read_only": 1, 
+   "search_index": 1
+  }, 
+  {
+   "fieldname": "file_size", 
+   "fieldtype": "Int", 
+   "in_list_view": 1, 
+   "label": "File Size", 
+   "permlevel": 0, 
+   "read_only": 1
+  }
+ ], 
+ "icon": "icon-file", 
+ "idx": 1, 
+ "modified": "2014-01-20 17:48:46", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "File Data", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "role": "System Manager", 
+   "write": 1
+  }
+ ], 
+ "read_only": 0
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/letter_head/letter_head.txt b/frappe/core/doctype/letter_head/letter_head.txt
index 1a6e0a7fb6..c6ef3c2241 100644
--- a/frappe/core/doctype/letter_head/letter_head.txt
+++ b/frappe/core/doctype/letter_head/letter_head.txt
@@ -1,95 +1,80 @@
-[
- {
-  "creation": "2012-11-22 17:45:46", 
-  "docstatus": 0, 
-  "modified": "2014-01-20 17:48:56", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_attach": 1, 
-  "autoname": "field:letter_head_name", 
-  "doctype": "DocType", 
-  "icon": "icon-font", 
-  "max_attachments": 3, 
-  "module": "Core", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Letter Head", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Letter Head", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "report": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Letter Head"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "letter_head_name", 
-  "fieldtype": "Data", 
-  "in_filter": 0, 
-  "label": "Letter Head Name", 
-  "oldfieldname": "letter_head_name", 
-  "oldfieldtype": "Data", 
-  "reqd": 1
- }, 
- {
-  "depends_on": "letter_head_name", 
-  "doctype": "DocField", 
-  "fieldname": "disabled", 
-  "fieldtype": "Check", 
-  "label": "Disabled", 
-  "oldfieldname": "disabled", 
-  "oldfieldtype": "Check"
- }, 
- {
-  "depends_on": "letter_head_name", 
-  "description": "Check this to make this the default letter head in all prints", 
-  "doctype": "DocField", 
-  "fieldname": "is_default", 
-  "fieldtype": "Check", 
-  "label": "Is Default", 
-  "oldfieldname": "is_default", 
-  "oldfieldtype": "Check"
- }, 
- {
-  "depends_on": "letter_head_name", 
-  "description": "Letter Head in HTML", 
-  "doctype": "DocField", 
-  "fieldname": "content", 
-  "fieldtype": "Text Editor", 
-  "label": "Content", 
-  "oldfieldname": "content", 
-  "oldfieldtype": "Text Editor"
- }, 
- {
-  "cancel": 0, 
-  "create": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "role": "System Manager", 
-  "submit": 0, 
-  "write": 1
- }, 
- {
-  "delete": 0, 
-  "doctype": "DocPerm", 
-  "role": "All"
- }
-]
\ No newline at end of file
+{
+ "allow_attach": 1, 
+ "autoname": "field:letter_head_name", 
+ "creation": "2012-11-22 17:45:46", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "letter_head_name", 
+   "fieldtype": "Data", 
+   "in_filter": 0, 
+   "label": "Letter Head Name", 
+   "oldfieldname": "letter_head_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "depends_on": "letter_head_name", 
+   "fieldname": "disabled", 
+   "fieldtype": "Check", 
+   "label": "Disabled", 
+   "oldfieldname": "disabled", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0
+  }, 
+  {
+   "depends_on": "letter_head_name", 
+   "description": "Check this to make this the default letter head in all prints", 
+   "fieldname": "is_default", 
+   "fieldtype": "Check", 
+   "label": "Is Default", 
+   "oldfieldname": "is_default", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0
+  }, 
+  {
+   "depends_on": "letter_head_name", 
+   "description": "Letter Head in HTML", 
+   "fieldname": "content", 
+   "fieldtype": "Text Editor", 
+   "label": "Content", 
+   "oldfieldname": "content", 
+   "oldfieldtype": "Text Editor", 
+   "permlevel": 0
+  }
+ ], 
+ "icon": "icon-font", 
+ "idx": 1, 
+ "max_attachments": 3, 
+ "modified": "2014-01-20 17:48:56", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Letter Head", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "delete": 0, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "All"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/module_def/module_def.txt b/frappe/core/doctype/module_def/module_def.txt
index 10bafefbc2..7d5f2d1240 100644
--- a/frappe/core/doctype/module_def/module_def.txt
+++ b/frappe/core/doctype/module_def/module_def.txt
@@ -1,63 +1,48 @@
-[
- {
-  "creation": "2013-01-10 16:34:03", 
-  "docstatus": 0, 
-  "modified": "2014-02-18 15:32:49", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_rename": 1, 
-  "autoname": "field:module_name", 
-  "doctype": "DocType", 
-  "icon": "icon-sitemap", 
-  "module": "Core", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "module_name", 
-  "fieldtype": "Data", 
-  "label": "Module Name", 
-  "name": "__common__", 
-  "oldfieldname": "module_name", 
-  "oldfieldtype": "Data", 
-  "parent": "Module Def", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "create": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "name": "__common__", 
-  "parent": "Module Def", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "read": 1, 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Module Def"
- }, 
- {
-  "doctype": "DocField"
- }, 
- {
-  "amend": 0, 
-  "cancel": 0, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "print": 1, 
-  "report": 1, 
-  "role": "Administrator", 
-  "submit": 0
- }, 
- {
-  "doctype": "DocPerm", 
-  "role": "System Manager"
- }
-]
\ No newline at end of file
+{
+ "allow_rename": 1, 
+ "autoname": "field:module_name", 
+ "creation": "2013-01-10 16:34:03", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "module_name", 
+   "fieldtype": "Data", 
+   "label": "Module Name", 
+   "oldfieldname": "module_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0
+  }
+ ], 
+ "icon": "icon-sitemap", 
+ "idx": 1, 
+ "modified": "2014-02-18 15:32:49", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Module Def", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Administrator", 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "create": 1, 
+   "delete": 1, 
+   "permlevel": 0, 
+   "read": 1, 
+   "role": "System Manager", 
+   "write": 1
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/notification_count/notification_count.txt b/frappe/core/doctype/notification_count/notification_count.txt
index 9042721822..5119ebc452 100644
--- a/frappe/core/doctype/notification_count/notification_count.txt
+++ b/frappe/core/doctype/notification_count/notification_count.txt
@@ -1,46 +1,33 @@
-[
- {
-  "creation": "2013-11-18 05:31:03", 
-  "docstatus": 0, 
-  "modified": "2013-12-20 19:24:14", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "doctype": "DocType", 
-  "document_type": "Other", 
-  "module": "Core", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Notification Count", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Notification Count"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "for_doctype", 
-  "fieldtype": "Data", 
-  "label": "For DocType", 
-  "search_index": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "count", 
-  "fieldtype": "Int", 
-  "label": "Count"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "open_count", 
-  "fieldtype": "Int", 
-  "label": "Open Count"
- }
-]
\ No newline at end of file
+{
+ "creation": "2013-11-18 05:31:03", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Other", 
+ "fields": [
+  {
+   "fieldname": "for_doctype", 
+   "fieldtype": "Data", 
+   "label": "For DocType", 
+   "permlevel": 0, 
+   "search_index": 1
+  }, 
+  {
+   "fieldname": "count", 
+   "fieldtype": "Int", 
+   "label": "Count", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "open_count", 
+   "fieldtype": "Int", 
+   "label": "Open Count", 
+   "permlevel": 0
+  }
+ ], 
+ "idx": 1, 
+ "modified": "2013-12-20 19:24:14", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Notification Count", 
+ "owner": "Administrator"
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/outgoing_email_settings/outgoing_email_settings.txt b/frappe/core/doctype/outgoing_email_settings/outgoing_email_settings.txt
index c50616c786..34c833db9f 100644
--- a/frappe/core/doctype/outgoing_email_settings/outgoing_email_settings.txt
+++ b/frappe/core/doctype/outgoing_email_settings/outgoing_email_settings.txt
@@ -1,107 +1,88 @@
-[
- {
-  "creation": "2014-03-03 19:48:01", 
-  "docstatus": 0, 
-  "modified": "2014-03-03 20:20:09", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_copy": 1, 
-  "description": "Email Settings for Outgoing and Incoming Emails.", 
-  "doctype": "DocType", 
-  "icon": "icon-cog", 
-  "in_create": 1, 
-  "issingle": 1, 
-  "module": "Core", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Outgoing Email Settings", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "name": "__common__", 
-  "parent": "Outgoing Email Settings", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "read": 1, 
-  "role": "System Manager", 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Outgoing Email Settings"
- }, 
- {
-  "description": "SMTP Server (e.g. smtp.gmail.com)", 
-  "doctype": "DocField", 
-  "fieldname": "mail_server", 
-  "fieldtype": "Data", 
-  "label": "Outgoing Mail Server"
- }, 
- {
-  "description": "<a href=\"https://en.wikipedia.org/wiki/Transport_Layer_Security\" target=\"_blank\">[?]</a>", 
-  "doctype": "DocField", 
-  "fieldname": "use_ssl", 
-  "fieldtype": "Check", 
-  "label": "Use TLS"
- }, 
- {
-  "description": "If non standard port (e.g. 587)", 
-  "doctype": "DocField", 
-  "fieldname": "mail_port", 
-  "fieldtype": "Int", 
-  "label": "Port"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "cb0", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "description": "Set Login and Password if authentication is required.", 
-  "doctype": "DocField", 
-  "fieldname": "mail_login", 
-  "fieldtype": "Data", 
-  "label": "Login Id"
- }, 
- {
-  "description": "Check this if you want to send emails as this id only (in case of restriction by your email provider).", 
-  "doctype": "DocField", 
-  "fieldname": "always_use_login_id_as_sender", 
-  "fieldtype": "Check", 
-  "label": "Always use above Login Id as sender"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "mail_password", 
-  "fieldtype": "Password", 
-  "label": "Mail Password"
- }, 
- {
-  "description": "System generated mails will be sent from this email id.", 
-  "doctype": "DocField", 
-  "fieldname": "auto_email_id", 
-  "fieldtype": "Data", 
-  "label": "Auto Email Id"
- }, 
- {
-  "default": "1", 
-  "description": "If checked, an email with an attached HTML format will be added to part of the EMail body as well as attachment. To only send as attachment, uncheck this.", 
-  "doctype": "DocField", 
-  "fieldname": "send_print_in_body_and_attachment", 
-  "fieldtype": "Check", 
-  "label": "Send Print in Body and Attachment"
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "allow_copy": 1, 
+ "creation": "2014-03-03 19:48:01", 
+ "description": "Email Settings for Outgoing and Incoming Emails.", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "description": "SMTP Server (e.g. smtp.gmail.com)", 
+   "fieldname": "mail_server", 
+   "fieldtype": "Data", 
+   "label": "Outgoing Mail Server", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "<a href=\"https://en.wikipedia.org/wiki/Transport_Layer_Security\" target=\"_blank\">[?]</a>", 
+   "fieldname": "use_ssl", 
+   "fieldtype": "Check", 
+   "label": "Use TLS", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "If non standard port (e.g. 587)", 
+   "fieldname": "mail_port", 
+   "fieldtype": "Int", 
+   "label": "Port", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "cb0", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Set Login and Password if authentication is required.", 
+   "fieldname": "mail_login", 
+   "fieldtype": "Data", 
+   "label": "Login Id", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Check this if you want to send emails as this id only (in case of restriction by your email provider).", 
+   "fieldname": "always_use_login_id_as_sender", 
+   "fieldtype": "Check", 
+   "label": "Always use above Login Id as sender", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "mail_password", 
+   "fieldtype": "Password", 
+   "label": "Mail Password", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "System generated mails will be sent from this email id.", 
+   "fieldname": "auto_email_id", 
+   "fieldtype": "Data", 
+   "label": "Auto Email Id", 
+   "permlevel": 0
+  }, 
+  {
+   "default": "1", 
+   "description": "If checked, an email with an attached HTML format will be added to part of the EMail body as well as attachment. To only send as attachment, uncheck this.", 
+   "fieldname": "send_print_in_body_and_attachment", 
+   "fieldtype": "Check", 
+   "label": "Send Print in Body and Attachment", 
+   "permlevel": 0
+  }
+ ], 
+ "icon": "icon-cog", 
+ "idx": 1, 
+ "in_create": 1, 
+ "issingle": 1, 
+ "modified": "2014-03-03 20:20:09", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Outgoing Email Settings", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "create": 1, 
+   "permlevel": 0, 
+   "read": 1, 
+   "role": "System Manager", 
+   "write": 1
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/page/page.txt b/frappe/core/doctype/page/page.txt
index 812c69050c..5f15c7cd62 100644
--- a/frappe/core/doctype/page/page.txt
+++ b/frappe/core/doctype/page/page.txt
@@ -1,129 +1,113 @@
-[
- {
-  "creation": "2012-12-20 17:16:49", 
-  "docstatus": 0, 
-  "modified": "2013-12-30 13:48:02", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_copy": 0, 
-  "allow_rename": 1, 
-  "autoname": "field:page_name", 
-  "doctype": "DocType", 
-  "hide_heading": 0, 
-  "hide_toolbar": 0, 
-  "icon": "icon-file", 
-  "issingle": 0, 
-  "istable": 0, 
-  "module": "Core", 
-  "name": "__common__", 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Page", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Page", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Page"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "page_html", 
-  "fieldtype": "Section Break", 
-  "label": "Page HTML", 
-  "oldfieldtype": "Section Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "page_name", 
-  "fieldtype": "Data", 
-  "label": "Page Name", 
-  "oldfieldname": "page_name", 
-  "oldfieldtype": "Data", 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "title", 
-  "fieldtype": "Data", 
-  "label": "Title"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "icon", 
-  "fieldtype": "Data", 
-  "label": "icon"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break0", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "module", 
-  "fieldtype": "Link", 
-  "label": "Module", 
-  "oldfieldname": "module", 
-  "oldfieldtype": "Select", 
-  "options": "Module Def", 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "standard", 
-  "fieldtype": "Select", 
-  "label": "Standard", 
-  "oldfieldname": "standard", 
-  "oldfieldtype": "Select", 
-  "options": "\nYes\nNo", 
-  "reqd": 1, 
-  "search_index": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "section_break0", 
-  "fieldtype": "Section Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "roles", 
-  "fieldtype": "Table", 
-  "hidden": 0, 
-  "label": "Roles", 
-  "oldfieldname": "roles", 
-  "oldfieldtype": "Table", 
-  "options": "Page Role", 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "cancel": 0, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "role": "Administrator", 
-  "submit": 0, 
-  "write": 1
- }, 
- {
-  "doctype": "DocPerm", 
-  "role": "All"
- }
-]
\ No newline at end of file
+{
+ "allow_copy": 0, 
+ "allow_rename": 1, 
+ "autoname": "field:page_name", 
+ "creation": "2012-12-20 17:16:49", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "page_html", 
+   "fieldtype": "Section Break", 
+   "label": "Page HTML", 
+   "oldfieldtype": "Section Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "page_name", 
+   "fieldtype": "Data", 
+   "label": "Page Name", 
+   "oldfieldname": "page_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "title", 
+   "fieldtype": "Data", 
+   "label": "Title", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "icon", 
+   "fieldtype": "Data", 
+   "label": "icon", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "column_break0", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "module", 
+   "fieldtype": "Link", 
+   "label": "Module", 
+   "oldfieldname": "module", 
+   "oldfieldtype": "Select", 
+   "options": "Module Def", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "standard", 
+   "fieldtype": "Select", 
+   "label": "Standard", 
+   "oldfieldname": "standard", 
+   "oldfieldtype": "Select", 
+   "options": "\nYes\nNo", 
+   "permlevel": 0, 
+   "reqd": 1, 
+   "search_index": 1
+  }, 
+  {
+   "fieldname": "section_break0", 
+   "fieldtype": "Section Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "roles", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "label": "Roles", 
+   "oldfieldname": "roles", 
+   "oldfieldtype": "Table", 
+   "options": "Page Role", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "icon-file", 
+ "idx": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "modified": "2013-12-30 13:48:02", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Page", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "role": "Administrator", 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "role": "All"
+  }
+ ], 
+ "read_only": 0
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/page_role/page_role.txt b/frappe/core/doctype/page_role/page_role.txt
index 266e8d5136..7530a05a63 100644
--- a/frappe/core/doctype/page_role/page_role.txt
+++ b/frappe/core/doctype/page_role/page_role.txt
@@ -1,46 +1,33 @@
-[
- {
-  "creation": "2013-02-22 01:27:34", 
-  "docstatus": 0, 
-  "modified": "2013-12-20 19:23:24", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_copy": 0, 
-  "autoname": "PR.######", 
-  "doctype": "DocType", 
-  "hide_heading": 0, 
-  "hide_toolbar": 0, 
-  "issingle": 0, 
-  "istable": 1, 
-  "module": "Core", 
-  "name": "__common__", 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "role", 
-  "fieldtype": "Link", 
-  "hidden": 0, 
-  "in_list_view": 1, 
-  "label": "Role", 
-  "name": "__common__", 
-  "oldfieldname": "role", 
-  "oldfieldtype": "Link", 
-  "options": "Role", 
-  "parent": "Page Role", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Page Role"
- }, 
- {
-  "doctype": "DocField"
- }
-]
\ No newline at end of file
+{
+ "allow_copy": 0, 
+ "autoname": "PR.######", 
+ "creation": "2013-02-22 01:27:34", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "role", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "in_list_view": 1, 
+   "label": "Role", 
+   "oldfieldname": "role", 
+   "oldfieldtype": "Link", 
+   "options": "Role", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 1, 
+ "issingle": 0, 
+ "istable": 1, 
+ "modified": "2013-12-20 19:23:24", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Page Role", 
+ "owner": "Administrator", 
+ "read_only": 0
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/patch_log/patch_log.txt b/frappe/core/doctype/patch_log/patch_log.txt
index dd774d7de4..02daad6004 100644
--- a/frappe/core/doctype/patch_log/patch_log.txt
+++ b/frappe/core/doctype/patch_log/patch_log.txt
@@ -1,52 +1,33 @@
-[
- {
-  "creation": "2013-01-17 11:36:45", 
-  "docstatus": 0, 
-  "modified": "2013-12-20 19:24:15", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "autoname": "PATCHLOG.#####", 
-  "description": "List of patches executed", 
-  "doctype": "DocType", 
-  "document_type": "System", 
-  "icon": "icon-cog", 
-  "module": "Core", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "patch", 
-  "fieldtype": "Data", 
-  "label": "Patch", 
-  "name": "__common__", 
-  "parent": "Patch Log", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Patch Log", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "report": 1, 
-  "role": "Administrator"
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Patch Log"
- }, 
- {
-  "doctype": "DocField"
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "autoname": "PATCHLOG.#####", 
+ "creation": "2013-01-17 11:36:45", 
+ "description": "List of patches executed", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "System", 
+ "fields": [
+  {
+   "fieldname": "patch", 
+   "fieldtype": "Data", 
+   "label": "Patch", 
+   "permlevel": 0
+  }
+ ], 
+ "icon": "icon-cog", 
+ "idx": 1, 
+ "modified": "2013-12-20 19:24:15", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Patch Log", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Administrator"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/print_format/print_format.txt b/frappe/core/doctype/print_format/print_format.txt
index 7ec7470066..9b1de73b42 100644
--- a/frappe/core/doctype/print_format/print_format.txt
+++ b/frappe/core/doctype/print_format/print_format.txt
@@ -1,175 +1,162 @@
-[
- {
-  "creation": "2013-01-23 19:54:43", 
-  "docstatus": 0, 
-  "modified": "2014-01-20 17:49:00", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_attach": 0, 
-  "allow_copy": 0, 
-  "allow_rename": 0, 
-  "autoname": "Prompt", 
-  "doctype": "DocType", 
-  "hide_heading": 0, 
-  "hide_toolbar": 0, 
-  "icon": "icon-print", 
-  "in_create": 0, 
-  "in_dialog": 0, 
-  "issingle": 0, 
-  "istable": 0, 
-  "max_attachments": 0, 
-  "module": "Core", 
-  "name": "__common__", 
-  "read_only": 0, 
-  "read_only_onload": 0
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Print Format", 
-  "parentfield": "fields", 
-  "parenttype": "DocType"
- }, 
- {
-  "amend": 0, 
-  "cancel": 0, 
-  "doctype": "DocPerm", 
-  "name": "__common__", 
-  "parent": "Print Format", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "read": 1, 
-  "report": 1, 
-  "submit": 0
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Print Format"
- }, 
- {
-  "allow_on_submit": 0, 
-  "doctype": "DocField", 
-  "fieldname": "module", 
-  "fieldtype": "Select", 
-  "hidden": 0, 
-  "in_filter": 1, 
-  "label": "Module", 
-  "no_copy": 0, 
-  "oldfieldname": "module", 
-  "oldfieldtype": "Select", 
-  "options": "link:Module Def", 
-  "permlevel": 0, 
-  "print_hide": 0, 
-  "report_hide": 0, 
-  "reqd": 1, 
-  "search_index": 1
- }, 
- {
-  "description": "Belongs to", 
-  "doctype": "DocField", 
-  "fieldname": "doc_type", 
-  "fieldtype": "Select", 
-  "in_filter": 1, 
-  "label": "DocType", 
-  "options": "link:DocType", 
-  "permlevel": 0, 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break_3", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
- }, 
- {
-  "allow_on_submit": 0, 
-  "default": "No", 
-  "doctype": "DocField", 
-  "fieldname": "standard", 
-  "fieldtype": "Select", 
-  "hidden": 0, 
-  "in_filter": 1, 
-  "label": "Standard", 
-  "no_copy": 1, 
-  "oldfieldname": "standard", 
-  "oldfieldtype": "Select", 
-  "options": "No\nYes", 
-  "permlevel": 1, 
-  "print_hide": 0, 
-  "read_only": 0, 
-  "report_hide": 0, 
-  "reqd": 1, 
-  "search_index": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "print_format_type", 
-  "fieldtype": "Select", 
-  "label": "Print Format Type", 
-  "options": "Client\nServer", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "section_break_6", 
-  "fieldtype": "Section Break", 
-  "permlevel": 0
- }, 
- {
-  "allow_on_submit": 0, 
-  "depends_on": "eval:doc.print_format_type!=\"Server\"", 
-  "doctype": "DocField", 
-  "fieldname": "html", 
-  "fieldtype": "Code", 
-  "hidden": 0, 
-  "in_filter": 0, 
-  "label": "HTML", 
-  "no_copy": 0, 
-  "oldfieldname": "html", 
-  "oldfieldtype": "Text Editor", 
-  "options": "HTML", 
-  "permlevel": 0, 
-  "print_hide": 0, 
-  "report_hide": 0, 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "create": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "permlevel": 0, 
-  "print": 1, 
-  "role": "Administrator", 
-  "write": 1
- }, 
- {
-  "create": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "permlevel": 0, 
-  "print": 1, 
-  "role": "System Manager", 
-  "write": 1
- }, 
- {
-  "create": 0, 
-  "delete": 0, 
-  "doctype": "DocPerm", 
-  "permlevel": 1, 
-  "role": "System Manager"
- }, 
- {
-  "create": 0, 
-  "delete": 0, 
-  "doctype": "DocPerm", 
-  "permlevel": 1, 
-  "role": "Administrator", 
-  "write": 1
- }
-]
\ No newline at end of file
+{
+ "allow_attach": 0, 
+ "allow_copy": 0, 
+ "allow_rename": 0, 
+ "autoname": "Prompt", 
+ "creation": "2013-01-23 19:54:43", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "fieldname": "module", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "in_filter": 1, 
+   "label": "Module", 
+   "no_copy": 0, 
+   "oldfieldname": "module", 
+   "oldfieldtype": "Select", 
+   "options": "link:Module Def", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 1
+  }, 
+  {
+   "description": "Belongs to", 
+   "fieldname": "doc_type", 
+   "fieldtype": "Select", 
+   "in_filter": 1, 
+   "label": "DocType", 
+   "options": "link:DocType", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "default": "No", 
+   "fieldname": "standard", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "in_filter": 1, 
+   "label": "Standard", 
+   "no_copy": 1, 
+   "oldfieldname": "standard", 
+   "oldfieldtype": "Select", 
+   "options": "No\nYes", 
+   "permlevel": 1, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 1
+  }, 
+  {
+   "fieldname": "print_format_type", 
+   "fieldtype": "Select", 
+   "label": "Print Format Type", 
+   "options": "Client\nServer", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "permlevel": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "depends_on": "eval:doc.print_format_type!=\"Server\"", 
+   "fieldname": "html", 
+   "fieldtype": "Code", 
+   "hidden": 0, 
+   "in_filter": 0, 
+   "label": "HTML", 
+   "no_copy": 0, 
+   "oldfieldname": "html", 
+   "oldfieldtype": "Text Editor", 
+   "options": "HTML", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "icon-print", 
+ "idx": 1, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2014-01-20 17:49:00", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Print Format", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Administrator", 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "permlevel": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "submit": 0
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "permlevel": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Administrator", 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "read_only": 0, 
+ "read_only_onload": 0
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/property_setter/property_setter.txt b/frappe/core/doctype/property_setter/property_setter.txt
index 305e574690..66f4650d4b 100644
--- a/frappe/core/doctype/property_setter/property_setter.txt
+++ b/frappe/core/doctype/property_setter/property_setter.txt
@@ -1,130 +1,120 @@
-[
- {
-  "creation": "2013-01-10 16:34:04", 
-  "docstatus": 0, 
-  "modified": "2014-01-20 17:49:03", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "description": "Property Setter overrides a standard DocType or Field property", 
-  "doctype": "DocType", 
-  "icon": "icon-glass", 
-  "module": "Core", 
-  "name": "__common__", 
-  "search_fields": "doc_name,property"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Property Setter", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "cancel": 0, 
-  "create": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Property Setter", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "report": 1, 
-  "submit": 0, 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Property Setter"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "help", 
-  "fieldtype": "HTML", 
-  "label": "Help", 
-  "options": "<div class=\"alert\">Please don't update it as it can mess up your form. Use the Customize Form View and Custom Fields to set properties!</div>"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "sb0", 
-  "fieldtype": "Section Break"
- }, 
- {
-  "depends_on": "eval:doc.__islocal", 
-  "doctype": "DocField", 
-  "fieldname": "doctype_or_field", 
-  "fieldtype": "Select", 
-  "label": "DocType or Field", 
-  "options": "\nDocField\nDocType", 
-  "reqd": 1
- }, 
- {
-  "description": "New value to be set", 
-  "doctype": "DocField", 
-  "fieldname": "value", 
-  "fieldtype": "Text", 
-  "label": "Set Value"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break0", 
-  "fieldtype": "Column Break", 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "doc_type", 
-  "fieldtype": "Link", 
-  "in_filter": 0, 
-  "label": "DocType", 
-  "options": "DocType", 
-  "reqd": 0, 
-  "search_index": 1
- }, 
- {
-  "depends_on": "eval:doc.doctype_or_field=='DocField'", 
-  "description": "ID (name) of the entity whose property is to be set", 
-  "doctype": "DocField", 
-  "fieldname": "field_name", 
-  "fieldtype": "Data", 
-  "in_filter": 0, 
-  "label": "Field Name", 
-  "reqd": 0, 
-  "search_index": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "property", 
-  "fieldtype": "Data", 
-  "in_filter": 0, 
-  "label": "Property", 
-  "reqd": 1, 
-  "search_index": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "property_type", 
-  "fieldtype": "Data", 
-  "label": "Property Type"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "default_value", 
-  "fieldtype": "Data", 
-  "label": "Default Value"
- }, 
- {
-  "doctype": "DocPerm", 
-  "role": "Administrator"
- }, 
- {
-  "doctype": "DocPerm", 
-  "role": "System Manager"
- }
-]
\ No newline at end of file
+{
+ "creation": "2013-01-10 16:34:04", 
+ "description": "Property Setter overrides a standard DocType or Field property", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "help", 
+   "fieldtype": "HTML", 
+   "label": "Help", 
+   "options": "<div class=\"alert\">Please don't update it as it can mess up your form. Use the Customize Form View and Custom Fields to set properties!</div>", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "sb0", 
+   "fieldtype": "Section Break", 
+   "permlevel": 0
+  }, 
+  {
+   "depends_on": "eval:doc.__islocal", 
+   "fieldname": "doctype_or_field", 
+   "fieldtype": "Select", 
+   "label": "DocType or Field", 
+   "options": "\nDocField\nDocType", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "description": "New value to be set", 
+   "fieldname": "value", 
+   "fieldtype": "Text", 
+   "label": "Set Value", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "column_break0", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "doc_type", 
+   "fieldtype": "Link", 
+   "in_filter": 0, 
+   "label": "DocType", 
+   "options": "DocType", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 1
+  }, 
+  {
+   "depends_on": "eval:doc.doctype_or_field=='DocField'", 
+   "description": "ID (name) of the entity whose property is to be set", 
+   "fieldname": "field_name", 
+   "fieldtype": "Data", 
+   "in_filter": 0, 
+   "label": "Field Name", 
+   "permlevel": 0, 
+   "reqd": 0, 
+   "search_index": 1
+  }, 
+  {
+   "fieldname": "property", 
+   "fieldtype": "Data", 
+   "in_filter": 0, 
+   "label": "Property", 
+   "permlevel": 0, 
+   "reqd": 1, 
+   "search_index": 1
+  }, 
+  {
+   "fieldname": "property_type", 
+   "fieldtype": "Data", 
+   "label": "Property Type", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "default_value", 
+   "fieldtype": "Data", 
+   "label": "Default Value", 
+   "permlevel": 0
+  }
+ ], 
+ "icon": "icon-glass", 
+ "idx": 1, 
+ "modified": "2014-01-20 17:49:03", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Property Setter", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Administrator", 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "search_fields": "doc_name,property"
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/report/report.txt b/frappe/core/doctype/report/report.txt
index 75051dcbb0..04bce5a232 100644
--- a/frappe/core/doctype/report/report.txt
+++ b/frappe/core/doctype/report/report.txt
@@ -1,162 +1,161 @@
-[
- {
-  "creation": "2013-03-09 15:45:57", 
-  "docstatus": 0, 
-  "modified": "2014-03-07 15:20:02", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "autoname": "field:report_name", 
-  "doctype": "DocType", 
-  "document_type": "System", 
-  "icon": "icon-table", 
-  "module": "Core", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Report", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "cancel": 0, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Report", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "report": 1, 
-  "submit": 0
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Report"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "report_name", 
-  "fieldtype": "Data", 
-  "label": "Report Name", 
-  "read_only": 0, 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "ref_doctype", 
-  "fieldtype": "Link", 
-  "in_list_view": 1, 
-  "label": "Ref DocType", 
-  "options": "DocType", 
-  "read_only": 0, 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "is_standard", 
-  "fieldtype": "Select", 
-  "in_list_view": 1, 
-  "label": "Is Standard", 
-  "options": "No\nYes", 
-  "read_only": 0, 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "add_total_row", 
-  "fieldtype": "Check", 
-  "label": "Add Total Row"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break_4", 
-  "fieldtype": "Column Break", 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "report_type", 
-  "fieldtype": "Select", 
-  "label": "Report Type", 
-  "options": "Report Builder\nQuery Report\nScript Report", 
-  "read_only": 0, 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "disabled", 
-  "fieldtype": "Check", 
-  "label": "Disabled", 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "section_break_6", 
-  "fieldtype": "Section Break", 
-  "read_only": 0
- }, 
- {
-  "depends_on": "eval:doc.report_type==\"Query Report\"", 
-  "doctype": "DocField", 
-  "fieldname": "query", 
-  "fieldtype": "Code", 
-  "label": "Query", 
-  "read_only": 0
- }, 
- {
-  "depends_on": "eval:doc.report_type==\"Query Report\"", 
-  "description": "JavaScript Format: frappe.query_reports['REPORTNAME'] = {}", 
-  "doctype": "DocField", 
-  "fieldname": "javascript", 
-  "fieldtype": "Code", 
-  "label": "Javascript"
- }, 
- {
-  "depends_on": "eval:doc.report_type==\"Report Builder\"", 
-  "doctype": "DocField", 
-  "fieldname": "json", 
-  "fieldtype": "Text", 
-  "label": "JSON", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "module", 
-  "fieldtype": "Link", 
-  "label": "Module", 
-  "options": "Module Def"
- }, 
- {
-  "create": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "role": "Administrator", 
-  "write": 1
- }, 
- {
-  "create": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "role": "System Manager", 
-  "write": 1
- }, 
- {
-  "create": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "role": "Report Manager", 
-  "write": 1
- }, 
- {
-  "delete": 0, 
-  "doctype": "DocPerm", 
-  "role": "All"
- }
-]
\ No newline at end of file
+{
+ "autoname": "field:report_name", 
+ "creation": "2013-03-09 15:45:57", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "System", 
+ "fields": [
+  {
+   "fieldname": "report_name", 
+   "fieldtype": "Data", 
+   "label": "Report Name", 
+   "permlevel": 0, 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "ref_doctype", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Ref DocType", 
+   "options": "DocType", 
+   "permlevel": 0, 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "is_standard", 
+   "fieldtype": "Select", 
+   "in_list_view": 1, 
+   "label": "Is Standard", 
+   "options": "No\nYes", 
+   "permlevel": 0, 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "add_total_row", 
+   "fieldtype": "Check", 
+   "label": "Add Total Row", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
+  {
+   "fieldname": "report_type", 
+   "fieldtype": "Select", 
+   "label": "Report Type", 
+   "options": "Report Builder\nQuery Report\nScript Report", 
+   "permlevel": 0, 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "disabled", 
+   "fieldtype": "Check", 
+   "label": "Disabled", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
+  {
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
+  {
+   "depends_on": "eval:doc.report_type==\"Query Report\"", 
+   "fieldname": "query", 
+   "fieldtype": "Code", 
+   "label": "Query", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
+  {
+   "depends_on": "eval:doc.report_type==\"Query Report\"", 
+   "description": "JavaScript Format: frappe.query_reports['REPORTNAME'] = {}", 
+   "fieldname": "javascript", 
+   "fieldtype": "Code", 
+   "label": "Javascript", 
+   "permlevel": 0
+  }, 
+  {
+   "depends_on": "eval:doc.report_type==\"Report Builder\"", 
+   "fieldname": "json", 
+   "fieldtype": "Text", 
+   "label": "JSON", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "module", 
+   "fieldtype": "Link", 
+   "label": "Module", 
+   "options": "Module Def", 
+   "permlevel": 0
+  }
+ ], 
+ "icon": "icon-table", 
+ "idx": 1, 
+ "modified": "2014-03-07 15:20:02", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Report", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Administrator", 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Report Manager", 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "cancel": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "All", 
+   "submit": 0
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/role/role.txt b/frappe/core/doctype/role/role.txt
index 57915c2fdd..0654a92c30 100644
--- a/frappe/core/doctype/role/role.txt
+++ b/frappe/core/doctype/role/role.txt
@@ -1,69 +1,58 @@
-[
- {
-  "creation": "2013-01-08 15:50:01", 
-  "docstatus": 0, 
-  "modified": "2013-12-20 19:24:27", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_copy": 0, 
-  "allow_rename": 1, 
-  "autoname": "field:role_name", 
-  "doctype": "DocType", 
-  "hide_heading": 0, 
-  "hide_toolbar": 0, 
-  "icon": "icon-bookmark", 
-  "issingle": 0, 
-  "istable": 0, 
-  "module": "Core", 
-  "name": "__common__", 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "role_name", 
-  "fieldtype": "Data", 
-  "label": "Role Name", 
-  "name": "__common__", 
-  "oldfieldname": "role_name", 
-  "oldfieldtype": "Data", 
-  "parent": "Role", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "reqd": 1
- }, 
- {
-  "cancel": 0, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Role", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "report": 1, 
-  "submit": 0, 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Role"
- }, 
- {
-  "doctype": "DocField"
- }, 
- {
-  "amend": 0, 
-  "doctype": "DocPerm", 
-  "role": "System Manager"
- }, 
- {
-  "doctype": "DocPerm", 
-  "role": "Administrator"
- }
-]
\ No newline at end of file
+{
+ "allow_copy": 0, 
+ "allow_rename": 1, 
+ "autoname": "field:role_name", 
+ "creation": "2013-01-08 15:50:01", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "role_name", 
+   "fieldtype": "Data", 
+   "label": "Role Name", 
+   "oldfieldname": "role_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "reqd": 1
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "icon-bookmark", 
+ "idx": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "modified": "2013-12-20 19:24:27", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Role", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Administrator", 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "read_only": 0
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/scheduler_log/scheduler_log.txt b/frappe/core/doctype/scheduler_log/scheduler_log.txt
index 2be5cd2c24..111b25a496 100644
--- a/frappe/core/doctype/scheduler_log/scheduler_log.txt
+++ b/frappe/core/doctype/scheduler_log/scheduler_log.txt
@@ -1,64 +1,45 @@
-[
- {
-  "creation": "2013-01-16 13:09:40", 
-  "docstatus": 0, 
-  "modified": "2014-01-20 17:49:26", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "autoname": "SCHLOG.#####", 
-  "description": "Log of Scheduler Errors", 
-  "doctype": "DocType", 
-  "document_type": "System", 
-  "icon": "icon-warning-sign", 
-  "module": "Core", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Scheduler Log", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "cancel": 0, 
-  "create": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Scheduler Log", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "report": 1, 
-  "role": "System Manager", 
-  "submit": 0, 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Scheduler Log"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "method", 
-  "fieldtype": "Data", 
-  "in_list_view": 1, 
-  "label": "Method"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "error", 
-  "fieldtype": "Text", 
-  "label": "Error"
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "autoname": "SCHLOG.#####", 
+ "creation": "2013-01-16 13:09:40", 
+ "description": "Log of Scheduler Errors", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "System", 
+ "fields": [
+  {
+   "fieldname": "method", 
+   "fieldtype": "Data", 
+   "in_list_view": 1, 
+   "label": "Method", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "error", 
+   "fieldtype": "Text", 
+   "label": "Error", 
+   "permlevel": 0
+  }
+ ], 
+ "icon": "icon-warning-sign", 
+ "idx": 1, 
+ "modified": "2014-01-20 17:49:26", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Scheduler Log", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "submit": 0, 
+   "write": 1
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/social_login_keys/social_login_keys.txt b/frappe/core/doctype/social_login_keys/social_login_keys.txt
index cffedba804..57c7e493b3 100644
--- a/frappe/core/doctype/social_login_keys/social_login_keys.txt
+++ b/frappe/core/doctype/social_login_keys/social_login_keys.txt
@@ -1,98 +1,79 @@
-[
- {
-  "creation": "2014-03-04 08:29:52", 
-  "docstatus": 0, 
-  "modified": "2014-03-04 08:47:32", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "doctype": "DocType", 
-  "document_type": "System", 
-  "icon": "icon-signin", 
-  "issingle": 1, 
-  "module": "Core", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Social Login Keys", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "name": "__common__", 
-  "parent": "Social Login Keys", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "read": 1, 
-  "role": "System Manager", 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Social Login Keys"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "facebook", 
-  "fieldtype": "Section Break", 
-  "label": "Facebook"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "facebook_client_id", 
-  "fieldtype": "Data", 
-  "label": "Facebook Client ID"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "facebook_client_secret", 
-  "fieldtype": "Data", 
-  "label": "Facebook Client Secret"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "google", 
-  "fieldtype": "Section Break", 
-  "label": "Google"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "google_client_id", 
-  "fieldtype": "Data", 
-  "label": "Google Client ID"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "google_client_secret", 
-  "fieldtype": "Data", 
-  "label": "Google Client Secret"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "github", 
-  "fieldtype": "Section Break", 
-  "label": "GitHub"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "github_client_id", 
-  "fieldtype": "Data", 
-  "label": "GitHub Client ID"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "github_client_secret", 
-  "fieldtype": "Data", 
-  "label": "GitHub Client Secret"
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "creation": "2014-03-04 08:29:52", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "System", 
+ "fields": [
+  {
+   "fieldname": "facebook", 
+   "fieldtype": "Section Break", 
+   "label": "Facebook", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "facebook_client_id", 
+   "fieldtype": "Data", 
+   "label": "Facebook Client ID", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "facebook_client_secret", 
+   "fieldtype": "Data", 
+   "label": "Facebook Client Secret", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "google", 
+   "fieldtype": "Section Break", 
+   "label": "Google", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "google_client_id", 
+   "fieldtype": "Data", 
+   "label": "Google Client ID", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "google_client_secret", 
+   "fieldtype": "Data", 
+   "label": "Google Client Secret", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "github", 
+   "fieldtype": "Section Break", 
+   "label": "GitHub", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "github_client_id", 
+   "fieldtype": "Data", 
+   "label": "GitHub Client ID", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "github_client_secret", 
+   "fieldtype": "Data", 
+   "label": "GitHub Client Secret", 
+   "permlevel": 0
+  }
+ ], 
+ "icon": "icon-signin", 
+ "idx": 1, 
+ "issingle": 1, 
+ "modified": "2014-03-04 08:47:32", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Social Login Keys", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "create": 1, 
+   "permlevel": 0, 
+   "read": 1, 
+   "role": "System Manager", 
+   "write": 1
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/tag/tag.txt b/frappe/core/doctype/tag/tag.txt
index a342874d9c..13c7629f32 100644
--- a/frappe/core/doctype/tag/tag.txt
+++ b/frappe/core/doctype/tag/tag.txt
@@ -1,54 +1,35 @@
-[
- {
-  "creation": "2012-07-09 11:17:17", 
-  "docstatus": 0, 
-  "modified": "2013-12-20 19:24:38", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "autoname": "field:tag_name", 
-  "doctype": "DocType", 
-  "icon": "icon-tag", 
-  "module": "Core", 
-  "name": "__common__", 
-  "name_case": "Title Case"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "tag_name", 
-  "fieldtype": "Data", 
-  "label": "Tag Name", 
-  "name": "__common__", 
-  "oldfieldname": "tag_name", 
-  "oldfieldtype": "Data", 
-  "parent": "Tag", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Tag", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "role": "System Manager", 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Tag"
- }, 
- {
-  "doctype": "DocField"
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "autoname": "field:tag_name", 
+ "creation": "2012-07-09 11:17:17", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "tag_name", 
+   "fieldtype": "Data", 
+   "label": "Tag Name", 
+   "oldfieldname": "tag_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0
+  }
+ ], 
+ "icon": "icon-tag", 
+ "idx": 1, 
+ "modified": "2013-12-20 19:24:38", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Tag", 
+ "name_case": "Title Case", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "create": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "role": "System Manager", 
+   "write": 1
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/todo/todo.txt b/frappe/core/doctype/todo/todo.txt
index 7f1b344ad3..3f3435ea7b 100644
--- a/frappe/core/doctype/todo/todo.txt
+++ b/frappe/core/doctype/todo/todo.txt
@@ -1,210 +1,198 @@
-[
- {
-  "creation": "2012-07-03 13:30:35", 
-  "docstatus": 0, 
-  "modified": "2014-03-12 17:06:46", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_attach": 0, 
-  "allow_copy": 0, 
-  "allow_rename": 0, 
-  "autoname": "TDI.########", 
-  "doctype": "DocType", 
-  "hide_heading": 0, 
-  "hide_toolbar": 0, 
-  "icon": "icon-check", 
-  "in_create": 0, 
-  "in_dialog": 0, 
-  "issingle": 0, 
-  "max_attachments": 0, 
-  "module": "Core", 
-  "name": "__common__", 
-  "read_only": 0, 
-  "read_only_onload": 0, 
-  "title_field": "description"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "ToDo", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "create": 1, 
-  "delete": 0, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "ToDo", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "report": 1, 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "ToDo"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "description_and_status", 
-  "fieldtype": "Section Break", 
-  "label": "Description and Status"
- }, 
- {
-  "allow_on_submit": 0, 
-  "doctype": "DocField", 
-  "fieldname": "description", 
-  "fieldtype": "Text", 
-  "hidden": 0, 
-  "in_filter": 0, 
-  "in_list_view": 1, 
-  "label": "Description", 
-  "no_copy": 0, 
-  "oldfieldname": "description", 
-  "oldfieldtype": "Text", 
-  "print_hide": 0, 
-  "print_width": "300px", 
-  "report_hide": 0, 
-  "reqd": 1, 
-  "search_index": 0, 
-  "width": "300px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break_2", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "default": "Open", 
-  "doctype": "DocField", 
-  "fieldname": "status", 
-  "fieldtype": "Select", 
-  "in_list_view": 1, 
-  "label": "Status", 
-  "options": "Open\nClosed"
- }, 
- {
-  "allow_on_submit": 0, 
-  "default": "Medium", 
-  "doctype": "DocField", 
-  "fieldname": "priority", 
-  "fieldtype": "Select", 
-  "hidden": 0, 
-  "in_filter": 0, 
-  "in_list_view": 1, 
-  "label": "Priority", 
-  "no_copy": 0, 
-  "oldfieldname": "priority", 
-  "oldfieldtype": "Data", 
-  "options": "High\nMedium\nLow", 
-  "print_hide": 0, 
-  "report_hide": 0, 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "allow_on_submit": 0, 
-  "doctype": "DocField", 
-  "fieldname": "date", 
-  "fieldtype": "Date", 
-  "hidden": 0, 
-  "in_filter": 0, 
-  "in_list_view": 1, 
-  "label": "Due Date", 
-  "no_copy": 0, 
-  "oldfieldname": "date", 
-  "oldfieldtype": "Date", 
-  "print_hide": 0, 
-  "report_hide": 0, 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "section_break_6", 
-  "fieldtype": "Section Break", 
-  "label": "Reference"
- }, 
- {
-  "allow_on_submit": 0, 
-  "doctype": "DocField", 
-  "fieldname": "reference_type", 
-  "fieldtype": "Data", 
-  "hidden": 0, 
-  "in_filter": 0, 
-  "label": "Reference Type", 
-  "no_copy": 0, 
-  "oldfieldname": "reference_type", 
-  "oldfieldtype": "Data", 
-  "print_hide": 0, 
-  "report_hide": 0, 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "allow_on_submit": 0, 
-  "doctype": "DocField", 
-  "fieldname": "reference_name", 
-  "fieldtype": "Data", 
-  "hidden": 0, 
-  "in_filter": 0, 
-  "label": "Reference Name", 
-  "no_copy": 0, 
-  "oldfieldname": "reference_name", 
-  "oldfieldtype": "Data", 
-  "print_hide": 0, 
-  "report_hide": 0, 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break_10", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "allow_on_submit": 0, 
-  "doctype": "DocField", 
-  "fieldname": "role", 
-  "fieldtype": "Link", 
-  "hidden": 0, 
-  "in_filter": 0, 
-  "label": "Role", 
-  "no_copy": 0, 
-  "oldfieldname": "role", 
-  "oldfieldtype": "Link", 
-  "options": "Role", 
-  "print_hide": 0, 
-  "report_hide": 0, 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "assigned_by", 
-  "fieldtype": "Link", 
-  "label": "Assigned By", 
-  "options": "User"
- }, 
- {
-  "cancel": 0, 
-  "doctype": "DocPerm", 
-  "export": 0, 
-  "restricted": 1, 
-  "role": "All", 
-  "submit": 0
- }, 
- {
-  "doctype": "DocPerm", 
-  "export": 1, 
-  "role": "System Manager"
- }
-]
\ No newline at end of file
+{
+ "allow_attach": 0, 
+ "allow_copy": 0, 
+ "allow_rename": 0, 
+ "autoname": "TDI.########", 
+ "creation": "2012-07-03 13:30:35", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "description_and_status", 
+   "fieldtype": "Section Break", 
+   "label": "Description and Status", 
+   "permlevel": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Description", 
+   "no_copy": 0, 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_width": "300px", 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "width": "300px"
+  }, 
+  {
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "default": "Open", 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "in_list_view": 1, 
+   "label": "Status", 
+   "options": "Open\nClosed", 
+   "permlevel": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "default": "Medium", 
+   "fieldname": "priority", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Priority", 
+   "no_copy": 0, 
+   "oldfieldname": "priority", 
+   "oldfieldtype": "Data", 
+   "options": "High\nMedium\nLow", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "fieldname": "date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Due Date", 
+   "no_copy": 0, 
+   "oldfieldname": "date", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "label": "Reference", 
+   "permlevel": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "fieldname": "reference_type", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "in_filter": 0, 
+   "label": "Reference Type", 
+   "no_copy": 0, 
+   "oldfieldname": "reference_type", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "fieldname": "reference_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "in_filter": 0, 
+   "label": "Reference Name", 
+   "no_copy": 0, 
+   "oldfieldname": "reference_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "column_break_10", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "fieldname": "role", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "in_filter": 0, 
+   "label": "Role", 
+   "no_copy": 0, 
+   "oldfieldname": "role", 
+   "oldfieldtype": "Link", 
+   "options": "Role", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "assigned_by", 
+   "fieldtype": "Link", 
+   "label": "Assigned By", 
+   "options": "User", 
+   "permlevel": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "icon-check", 
+ "idx": 1, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "issingle": 0, 
+ "max_attachments": 0, 
+ "modified": "2014-03-12 17:06:46", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "ToDo", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "restricted": 1, 
+   "role": "All", 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "write": 1
+  }
+ ], 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "title_field": "description"
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/user/user.txt b/frappe/core/doctype/user/user.txt
index 49ba8436e7..4665892dbd 100644
--- a/frappe/core/doctype/user/user.txt
+++ b/frappe/core/doctype/user/user.txt
@@ -1,533 +1,471 @@
-[
- {
-  "creation": "2014-03-11 14:55:00", 
-  "docstatus": 0, 
-  "modified": "2014-03-11 16:04:13", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_attach": 1, 
-  "allow_copy": 0, 
-  "allow_import": 1, 
-  "allow_rename": 1, 
-  "description": "Represents a User in the system.", 
-  "doctype": "DocType", 
-  "document_type": "Master", 
-  "hide_heading": 0, 
-  "hide_toolbar": 0, 
-  "icon": "icon-user", 
-  "issingle": 0, 
-  "istable": 0, 
-  "max_attachments": 5, 
-  "module": "Core", 
-  "name": "__common__", 
-  "read_only": 0, 
-  "search_fields": "first_name, last_name"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "User", 
-  "parentfield": "fields", 
-  "parenttype": "DocType"
- }, 
- {
-  "cancel": 0, 
-  "delete": 0, 
-  "doctype": "DocPerm", 
-  "name": "__common__", 
-  "parent": "User", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "read": 1, 
-  "report": 1, 
-  "submit": 0
- }, 
- {
-  "doctype": "DocType", 
-  "name": "User"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "sb0_5", 
-  "fieldtype": "Section Break", 
-  "label": "Personal Info", 
-  "permlevel": 0
- }, 
- {
-  "default": "1", 
-  "doctype": "DocField", 
-  "fieldname": "enabled", 
-  "fieldtype": "Check", 
-  "in_list_view": 1, 
-  "label": "Enabled", 
-  "oldfieldname": "enabled", 
-  "oldfieldtype": "Check", 
-  "permlevel": 0, 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "unsubscribed", 
-  "fieldtype": "Check", 
-  "hidden": 1, 
-  "label": "Unsubscribed", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "email", 
-  "fieldtype": "Data", 
-  "hidden": 0, 
-  "label": "Email", 
-  "oldfieldname": "email", 
-  "oldfieldtype": "Data", 
-  "permlevel": 0, 
-  "reqd": 1, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "first_name", 
-  "fieldtype": "Data", 
-  "in_list_view": 1, 
-  "label": "First Name", 
-  "oldfieldname": "first_name", 
-  "oldfieldtype": "Data", 
-  "permlevel": 0, 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "middle_name", 
-  "fieldtype": "Data", 
-  "label": "Middle Name (Optional)", 
-  "oldfieldname": "middle_name", 
-  "oldfieldtype": "Data", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "last_name", 
-  "fieldtype": "Data", 
-  "in_list_view": 1, 
-  "label": "Last Name", 
-  "oldfieldname": "last_name", 
-  "oldfieldtype": "Data", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break0", 
-  "fieldtype": "Column Break", 
-  "oldfieldtype": "Column Break", 
-  "permlevel": 0, 
-  "print_width": "50%", 
-  "width": "50%"
- }, 
- {
-  "description": "Language preference for user interface (only if available).", 
-  "doctype": "DocField", 
-  "fieldname": "language", 
-  "fieldtype": "Select", 
-  "label": "Language", 
-  "options": "Loading...", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "change_password", 
-  "fieldtype": "Section Break", 
-  "label": "Set Password", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "new_password", 
-  "fieldtype": "Password", 
-  "label": "New Password", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "reset_password_key", 
-  "fieldtype": "Data", 
-  "hidden": 1, 
-  "label": "Reset Password Key", 
-  "permlevel": 0, 
-  "print_hide": 1, 
-  "read_only": 1
- }, 
- {
-  "depends_on": "eval:!doc.__islocal", 
-  "doctype": "DocField", 
-  "fieldname": "display_settings", 
-  "fieldtype": "Section Break", 
-  "label": "Display Settings", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "user_image", 
-  "fieldtype": "Attach", 
-  "hidden": 0, 
-  "label": "User Image", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "background_image", 
-  "fieldtype": "Attach", 
-  "hidden": 0, 
-  "label": "Background Image", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "cb21", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "user_image_show", 
-  "fieldtype": "Image", 
-  "label": "user_image_show", 
-  "options": "user_image", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "short_bio", 
-  "fieldtype": "Section Break", 
-  "label": "Short Bio", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "gender", 
-  "fieldtype": "Select", 
-  "label": "Gender", 
-  "oldfieldname": "gender", 
-  "oldfieldtype": "Select", 
-  "options": "\nMale\nFemale\nOther", 
-  "permlevel": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "birth_date", 
-  "fieldtype": "Date", 
-  "label": "Birth Date", 
-  "oldfieldname": "birth_date", 
-  "oldfieldtype": "Date", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "location", 
-  "fieldtype": "Data", 
-  "label": "Location", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break_22", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "bio", 
-  "fieldtype": "Small Text", 
-  "label": "Bio", 
-  "permlevel": 0
- }, 
- {
-  "description": "Check / Uncheck roles assigned to the User. Click on the Role to find out what permissions that Role has.", 
-  "doctype": "DocField", 
-  "fieldname": "sb1", 
-  "fieldtype": "Section Break", 
-  "label": "Roles", 
-  "permlevel": 1, 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "roles_html", 
-  "fieldtype": "HTML", 
-  "label": "Roles HTML", 
-  "permlevel": 0, 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "incoming_email_settings", 
-  "fieldtype": "Section Break", 
-  "label": "Email Settings", 
-  "permlevel": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "cb18", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "email_signature", 
-  "fieldtype": "Small Text", 
-  "label": "Email Signature", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "cb20", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
- }, 
- {
-  "description": "Pull Emails from the Inbox and attach them as Communication records (for known contacts).", 
-  "doctype": "DocField", 
-  "fieldname": "sync_inbox", 
-  "fieldtype": "Check", 
-  "hidden": 1, 
-  "label": "Sync Inbox", 
-  "permlevel": 0
- }, 
- {
-  "description": "POP3 Mail Server (e.g. pop.gmail.com)", 
-  "doctype": "DocField", 
-  "fieldname": "email_host", 
-  "fieldtype": "Data", 
-  "hidden": 1, 
-  "label": "Email Host", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "email_use_ssl", 
-  "fieldtype": "Check", 
-  "hidden": 1, 
-  "label": "Email Use SSL", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "email_login", 
-  "fieldtype": "Data", 
-  "hidden": 1, 
-  "label": "Email Login", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "email_password", 
-  "fieldtype": "Password", 
-  "hidden": 1, 
-  "label": "Email Password", 
-  "permlevel": 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.", 
-  "doctype": "DocField", 
-  "fieldname": "sb2", 
-  "fieldtype": "Section Break", 
-  "hidden": 1, 
-  "label": "Defaults", 
-  "oldfieldtype": "Column Break", 
-  "permlevel": 1, 
-  "print_width": "50%", 
-  "read_only": 1, 
-  "width": "50%"
- }, 
- {
-  "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 <a href=\"#Form/Customize Form/Customize Form\">Customize Form</a>.", 
-  "doctype": "DocField", 
-  "fieldname": "defaults", 
-  "fieldtype": "Table", 
-  "hidden": 1, 
-  "label": "User Defaults", 
-  "options": "DefaultValue", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "sb3", 
-  "fieldtype": "Section Break", 
-  "label": "Security Settings", 
-  "oldfieldtype": "Section Break", 
-  "permlevel": 0, 
-  "read_only": 1
- }, 
- {
-  "default": "System User", 
-  "description": "User Type \"System User\" can access Desktop. \"Website User\" can only be logged into the website and portal pages. ", 
-  "doctype": "DocField", 
-  "fieldname": "user_type", 
-  "fieldtype": "Select", 
-  "label": "User Type", 
-  "oldfieldname": "user_type", 
-  "oldfieldtype": "Select", 
-  "options": "System User\nWebsite User", 
-  "permlevel": 0, 
-  "read_only": 1, 
-  "reqd": 1
- }, 
- {
-  "description": "Allow user to login only after this hour (0-24)", 
-  "doctype": "DocField", 
-  "fieldname": "login_after", 
-  "fieldtype": "Int", 
-  "label": "Login After", 
-  "permlevel": 0, 
-  "read_only": 1
- }, 
- {
-  "description": "Allow user to login only before this hour (0-24)", 
-  "doctype": "DocField", 
-  "fieldname": "login_before", 
-  "fieldtype": "Int", 
-  "label": "Login Before", 
-  "permlevel": 0, 
-  "read_only": 1
- }, 
- {
-  "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)", 
-  "doctype": "DocField", 
-  "fieldname": "restrict_ip", 
-  "fieldtype": "Data", 
-  "label": "Restrict IP", 
-  "permlevel": 0, 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break1", 
-  "fieldtype": "Column Break", 
-  "oldfieldtype": "Column Break", 
-  "permlevel": 0, 
-  "print_width": "50%", 
-  "width": "50%"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "last_login", 
-  "fieldtype": "Read Only", 
-  "hidden": 0, 
-  "label": "Last Login", 
-  "oldfieldname": "last_login", 
-  "oldfieldtype": "Read Only", 
-  "permlevel": 0, 
-  "read_only": 1, 
-  "reqd": 0, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "last_ip", 
-  "fieldtype": "Read Only", 
-  "label": "Last IP", 
-  "oldfieldname": "last_ip", 
-  "oldfieldtype": "Read Only", 
-  "permlevel": 0, 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "roles_assigned_to_user", 
-  "fieldtype": "Section Break", 
-  "hidden": 1, 
-  "label": "Roles Assigned To User", 
-  "no_copy": 0, 
-  "permlevel": 0, 
-  "print_hide": 1, 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "user_roles", 
-  "fieldtype": "Table", 
-  "hidden": 1, 
-  "label": "Roles Assigned", 
-  "options": "UserRole", 
-  "permlevel": 0, 
-  "print_hide": 1, 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "third_party_authentication", 
-  "fieldtype": "Section Break", 
-  "label": "Third Party Authentication", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "fb_username", 
-  "fieldtype": "Data", 
-  "label": "Facebook Username", 
-  "permlevel": 0, 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "fb_userid", 
-  "fieldtype": "Data", 
-  "label": "Facebook User ID", 
-  "permlevel": 0, 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "google_userid", 
-  "fieldtype": "Data", 
-  "label": "Google User ID", 
-  "permlevel": 0, 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "github_userid", 
-  "fieldtype": "Data", 
-  "label": "Github User ID", 
-  "permlevel": 0, 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "github_username", 
-  "fieldtype": "Data", 
-  "label": "Github Username", 
-  "permlevel": 0, 
-  "read_only": 1
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "permlevel": 0, 
-  "print": 1, 
-  "role": "System Manager", 
-  "write": 1
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "permlevel": 0, 
-  "print": 1, 
-  "restricted": 1, 
-  "role": "All", 
-  "write": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "permlevel": 1, 
-  "role": "System Manager", 
-  "write": 1
- }
-]
\ No newline at end of file
+{
+ "allow_attach": 1, 
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "creation": "2014-03-11 14:55:00", 
+ "description": "Represents a User in the system.", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Master", 
+ "fields": [
+  {
+   "fieldname": "sb0_5", 
+   "fieldtype": "Section Break", 
+   "label": "Personal Info", 
+   "permlevel": 0
+  }, 
+  {
+   "default": "1", 
+   "fieldname": "enabled", 
+   "fieldtype": "Check", 
+   "in_list_view": 1, 
+   "label": "Enabled", 
+   "oldfieldname": "enabled", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "unsubscribed", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "label": "Unsubscribed", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "email", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Email", 
+   "oldfieldname": "email", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "reqd": 1, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "first_name", 
+   "fieldtype": "Data", 
+   "in_list_view": 1, 
+   "label": "First Name", 
+   "oldfieldname": "first_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "middle_name", 
+   "fieldtype": "Data", 
+   "label": "Middle Name (Optional)", 
+   "oldfieldname": "middle_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "last_name", 
+   "fieldtype": "Data", 
+   "in_list_view": 1, 
+   "label": "Last Name", 
+   "oldfieldname": "last_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "column_break0", 
+   "fieldtype": "Column Break", 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
+   "print_width": "50%", 
+   "width": "50%"
+  }, 
+  {
+   "description": "Language preference for user interface (only if available).", 
+   "fieldname": "language", 
+   "fieldtype": "Select", 
+   "label": "Language", 
+   "options": "Loading...", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "change_password", 
+   "fieldtype": "Section Break", 
+   "label": "Set Password", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "new_password", 
+   "fieldtype": "Password", 
+   "label": "New Password", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "reset_password_key", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "label": "Reset Password Key", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1
+  }, 
+  {
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "display_settings", 
+   "fieldtype": "Section Break", 
+   "label": "Display Settings", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "user_image", 
+   "fieldtype": "Attach", 
+   "hidden": 0, 
+   "label": "User Image", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "background_image", 
+   "fieldtype": "Attach", 
+   "hidden": 0, 
+   "label": "Background Image", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "cb21", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "user_image_show", 
+   "fieldtype": "Image", 
+   "label": "user_image_show", 
+   "options": "user_image", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "short_bio", 
+   "fieldtype": "Section Break", 
+   "label": "Short Bio", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "gender", 
+   "fieldtype": "Select", 
+   "label": "Gender", 
+   "oldfieldname": "gender", 
+   "oldfieldtype": "Select", 
+   "options": "\nMale\nFemale\nOther", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "birth_date", 
+   "fieldtype": "Date", 
+   "label": "Birth Date", 
+   "oldfieldname": "birth_date", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "location", 
+   "fieldtype": "Data", 
+   "label": "Location", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "column_break_22", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "bio", 
+   "fieldtype": "Small Text", 
+   "label": "Bio", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Check / Uncheck roles assigned to the User. Click on the Role to find out what permissions that Role has.", 
+   "fieldname": "sb1", 
+   "fieldtype": "Section Break", 
+   "label": "Roles", 
+   "permlevel": 1, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "roles_html", 
+   "fieldtype": "HTML", 
+   "label": "Roles HTML", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "incoming_email_settings", 
+   "fieldtype": "Section Break", 
+   "label": "Email Settings", 
+   "permlevel": 1
+  }, 
+  {
+   "fieldname": "cb18", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "email_signature", 
+   "fieldtype": "Small Text", 
+   "label": "Email Signature", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "cb20", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Pull Emails from the Inbox and attach them as Communication records (for known contacts).", 
+   "fieldname": "sync_inbox", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "label": "Sync Inbox", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "POP3 Mail Server (e.g. pop.gmail.com)", 
+   "fieldname": "email_host", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "label": "Email Host", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "email_use_ssl", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "label": "Email Use SSL", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "email_login", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "label": "Email Login", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "email_password", 
+   "fieldtype": "Password", 
+   "hidden": 1, 
+   "label": "Email Password", 
+   "permlevel": 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.", 
+   "fieldname": "sb2", 
+   "fieldtype": "Section Break", 
+   "hidden": 1, 
+   "label": "Defaults", 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 1, 
+   "print_width": "50%", 
+   "read_only": 1, 
+   "width": "50%"
+  }, 
+  {
+   "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 <a href=\"#Form/Customize Form/Customize Form\">Customize Form</a>.", 
+   "fieldname": "defaults", 
+   "fieldtype": "Table", 
+   "hidden": 1, 
+   "label": "User Defaults", 
+   "options": "DefaultValue", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "sb3", 
+   "fieldtype": "Section Break", 
+   "label": "Security Settings", 
+   "oldfieldtype": "Section Break", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "default": "System User", 
+   "description": "User Type \"System User\" can access Desktop. \"Website User\" can only be logged into the website and portal pages. ", 
+   "fieldname": "user_type", 
+   "fieldtype": "Select", 
+   "label": "User Type", 
+   "oldfieldname": "user_type", 
+   "oldfieldtype": "Select", 
+   "options": "System User\nWebsite User", 
+   "permlevel": 0, 
+   "read_only": 1, 
+   "reqd": 1
+  }, 
+  {
+   "description": "Allow user to login only after this hour (0-24)", 
+   "fieldname": "login_after", 
+   "fieldtype": "Int", 
+   "label": "Login After", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "description": "Allow user to login only before this hour (0-24)", 
+   "fieldname": "login_before", 
+   "fieldtype": "Int", 
+   "label": "Login Before", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "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)", 
+   "fieldname": "restrict_ip", 
+   "fieldtype": "Data", 
+   "label": "Restrict IP", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
+   "print_width": "50%", 
+   "width": "50%"
+  }, 
+  {
+   "fieldname": "last_login", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "label": "Last Login", 
+   "oldfieldname": "last_login", 
+   "oldfieldtype": "Read Only", 
+   "permlevel": 0, 
+   "read_only": 1, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "last_ip", 
+   "fieldtype": "Read Only", 
+   "label": "Last IP", 
+   "oldfieldname": "last_ip", 
+   "oldfieldtype": "Read Only", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "roles_assigned_to_user", 
+   "fieldtype": "Section Break", 
+   "hidden": 1, 
+   "label": "Roles Assigned To User", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "user_roles", 
+   "fieldtype": "Table", 
+   "hidden": 1, 
+   "label": "Roles Assigned", 
+   "options": "UserRole", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "third_party_authentication", 
+   "fieldtype": "Section Break", 
+   "label": "Third Party Authentication", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "fb_username", 
+   "fieldtype": "Data", 
+   "label": "Facebook Username", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "fb_userid", 
+   "fieldtype": "Data", 
+   "label": "Facebook User ID", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "google_userid", 
+   "fieldtype": "Data", 
+   "label": "Google User ID", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "github_userid", 
+   "fieldtype": "Data", 
+   "label": "Github User ID", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "github_username", 
+   "fieldtype": "Data", 
+   "label": "Github Username", 
+   "permlevel": 0, 
+   "read_only": 1
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "icon-user", 
+ "idx": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 5, 
+ "modified": "2014-03-11 16:04:13", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "User", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "restricted": 1, 
+   "role": "All", 
+   "submit": 0, 
+   "write": 0
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "permlevel": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "read_only": 0, 
+ "search_fields": "first_name, last_name"
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/userrole/userrole.txt b/frappe/core/doctype/userrole/userrole.txt
index 9a0846d63e..ba15beb2c9 100644
--- a/frappe/core/doctype/userrole/userrole.txt
+++ b/frappe/core/doctype/userrole/userrole.txt
@@ -1,48 +1,35 @@
-[
- {
-  "creation": "2013-02-06 11:30:13", 
-  "docstatus": 0, 
-  "modified": "2013-12-20 19:21:54", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_copy": 0, 
-  "autoname": "UR.#####", 
-  "doctype": "DocType", 
-  "hide_heading": 0, 
-  "hide_toolbar": 0, 
-  "issingle": 0, 
-  "istable": 1, 
-  "module": "Core", 
-  "name": "__common__", 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "role", 
-  "fieldtype": "Link", 
-  "hidden": 0, 
-  "in_list_view": 1, 
-  "label": "Role", 
-  "name": "__common__", 
-  "oldfieldname": "role", 
-  "oldfieldtype": "Link", 
-  "options": "Role", 
-  "parent": "UserRole", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print_width": "200px", 
-  "reqd": 0, 
-  "search_index": 0, 
-  "width": "200px"
- }, 
- {
-  "doctype": "DocType", 
-  "name": "UserRole"
- }, 
- {
-  "doctype": "DocField"
- }
-]
\ No newline at end of file
+{
+ "allow_copy": 0, 
+ "autoname": "UR.#####", 
+ "creation": "2013-02-06 11:30:13", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "role", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "in_list_view": 1, 
+   "label": "Role", 
+   "oldfieldname": "role", 
+   "oldfieldtype": "Link", 
+   "options": "Role", 
+   "permlevel": 0, 
+   "print_width": "200px", 
+   "reqd": 0, 
+   "search_index": 0, 
+   "width": "200px"
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 1, 
+ "issingle": 0, 
+ "istable": 1, 
+ "modified": "2013-12-20 19:21:54", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "UserRole", 
+ "owner": "Administrator", 
+ "read_only": 0
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/version/version.txt b/frappe/core/doctype/version/version.txt
index f7a1a046dc..9296d22c8e 100644
--- a/frappe/core/doctype/version/version.txt
+++ b/frappe/core/doctype/version/version.txt
@@ -1,63 +1,46 @@
-[
- {
-  "creation": "2014-02-20 17:22:37", 
-  "docstatus": 0, 
-  "modified": "2014-02-20 17:22:38", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "autoname": "_VER.######", 
-  "doctype": "DocType", 
-  "document_type": "Master", 
-  "module": "Core", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Version", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocPerm", 
-  "export": 1, 
-  "name": "__common__", 
-  "parent": "Version", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "read": 1, 
-  "report": 1, 
-  "role": "System Manager"
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Version"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "ref_doctype", 
-  "fieldtype": "Link", 
-  "label": "Ref DocType", 
-  "options": "DocType"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "docname", 
-  "fieldtype": "Data", 
-  "label": "Docname"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "doclist_json", 
-  "fieldtype": "Code", 
-  "label": "Doclist JSON"
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "autoname": "_VER.######", 
+ "creation": "2014-02-20 17:22:37", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Master", 
+ "fields": [
+  {
+   "fieldname": "ref_doctype", 
+   "fieldtype": "Link", 
+   "label": "Ref DocType", 
+   "options": "DocType", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "docname", 
+   "fieldtype": "Data", 
+   "label": "Docname", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "doclist_json", 
+   "fieldtype": "Code", 
+   "label": "Doclist JSON", 
+   "permlevel": 0, 
+   "reqd": 1
+  }
+ ], 
+ "idx": 1, 
+ "modified": "2014-02-20 17:22:38", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Version", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "export": 1, 
+   "permlevel": 0, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/workflow/workflow.txt b/frappe/core/doctype/workflow/workflow.txt
index 731c8c7dbe..2cac03de5d 100644
--- a/frappe/core/doctype/workflow/workflow.txt
+++ b/frappe/core/doctype/workflow/workflow.txt
@@ -1,113 +1,94 @@
-[
- {
-  "creation": "2012-12-28 10:49:55", 
-  "docstatus": 0, 
-  "modified": "2014-01-20 17:49:35", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "autoname": "field:workflow_name", 
-  "description": "Defines workflow states and rules for a document.", 
-  "doctype": "DocType", 
-  "document_type": "Transaction", 
-  "icon": "icon-random", 
-  "module": "Core", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Workflow", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "cancel": 1, 
-  "create": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Workflow", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "role": "System Manager", 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Workflow"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "workflow_name", 
-  "fieldtype": "Data", 
-  "label": "Workflow Name", 
-  "read_only": 0, 
-  "reqd": 1
- }, 
- {
-  "description": "DocType on which this Workflow is applicable.", 
-  "doctype": "DocField", 
-  "fieldname": "document_type", 
-  "fieldtype": "Link", 
-  "label": "Document Type", 
-  "options": "DocType", 
-  "reqd": 1
- }, 
- {
-  "description": "If checked, all other workflows become inactive.", 
-  "doctype": "DocField", 
-  "fieldname": "is_active", 
-  "fieldtype": "Check", 
-  "label": "Is Active"
- }, 
- {
-  "description": "Different \"States\" this document can exist in. Like \"Open\", \"Pending Approval\" etc.", 
-  "doctype": "DocField", 
-  "fieldname": "states", 
-  "fieldtype": "Section Break", 
-  "label": "States"
- }, 
- {
-  "description": "All possible Workflow States and roles of the workflow. <br>Docstatus Options: 0 is\"Saved\", 1 is \"Submitted\" and 2 is \"Cancelled\"", 
-  "doctype": "DocField", 
-  "fieldname": "workflow_document_states", 
-  "fieldtype": "Table", 
-  "label": "Workflow Document States", 
-  "options": "Workflow Document State", 
-  "reqd": 1
- }, 
- {
-  "description": "Rules for how states are transitions, like next state and which role is allowed to change state etc.", 
-  "doctype": "DocField", 
-  "fieldname": "transition_rules", 
-  "fieldtype": "Section Break", 
-  "label": "Transition Rules"
- }, 
- {
-  "description": "Rules defining transition of state in the workflow.", 
-  "doctype": "DocField", 
-  "fieldname": "workflow_transitions", 
-  "fieldtype": "Table", 
-  "label": "Workflow Transitions", 
-  "options": "Workflow Transition", 
-  "reqd": 1
- }, 
- {
-  "default": "workflow_state", 
-  "description": "Field that represents the Workflow State of the transaction (if field is not present, a new hidden Custom Field will be created)", 
-  "doctype": "DocField", 
-  "fieldname": "workflow_state_field", 
-  "fieldtype": "Data", 
-  "label": "Workflow State Field"
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "autoname": "field:workflow_name", 
+ "creation": "2012-12-28 10:49:55", 
+ "description": "Defines workflow states and rules for a document.", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Transaction", 
+ "fields": [
+  {
+   "fieldname": "workflow_name", 
+   "fieldtype": "Data", 
+   "label": "Workflow Name", 
+   "permlevel": 0, 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "description": "DocType on which this Workflow is applicable.", 
+   "fieldname": "document_type", 
+   "fieldtype": "Link", 
+   "label": "Document Type", 
+   "options": "DocType", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "description": "If checked, all other workflows become inactive.", 
+   "fieldname": "is_active", 
+   "fieldtype": "Check", 
+   "label": "Is Active", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Different \"States\" this document can exist in. Like \"Open\", \"Pending Approval\" etc.", 
+   "fieldname": "states", 
+   "fieldtype": "Section Break", 
+   "label": "States", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "All possible Workflow States and roles of the workflow. <br>Docstatus Options: 0 is\"Saved\", 1 is \"Submitted\" and 2 is \"Cancelled\"", 
+   "fieldname": "workflow_document_states", 
+   "fieldtype": "Table", 
+   "label": "Workflow Document States", 
+   "options": "Workflow Document State", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "description": "Rules for how states are transitions, like next state and which role is allowed to change state etc.", 
+   "fieldname": "transition_rules", 
+   "fieldtype": "Section Break", 
+   "label": "Transition Rules", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Rules defining transition of state in the workflow.", 
+   "fieldname": "workflow_transitions", 
+   "fieldtype": "Table", 
+   "label": "Workflow Transitions", 
+   "options": "Workflow Transition", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "default": "workflow_state", 
+   "description": "Field that represents the Workflow State of the transaction (if field is not present, a new hidden Custom Field will be created)", 
+   "fieldname": "workflow_state_field", 
+   "fieldtype": "Data", 
+   "label": "Workflow State Field", 
+   "permlevel": 0
+  }
+ ], 
+ "icon": "icon-random", 
+ "idx": 1, 
+ "modified": "2014-01-20 17:49:35", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Workflow", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "role": "System Manager", 
+   "write": 1
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/workflow_action/workflow_action.txt b/frappe/core/doctype/workflow_action/workflow_action.txt
index bce86a07e4..5368c17898 100644
--- a/frappe/core/doctype/workflow_action/workflow_action.txt
+++ b/frappe/core/doctype/workflow_action/workflow_action.txt
@@ -1,55 +1,36 @@
-[
- {
-  "creation": "2012-12-28 10:49:56", 
-  "docstatus": 0, 
-  "modified": "2014-01-20 17:49:35", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "autoname": "field:workflow_action_name", 
-  "description": "Workflow Action Master", 
-  "doctype": "DocType", 
-  "icon": "icon-flag", 
-  "module": "Core", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "workflow_action_name", 
-  "fieldtype": "Data", 
-  "label": "Workflow Action Name", 
-  "name": "__common__", 
-  "parent": "Workflow Action", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "reqd": 1
- }, 
- {
-  "cancel": 1, 
-  "create": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Workflow Action", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "role": "System Manager", 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Workflow Action"
- }, 
- {
-  "doctype": "DocField"
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "autoname": "field:workflow_action_name", 
+ "creation": "2012-12-28 10:49:56", 
+ "description": "Workflow Action Master", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "workflow_action_name", 
+   "fieldtype": "Data", 
+   "label": "Workflow Action Name", 
+   "permlevel": 0, 
+   "reqd": 1
+  }
+ ], 
+ "icon": "icon-flag", 
+ "idx": 1, 
+ "modified": "2014-01-20 17:49:35", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Workflow Action", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "role": "System Manager", 
+   "write": 1
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/workflow_document_state/workflow_document_state.txt b/frappe/core/doctype/workflow_document_state/workflow_document_state.txt
index 859d6e3020..a67604680f 100644
--- a/frappe/core/doctype/workflow_document_state/workflow_document_state.txt
+++ b/frappe/core/doctype/workflow_document_state/workflow_document_state.txt
@@ -1,81 +1,73 @@
-[
- {
-  "creation": "2013-02-22 01:27:36", 
-  "docstatus": 0, 
-  "modified": "2013-12-20 19:21:55", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_import": 1, 
-  "description": "Represents the states allowed in one document and role assigned to change the state.", 
-  "doctype": "DocType", 
-  "document_type": "Master", 
-  "istable": 1, 
-  "module": "Core", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "in_list_view": 1, 
-  "name": "__common__", 
-  "parent": "Workflow Document State", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Workflow Document State"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "state", 
-  "fieldtype": "Link", 
-  "label": "State", 
-  "options": "Workflow State", 
-  "print_width": "160px", 
-  "reqd": 1, 
-  "width": "160px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "doc_status", 
-  "fieldtype": "Select", 
-  "label": "Doc Status", 
-  "options": "0\n1\n2", 
-  "print_width": "80px", 
-  "width": "80px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "update_field", 
-  "fieldtype": "Select", 
-  "label": "Update Field"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "update_value", 
-  "fieldtype": "Data", 
-  "label": "Update Value"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "allow_edit", 
-  "fieldtype": "Link", 
-  "label": "Only Allow Edit For", 
-  "options": "Role", 
-  "print_width": "160px", 
-  "reqd": 1, 
-  "width": "160px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "message", 
-  "fieldtype": "Text", 
-  "label": "Message", 
-  "print_width": "160px", 
-  "reqd": 0, 
-  "width": "160px"
- }
-]
\ No newline at end of file
+{
+ "allow_import": 1, 
+ "creation": "2013-02-22 01:27:36", 
+ "description": "Represents the states allowed in one document and role assigned to change the state.", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Master", 
+ "fields": [
+  {
+   "fieldname": "state", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "State", 
+   "options": "Workflow State", 
+   "permlevel": 0, 
+   "print_width": "160px", 
+   "reqd": 1, 
+   "width": "160px"
+  }, 
+  {
+   "fieldname": "doc_status", 
+   "fieldtype": "Select", 
+   "in_list_view": 1, 
+   "label": "Doc Status", 
+   "options": "0\n1\n2", 
+   "permlevel": 0, 
+   "print_width": "80px", 
+   "width": "80px"
+  }, 
+  {
+   "fieldname": "update_field", 
+   "fieldtype": "Select", 
+   "in_list_view": 1, 
+   "label": "Update Field", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "update_value", 
+   "fieldtype": "Data", 
+   "in_list_view": 1, 
+   "label": "Update Value", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "allow_edit", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Only Allow Edit For", 
+   "options": "Role", 
+   "permlevel": 0, 
+   "print_width": "160px", 
+   "reqd": 1, 
+   "width": "160px"
+  }, 
+  {
+   "fieldname": "message", 
+   "fieldtype": "Text", 
+   "in_list_view": 1, 
+   "label": "Message", 
+   "permlevel": 0, 
+   "print_width": "160px", 
+   "reqd": 0, 
+   "width": "160px"
+  }
+ ], 
+ "idx": 1, 
+ "istable": 1, 
+ "modified": "2013-12-20 19:21:55", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Workflow Document State", 
+ "owner": "Administrator"
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/workflow_state/workflow_state.txt b/frappe/core/doctype/workflow_state/workflow_state.txt
index b4a502394f..45288df7a2 100644
--- a/frappe/core/doctype/workflow_state/workflow_state.txt
+++ b/frappe/core/doctype/workflow_state/workflow_state.txt
@@ -1,75 +1,56 @@
-[
- {
-  "creation": "2012-12-28 10:49:56", 
-  "docstatus": 0, 
-  "modified": "2014-01-20 17:49:35", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_import": 1, 
-  "autoname": "field:workflow_state_name", 
-  "description": "Workflow state represents the current state of a document.", 
-  "doctype": "DocType", 
-  "document_type": "Master", 
-  "icon": "icon-flag", 
-  "module": "Core", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Workflow State", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "cancel": 1, 
-  "create": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Workflow State", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "role": "System Manager", 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Workflow State"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "workflow_state_name", 
-  "fieldtype": "Data", 
-  "label": "State", 
-  "reqd": 1
- }, 
- {
-  "description": "Icon will appear on the button", 
-  "doctype": "DocField", 
-  "fieldname": "icon", 
-  "fieldtype": "Select", 
-  "label": "Icon", 
-  "options": "\nglass\nmusic\nsearch\nenvelope\nheart\nstar\nstar-empty\nuser\nfilm\nth-large\nth\nth-list\nok\nremove\nzoom-in\nzoom-out\noff\nsignal\ncog\ntrash\nhome\nfile\ntime\nroad\ndownload-alt\ndownload\nupload\ninbox\nplay-circle\nrepeat\nrefresh\nlist-alt\nlock\nflag\nheadphones\nvolume-off\nvolume-down\nvolume-up\nqrcode\nbarcode\ntag\ntags\nbook\nbookmark\nprint\ncamera\nfont\nbold\nitalic\ntext-height\ntext-width\nalign-left\nalign-center\nalign-right\nalign-justify\nlist\nindent-left\nindent-right\nfacetime-video\npicture\npencil\nmap-marker\nadjust\ntint\nedit\nshare\ncheck\nmove\nstep-backward\nfast-backward\nbackward\nplay\npause\nstop\nforward\nfast-forward\nstep-forward\neject\nchevron-left\nchevron-right\nplus-sign\nminus-sign\nremove-sign\nok-sign\nquestion-sign\ninfo-sign\nscreenshot\nremove-circle\nok-circle\nban-circle\narrow-left\narrow-right\narrow-up\narrow-down\nshare-alt\nresize-full\nresize-small\nplus\nminus\nasterisk\nexclamation-sign\ngift\nleaf\nfire\neye-open\neye-close\nwarning-sign\nplane\ncalendar\nrandom\ncomment\nmagnet\nchevron-up\nchevron-down\nretweet\nshopping-cart\nfolder-close\nfolder-open\nresize-vertical\nresize-horizontal\nhdd\nbullhorn\nbell\ncertificate\nthumbs-up\nthumbs-down\nhand-right\nhand-left\nhand-up\nhand-down\ncircle-arrow-right\ncircle-arrow-left\ncircle-arrow-up\ncircle-arrow-down\nglobe\nwrench\ntasks\nfilter\nbriefcase\nfullscreen", 
-  "reqd": 0
- }, 
- {
-  "description": "Style represents the button color: Success - Green, Danger - Red, Inverse - Black, Primary - Dark Blue, Info - Light Blue, Warning - Orange", 
-  "doctype": "DocField", 
-  "fieldname": "style", 
-  "fieldtype": "Select", 
-  "label": "Style", 
-  "options": "\nPrimary\nInfo\nSuccess\nWarning\nDanger\nInverse", 
-  "reqd": 0
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "allow_import": 1, 
+ "autoname": "field:workflow_state_name", 
+ "creation": "2012-12-28 10:49:56", 
+ "description": "Workflow state represents the current state of a document.", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Master", 
+ "fields": [
+  {
+   "fieldname": "workflow_state_name", 
+   "fieldtype": "Data", 
+   "label": "State", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "description": "Icon will appear on the button", 
+   "fieldname": "icon", 
+   "fieldtype": "Select", 
+   "label": "Icon", 
+   "options": "\nglass\nmusic\nsearch\nenvelope\nheart\nstar\nstar-empty\nuser\nfilm\nth-large\nth\nth-list\nok\nremove\nzoom-in\nzoom-out\noff\nsignal\ncog\ntrash\nhome\nfile\ntime\nroad\ndownload-alt\ndownload\nupload\ninbox\nplay-circle\nrepeat\nrefresh\nlist-alt\nlock\nflag\nheadphones\nvolume-off\nvolume-down\nvolume-up\nqrcode\nbarcode\ntag\ntags\nbook\nbookmark\nprint\ncamera\nfont\nbold\nitalic\ntext-height\ntext-width\nalign-left\nalign-center\nalign-right\nalign-justify\nlist\nindent-left\nindent-right\nfacetime-video\npicture\npencil\nmap-marker\nadjust\ntint\nedit\nshare\ncheck\nmove\nstep-backward\nfast-backward\nbackward\nplay\npause\nstop\nforward\nfast-forward\nstep-forward\neject\nchevron-left\nchevron-right\nplus-sign\nminus-sign\nremove-sign\nok-sign\nquestion-sign\ninfo-sign\nscreenshot\nremove-circle\nok-circle\nban-circle\narrow-left\narrow-right\narrow-up\narrow-down\nshare-alt\nresize-full\nresize-small\nplus\nminus\nasterisk\nexclamation-sign\ngift\nleaf\nfire\neye-open\neye-close\nwarning-sign\nplane\ncalendar\nrandom\ncomment\nmagnet\nchevron-up\nchevron-down\nretweet\nshopping-cart\nfolder-close\nfolder-open\nresize-vertical\nresize-horizontal\nhdd\nbullhorn\nbell\ncertificate\nthumbs-up\nthumbs-down\nhand-right\nhand-left\nhand-up\nhand-down\ncircle-arrow-right\ncircle-arrow-left\ncircle-arrow-up\ncircle-arrow-down\nglobe\nwrench\ntasks\nfilter\nbriefcase\nfullscreen", 
+   "permlevel": 0, 
+   "reqd": 0
+  }, 
+  {
+   "description": "Style represents the button color: Success - Green, Danger - Red, Inverse - Black, Primary - Dark Blue, Info - Light Blue, Warning - Orange", 
+   "fieldname": "style", 
+   "fieldtype": "Select", 
+   "label": "Style", 
+   "options": "\nPrimary\nInfo\nSuccess\nWarning\nDanger\nInverse", 
+   "permlevel": 0, 
+   "reqd": 0
+  }
+ ], 
+ "icon": "icon-flag", 
+ "idx": 1, 
+ "modified": "2014-01-20 17:49:35", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Workflow State", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "role": "System Manager", 
+   "write": 1
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/workflow_transition/workflow_transition.txt b/frappe/core/doctype/workflow_transition/workflow_transition.txt
index 519c2e2865..6fa909bac2 100644
--- a/frappe/core/doctype/workflow_transition/workflow_transition.txt
+++ b/frappe/core/doctype/workflow_transition/workflow_transition.txt
@@ -1,57 +1,59 @@
-[
- {
-  "creation": "2013-02-22 01:27:36", 
-  "docstatus": 0, 
-  "modified": "2013-12-20 19:21:55", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "description": "Defines actions on states and the next step and allowed roles.", 
-  "doctype": "DocType", 
-  "istable": 1, 
-  "module": "Core", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldtype": "Link", 
-  "in_list_view": 1, 
-  "name": "__common__", 
-  "parent": "Workflow Transition", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print_width": "200px", 
-  "reqd": 1, 
-  "width": "200px"
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Workflow Transition"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "state", 
-  "label": "State", 
-  "options": "Workflow State"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "action", 
-  "label": "Action", 
-  "options": "Workflow Action"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "next_state", 
-  "label": "Next State", 
-  "options": "Workflow State"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "allowed", 
-  "label": "Allowed", 
-  "options": "Role"
- }
-]
\ No newline at end of file
+{
+ "creation": "2013-02-22 01:27:36", 
+ "description": "Defines actions on states and the next step and allowed roles.", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "state", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "State", 
+   "options": "Workflow State", 
+   "permlevel": 0, 
+   "print_width": "200px", 
+   "reqd": 1, 
+   "width": "200px"
+  }, 
+  {
+   "fieldname": "action", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Action", 
+   "options": "Workflow Action", 
+   "permlevel": 0, 
+   "print_width": "200px", 
+   "reqd": 1, 
+   "width": "200px"
+  }, 
+  {
+   "fieldname": "next_state", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Next State", 
+   "options": "Workflow State", 
+   "permlevel": 0, 
+   "print_width": "200px", 
+   "reqd": 1, 
+   "width": "200px"
+  }, 
+  {
+   "fieldname": "allowed", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Allowed", 
+   "options": "Role", 
+   "permlevel": 0, 
+   "print_width": "200px", 
+   "reqd": 1, 
+   "width": "200px"
+  }
+ ], 
+ "idx": 1, 
+ "istable": 1, 
+ "modified": "2013-12-20 19:21:55", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "Workflow Transition", 
+ "owner": "Administrator"
+}
\ No newline at end of file
diff --git a/frappe/core/page/applications/applications.txt b/frappe/core/page/applications/applications.txt
index 110b471af7..faff3d3e59 100644
--- a/frappe/core/page/applications/applications.txt
+++ b/frappe/core/page/applications/applications.txt
@@ -1,33 +1,20 @@
-[
- {
-  "creation": "2013-12-23 11:01:52", 
-  "docstatus": 0, 
-  "modified": "2013-12-23 11:01:52", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "doctype": "Page", 
-  "icon": "icon-magic", 
-  "module": "Core", 
-  "name": "__common__", 
-  "page_name": "applications", 
-  "standard": "Yes", 
-  "title": "Applications"
- }, 
- {
-  "doctype": "Page Role", 
-  "name": "__common__", 
-  "parent": "applications", 
-  "parentfield": "roles", 
-  "parenttype": "Page", 
-  "role": "System Manager"
- }, 
- {
-  "doctype": "Page", 
-  "name": "applications"
- }, 
- {
-  "doctype": "Page Role"
- }
-]
\ No newline at end of file
+{
+ "creation": "2013-12-23 11:01:52", 
+ "docstatus": 0, 
+ "doctype": "Page", 
+ "icon": "icon-magic", 
+ "idx": 1, 
+ "modified": "2013-12-23 11:01:52", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "applications", 
+ "owner": "Administrator", 
+ "page_name": "applications", 
+ "roles": [
+  {
+   "role": "System Manager"
+  }
+ ], 
+ "standard": "Yes", 
+ "title": "Applications"
+}
\ No newline at end of file
diff --git a/frappe/core/page/data_import_tool/data_import_tool.txt b/frappe/core/page/data_import_tool/data_import_tool.txt
index 4c62dbff7d..6483f278c0 100644
--- a/frappe/core/page/data_import_tool/data_import_tool.txt
+++ b/frappe/core/page/data_import_tool/data_import_tool.txt
@@ -1,33 +1,20 @@
-[
- {
-  "creation": "2012-06-14 15:07:25", 
-  "docstatus": 0, 
-  "modified": "2014-02-13 16:09:27", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "doctype": "Page", 
-  "icon": "icon-upload", 
-  "module": "Core", 
-  "name": "__common__", 
-  "page_name": "data-import-tool", 
-  "standard": "Yes", 
-  "title": "Data Import Tool"
- }, 
- {
-  "doctype": "Page Role", 
-  "name": "__common__", 
-  "parent": "data-import-tool", 
-  "parentfield": "roles", 
-  "parenttype": "Page", 
-  "role": "System Manager"
- }, 
- {
-  "doctype": "Page", 
-  "name": "data-import-tool"
- }, 
- {
-  "doctype": "Page Role"
- }
-]
\ No newline at end of file
+{
+ "creation": "2012-06-14 15:07:25", 
+ "docstatus": 0, 
+ "doctype": "Page", 
+ "icon": "icon-upload", 
+ "idx": 1, 
+ "modified": "2014-02-13 16:09:27", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "data-import-tool", 
+ "owner": "Administrator", 
+ "page_name": "data-import-tool", 
+ "roles": [
+  {
+   "role": "System Manager"
+  }
+ ], 
+ "standard": "Yes", 
+ "title": "Data Import Tool"
+}
\ No newline at end of file
diff --git a/frappe/core/page/desktop/desktop.txt b/frappe/core/page/desktop/desktop.txt
index c415bd8dae..14013d71ba 100644
--- a/frappe/core/page/desktop/desktop.txt
+++ b/frappe/core/page/desktop/desktop.txt
@@ -1,33 +1,20 @@
-[
- {
-  "creation": "2013-02-14 17:37:37", 
-  "docstatus": 0, 
-  "modified": "2013-07-11 14:41:56", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "doctype": "Page", 
-  "icon": "icon-th", 
-  "module": "Core", 
-  "name": "__common__", 
-  "page_name": "desktop", 
-  "standard": "Yes", 
-  "title": "Desktop"
- }, 
- {
-  "doctype": "Page Role", 
-  "name": "__common__", 
-  "parent": "desktop", 
-  "parentfield": "roles", 
-  "parenttype": "Page", 
-  "role": "All"
- }, 
- {
-  "doctype": "Page", 
-  "name": "desktop"
- }, 
- {
-  "doctype": "Page Role"
- }
-]
\ No newline at end of file
+{
+ "creation": "2013-02-14 17:37:37", 
+ "docstatus": 0, 
+ "doctype": "Page", 
+ "icon": "icon-th", 
+ "idx": 1, 
+ "modified": "2013-07-11 14:41:56", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "desktop", 
+ "owner": "Administrator", 
+ "page_name": "desktop", 
+ "roles": [
+  {
+   "role": "All"
+  }
+ ], 
+ "standard": "Yes", 
+ "title": "Desktop"
+}
\ No newline at end of file
diff --git a/frappe/core/page/messages/messages.txt b/frappe/core/page/messages/messages.txt
index 347a9eaedc..6843dd3907 100644
--- a/frappe/core/page/messages/messages.txt
+++ b/frappe/core/page/messages/messages.txt
@@ -1,33 +1,20 @@
-[
- {
-  "creation": "2012-06-14 18:44:56", 
-  "docstatus": 0, 
-  "modified": "2013-07-11 14:43:32", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "doctype": "Page", 
-  "icon": "icon-envelope", 
-  "module": "Core", 
-  "name": "__common__", 
-  "page_name": "messages", 
-  "standard": "Yes", 
-  "title": "Messages"
- }, 
- {
-  "doctype": "Page Role", 
-  "name": "__common__", 
-  "parent": "messages", 
-  "parentfield": "roles", 
-  "parenttype": "Page", 
-  "role": "All"
- }, 
- {
-  "doctype": "Page", 
-  "name": "messages"
- }, 
- {
-  "doctype": "Page Role"
- }
-]
\ No newline at end of file
+{
+ "creation": "2012-06-14 18:44:56", 
+ "docstatus": 0, 
+ "doctype": "Page", 
+ "icon": "icon-envelope", 
+ "idx": 1, 
+ "modified": "2013-07-11 14:43:32", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "messages", 
+ "owner": "Administrator", 
+ "page_name": "messages", 
+ "roles": [
+  {
+   "role": "All"
+  }
+ ], 
+ "standard": "Yes", 
+ "title": "Messages"
+}
\ No newline at end of file
diff --git a/frappe/core/page/modules_setup/modules_setup.txt b/frappe/core/page/modules_setup/modules_setup.txt
index 4faf9caa2b..a431517190 100644
--- a/frappe/core/page/modules_setup/modules_setup.txt
+++ b/frappe/core/page/modules_setup/modules_setup.txt
@@ -1,33 +1,20 @@
-[
- {
-  "creation": "2012-10-04 18:45:29", 
-  "docstatus": 0, 
-  "modified": "2013-07-11 14:43:37", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "doctype": "Page", 
-  "icon": "icon-cog", 
-  "module": "Core", 
-  "name": "__common__", 
-  "page_name": "modules_setup", 
-  "standard": "Yes", 
-  "title": "Modules Setup"
- }, 
- {
-  "doctype": "Page Role", 
-  "name": "__common__", 
-  "parent": "modules_setup", 
-  "parentfield": "roles", 
-  "parenttype": "Page", 
-  "role": "System Manager"
- }, 
- {
-  "doctype": "Page", 
-  "name": "modules_setup"
- }, 
- {
-  "doctype": "Page Role"
- }
-]
\ No newline at end of file
+{
+ "creation": "2012-10-04 18:45:29", 
+ "docstatus": 0, 
+ "doctype": "Page", 
+ "icon": "icon-cog", 
+ "idx": 1, 
+ "modified": "2013-07-11 14:43:37", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "modules_setup", 
+ "owner": "Administrator", 
+ "page_name": "modules_setup", 
+ "roles": [
+  {
+   "role": "System Manager"
+  }
+ ], 
+ "standard": "Yes", 
+ "title": "Modules Setup"
+}
\ No newline at end of file
diff --git a/frappe/core/page/permission_manager/permission_manager.txt b/frappe/core/page/permission_manager/permission_manager.txt
index e6f239be70..6701977a03 100644
--- a/frappe/core/page/permission_manager/permission_manager.txt
+++ b/frappe/core/page/permission_manager/permission_manager.txt
@@ -1,33 +1,20 @@
-[
- {
-  "creation": "2013-01-01 11:00:01", 
-  "docstatus": 0, 
-  "modified": "2013-07-11 14:43:43", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "doctype": "Page", 
-  "icon": "icon-lock", 
-  "module": "Core", 
-  "name": "__common__", 
-  "page_name": "permission-manager", 
-  "standard": "Yes", 
-  "title": "Permission Manager"
- }, 
- {
-  "doctype": "Page Role", 
-  "name": "__common__", 
-  "parent": "permission-manager", 
-  "parentfield": "roles", 
-  "parenttype": "Page", 
-  "role": "System Manager"
- }, 
- {
-  "doctype": "Page", 
-  "name": "permission-manager"
- }, 
- {
-  "doctype": "Page Role"
- }
-]
\ No newline at end of file
+{
+ "creation": "2013-01-01 11:00:01", 
+ "docstatus": 0, 
+ "doctype": "Page", 
+ "icon": "icon-lock", 
+ "idx": 1, 
+ "modified": "2013-07-11 14:43:43", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "permission-manager", 
+ "owner": "Administrator", 
+ "page_name": "permission-manager", 
+ "roles": [
+  {
+   "role": "System Manager"
+  }
+ ], 
+ "standard": "Yes", 
+ "title": "Permission Manager"
+}
\ No newline at end of file
diff --git a/frappe/core/page/user_properties/user_properties.txt b/frappe/core/page/user_properties/user_properties.txt
index 12271ee239..6313f005aa 100644
--- a/frappe/core/page/user_properties/user_properties.txt
+++ b/frappe/core/page/user_properties/user_properties.txt
@@ -1,33 +1,20 @@
-[
- {
-  "creation": "2013-01-01 18:50:55", 
-  "docstatus": 0, 
-  "modified": "2014-03-13 11:11:56", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "doctype": "Page", 
-  "icon": "icon-user", 
-  "module": "Core", 
-  "name": "__common__", 
-  "page_name": "user-properties", 
-  "standard": "Yes", 
-  "title": "User Properties"
- }, 
- {
-  "doctype": "Page Role", 
-  "name": "__common__", 
-  "parent": "user-properties", 
-  "parentfield": "roles", 
-  "parenttype": "Page", 
-  "role": "System Manager"
- }, 
- {
-  "doctype": "Page", 
-  "name": "user-properties"
- }, 
- {
-  "doctype": "Page Role"
- }
-]
\ No newline at end of file
+{
+ "creation": "2013-01-01 18:50:55", 
+ "docstatus": 0, 
+ "doctype": "Page", 
+ "icon": "icon-user", 
+ "idx": 1, 
+ "modified": "2014-03-13 11:11:56", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "user-properties", 
+ "owner": "Administrator", 
+ "page_name": "user-properties", 
+ "roles": [
+  {
+   "role": "System Manager"
+  }
+ ], 
+ "standard": "Yes", 
+ "title": "User Properties"
+}
\ No newline at end of file
diff --git a/frappe/core/report/todo/todo.txt b/frappe/core/report/todo/todo.txt
index 7c208e5139..a4a2d163ec 100644
--- a/frappe/core/report/todo/todo.txt
+++ b/frappe/core/report/todo/todo.txt
@@ -1,22 +1,15 @@
-[
- {
-  "creation": "2013-02-25 14:26:30", 
-  "docstatus": 0, 
-  "modified": "2014-03-07 15:30:27", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "doctype": "Report", 
-  "is_standard": "Yes", 
-  "module": "Core", 
-  "name": "__common__", 
-  "ref_doctype": "ToDo", 
-  "report_name": "ToDo", 
-  "report_type": "Script Report"
- }, 
- {
-  "doctype": "Report", 
-  "name": "ToDo"
- }
-]
\ No newline at end of file
+{
+ "creation": "2013-02-25 14:26:30", 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 1, 
+ "is_standard": "Yes", 
+ "modified": "2014-03-07 15:30:27", 
+ "modified_by": "Administrator", 
+ "module": "Core", 
+ "name": "ToDo", 
+ "owner": "Administrator", 
+ "ref_doctype": "ToDo", 
+ "report_name": "ToDo", 
+ "report_type": "Script Report"
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/about_us_settings/about_us_settings.txt b/frappe/website/doctype/about_us_settings/about_us_settings.txt
index 956117c78c..e342d7b6fd 100644
--- a/frappe/website/doctype/about_us_settings/about_us_settings.txt
+++ b/frappe/website/doctype/about_us_settings/about_us_settings.txt
@@ -1,112 +1,101 @@
-[
- {
-  "creation": "2013-03-19 12:02:15", 
-  "docstatus": 0, 
-  "modified": "2013-12-20 19:22:52", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_attach": 1, 
-  "description": "Settings for the About Us Page", 
-  "doctype": "DocType", 
-  "document_type": "Other", 
-  "icon": "icon-group", 
-  "issingle": 1, 
-  "module": "Website", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "About Us Settings", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "read_only": 0
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "About Us Settings", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "report": 0, 
-  "role": "Website Manager", 
-  "submit": 0, 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "About Us Settings"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "help", 
-  "fieldtype": "HTML", 
-  "label": "Help", 
-  "options": "<div class=\"alert\">Link for About Us Page is \"/about\"</div>"
- }, 
- {
-  "description": "Introduce your company to the website visitor.", 
-  "doctype": "DocField", 
-  "fieldname": "company_introduction", 
-  "fieldtype": "Text Editor", 
-  "label": "Company Introduction"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "sb0", 
-  "fieldtype": "Section Break", 
-  "label": "Org History"
- }, 
- {
-  "description": "\"Company History\"", 
-  "doctype": "DocField", 
-  "fieldname": "company_history_heading", 
-  "fieldtype": "Data", 
-  "label": "Org History Heading"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "company_history", 
-  "fieldtype": "Table", 
-  "label": "Org History", 
-  "options": "Company History"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "sb1", 
-  "fieldtype": "Section Break", 
-  "label": "Team Members"
- }, 
- {
-  "description": "\"Team Members\" or \"Management\"", 
-  "doctype": "DocField", 
-  "fieldname": "team_members_heading", 
-  "fieldtype": "Data", 
-  "label": "Team Members Heading"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "team_members", 
-  "fieldtype": "Table", 
-  "label": "Team Members", 
-  "options": "About Us Team Member"
- }, 
- {
-  "description": "More content for the bottom of the page.", 
-  "doctype": "DocField", 
-  "fieldname": "footer", 
-  "fieldtype": "Text Editor", 
-  "label": "Footer"
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "allow_attach": 1, 
+ "creation": "2013-03-19 12:02:15", 
+ "description": "Settings for the About Us Page", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Other", 
+ "fields": [
+  {
+   "fieldname": "help", 
+   "fieldtype": "HTML", 
+   "label": "Help", 
+   "options": "<div class=\"alert\">Link for About Us Page is \"/about\"</div>", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
+  {
+   "description": "Introduce your company to the website visitor.", 
+   "fieldname": "company_introduction", 
+   "fieldtype": "Text Editor", 
+   "label": "Company Introduction", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
+  {
+   "fieldname": "sb0", 
+   "fieldtype": "Section Break", 
+   "label": "Org History", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
+  {
+   "description": "\"Company History\"", 
+   "fieldname": "company_history_heading", 
+   "fieldtype": "Data", 
+   "label": "Org History Heading", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
+  {
+   "fieldname": "company_history", 
+   "fieldtype": "Table", 
+   "label": "Org History", 
+   "options": "Company History", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
+  {
+   "fieldname": "sb1", 
+   "fieldtype": "Section Break", 
+   "label": "Team Members", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
+  {
+   "description": "\"Team Members\" or \"Management\"", 
+   "fieldname": "team_members_heading", 
+   "fieldtype": "Data", 
+   "label": "Team Members Heading", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
+  {
+   "fieldname": "team_members", 
+   "fieldtype": "Table", 
+   "label": "Team Members", 
+   "options": "About Us Team Member", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
+  {
+   "description": "More content for the bottom of the page.", 
+   "fieldname": "footer", 
+   "fieldtype": "Text Editor", 
+   "label": "Footer", 
+   "permlevel": 0, 
+   "read_only": 0
+  }
+ ], 
+ "icon": "icon-group", 
+ "idx": 1, 
+ "issingle": 1, 
+ "modified": "2013-12-20 19:22:52", 
+ "modified_by": "Administrator", 
+ "module": "Website", 
+ "name": "About Us Settings", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "create": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Website Manager", 
+   "submit": 0, 
+   "write": 1
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/about_us_team_member/about_us_team_member.txt b/frappe/website/doctype/about_us_team_member/about_us_team_member.txt
index 8d34a53c4f..31f758c492 100644
--- a/frappe/website/doctype/about_us_team_member/about_us_team_member.txt
+++ b/frappe/website/doctype/about_us_team_member/about_us_team_member.txt
@@ -1,52 +1,41 @@
-[
- {
-  "creation": "2013-03-07 11:55:11", 
-  "docstatus": 0, 
-  "modified": "2013-12-20 19:22:52", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "doctype": "DocType", 
-  "istable": 1, 
-  "module": "Website", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "in_list_view": 1, 
-  "name": "__common__", 
-  "parent": "About Us Team Member", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocType", 
-  "name": "About Us Team Member"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "full_name", 
-  "fieldtype": "Data", 
-  "label": "Full Name", 
-  "reqd": 1, 
-  "width": "150px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "image_link", 
-  "fieldtype": "Select", 
-  "label": "Image Link", 
-  "options": "attach_files:", 
-  "width": "150px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "bio", 
-  "fieldtype": "Small Text", 
-  "label": "Bio", 
-  "reqd": 1, 
-  "width": "200px"
- }
-]
\ No newline at end of file
+{
+ "creation": "2013-03-07 11:55:11", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "full_name", 
+   "fieldtype": "Data", 
+   "in_list_view": 1, 
+   "label": "Full Name", 
+   "permlevel": 0, 
+   "reqd": 1, 
+   "width": "150px"
+  }, 
+  {
+   "fieldname": "image_link", 
+   "fieldtype": "Select", 
+   "in_list_view": 1, 
+   "label": "Image Link", 
+   "options": "attach_files:", 
+   "permlevel": 0, 
+   "width": "150px"
+  }, 
+  {
+   "fieldname": "bio", 
+   "fieldtype": "Small Text", 
+   "in_list_view": 1, 
+   "label": "Bio", 
+   "permlevel": 0, 
+   "reqd": 1, 
+   "width": "200px"
+  }
+ ], 
+ "idx": 1, 
+ "istable": 1, 
+ "modified": "2013-12-20 19:22:52", 
+ "modified_by": "Administrator", 
+ "module": "Website", 
+ "name": "About Us Team Member", 
+ "owner": "Administrator"
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/blog_category/blog_category.txt b/frappe/website/doctype/blog_category/blog_category.txt
index 3508e60faa..1fea6837f2 100644
--- a/frappe/website/doctype/blog_category/blog_category.txt
+++ b/frappe/website/doctype/blog_category/blog_category.txt
@@ -1,90 +1,75 @@
-[
- {
-  "creation": "2013-03-08 09:41:11", 
-  "docstatus": 0, 
-  "modified": "2014-02-18 15:25:05", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_import": 1, 
-  "autoname": "field:category_name", 
-  "doctype": "DocType", 
-  "document_type": "Master", 
-  "icon": "icon-tag", 
-  "module": "Website", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Blog Category", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "cancel": 0, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Blog Category", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Blog Category"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "category_name", 
-  "fieldtype": "Data", 
-  "label": "Category Name", 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "title", 
-  "fieldtype": "Data", 
-  "label": "Title", 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "published", 
-  "fieldtype": "Check", 
-  "label": "Published"
- }, 
- {
-  "default": "blog", 
-  "doctype": "DocField", 
-  "fieldname": "parent_website_route", 
-  "fieldtype": "Link", 
-  "label": "Parent Website Route", 
-  "options": "Website Route", 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "page_name", 
-  "fieldtype": "Data", 
-  "label": "Page Name"
- }, 
- {
-  "create": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "report": 1, 
-  "role": "Website Manager", 
-  "write": 1
- }, 
- {
-  "delete": 0, 
-  "doctype": "DocPerm", 
-  "role": "Blogger"
- }
-]
\ No newline at end of file
+{
+ "allow_import": 1, 
+ "autoname": "field:category_name", 
+ "creation": "2013-03-08 09:41:11", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Master", 
+ "fields": [
+  {
+   "fieldname": "category_name", 
+   "fieldtype": "Data", 
+   "label": "Category Name", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "title", 
+   "fieldtype": "Data", 
+   "label": "Title", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "published", 
+   "fieldtype": "Check", 
+   "label": "Published", 
+   "permlevel": 0
+  }, 
+  {
+   "default": "blog", 
+   "fieldname": "parent_website_route", 
+   "fieldtype": "Link", 
+   "label": "Parent Website Route", 
+   "options": "Website Route", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "page_name", 
+   "fieldtype": "Data", 
+   "label": "Page Name", 
+   "permlevel": 0
+  }
+ ], 
+ "icon": "icon-tag", 
+ "idx": 1, 
+ "modified": "2014-02-18 15:25:05", 
+ "modified_by": "Administrator", 
+ "module": "Website", 
+ "name": "Blog Category", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Website Manager", 
+   "write": 1
+  }, 
+  {
+   "cancel": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "role": "Blogger"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/blog_post/blog_post.txt b/frappe/website/doctype/blog_post/blog_post.txt
index 84be241b19..70f50b8fe9 100644
--- a/frappe/website/doctype/blog_post/blog_post.txt
+++ b/frappe/website/doctype/blog_post/blog_post.txt
@@ -1,149 +1,144 @@
-[
- {
-  "creation": "2013-03-28 10:35:30", 
-  "docstatus": 0, 
-  "modified": "2014-02-20 12:55:07", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_attach": 1, 
-  "allow_import": 1, 
-  "doctype": "DocType", 
-  "icon": "icon-quote-left", 
-  "max_attachments": 5, 
-  "module": "Website", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Blog Post", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "cancel": 0, 
-  "delete": 0, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Blog Post", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "report": 1, 
-  "submit": 0
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Blog Post"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "title", 
-  "fieldtype": "Data", 
-  "label": "Title", 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "published_on", 
-  "fieldtype": "Date", 
-  "label": "Published On"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "published", 
-  "fieldtype": "Check", 
-  "label": "Published"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break_3", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "blogger", 
-  "fieldtype": "Link", 
-  "in_list_view": 1, 
-  "label": "Blogger", 
-  "options": "Blogger", 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "blog_category", 
-  "fieldtype": "Link", 
-  "in_list_view": 1, 
-  "label": "Blog Category", 
-  "options": "Blog Category"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "parent_website_route", 
-  "fieldtype": "Link", 
-  "hidden": 1, 
-  "label": "Parent Website Route", 
-  "options": "Website Route", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "section_break_5", 
-  "fieldtype": "Section Break"
- }, 
- {
-  "description": "Description for listing page, in plain text, only a couple of lines. (max 140 characters)", 
-  "doctype": "DocField", 
-  "fieldname": "blog_intro", 
-  "fieldtype": "Small Text", 
-  "in_list_view": 1, 
-  "label": "Blog Intro", 
-  "reqd": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "content", 
-  "fieldtype": "Text Editor", 
-  "label": "Content", 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "page_name", 
-  "fieldtype": "Data", 
-  "hidden": 1, 
-  "label": "Page Name", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "email_sent", 
-  "fieldtype": "Check", 
-  "hidden": 1, 
-  "label": "Email Sent"
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "restrict": 1, 
-  "role": "Website Manager", 
-  "write": 1
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "role": "Blogger", 
-  "write": 1
- }, 
- {
-  "doctype": "DocPerm", 
-  "role": "Guest", 
-  "write": 0
- }
-]
\ No newline at end of file
+{
+ "allow_attach": 1, 
+ "allow_import": 1, 
+ "creation": "2013-03-28 10:35:30", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "title", 
+   "fieldtype": "Data", 
+   "label": "Title", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "published_on", 
+   "fieldtype": "Date", 
+   "label": "Published On", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "published", 
+   "fieldtype": "Check", 
+   "label": "Published", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "blogger", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Blogger", 
+   "options": "Blogger", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "blog_category", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Blog Category", 
+   "options": "Blog Category", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "parent_website_route", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "label": "Parent Website Route", 
+   "options": "Website Route", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Description for listing page, in plain text, only a couple of lines. (max 140 characters)", 
+   "fieldname": "blog_intro", 
+   "fieldtype": "Small Text", 
+   "in_list_view": 1, 
+   "label": "Blog Intro", 
+   "permlevel": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "content", 
+   "fieldtype": "Text Editor", 
+   "label": "Content", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "page_name", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "label": "Page Name", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "email_sent", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "label": "Email Sent", 
+   "permlevel": 0
+  }
+ ], 
+ "icon": "icon-quote-left", 
+ "idx": 1, 
+ "max_attachments": 5, 
+ "modified": "2014-02-20 12:55:07", 
+ "modified_by": "Administrator", 
+ "module": "Website", 
+ "name": "Blog Post", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "restrict": 1, 
+   "role": "Website Manager", 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Blogger", 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "cancel": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Guest", 
+   "submit": 0, 
+   "write": 0
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/blog_settings/blog_settings.txt b/frappe/website/doctype/blog_settings/blog_settings.txt
index 8581e7982d..7510537b7f 100644
--- a/frappe/website/doctype/blog_settings/blog_settings.txt
+++ b/frappe/website/doctype/blog_settings/blog_settings.txt
@@ -1,64 +1,45 @@
-[
- {
-  "creation": "2013-03-11 17:48:16", 
-  "docstatus": 0, 
-  "modified": "2013-12-20 19:22:56", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "description": "Blog Settings", 
-  "doctype": "DocType", 
-  "icon": "icon-cog", 
-  "issingle": 1, 
-  "module": "Website", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Blog Settings", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Blog Settings", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "role": "Website Manager", 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Blog Settings"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "blog_title", 
-  "fieldtype": "Data", 
-  "label": "Blog Title"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "blog_introduction", 
-  "fieldtype": "Small Text", 
-  "label": "Blog Introduction"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "writers_introduction", 
-  "fieldtype": "Small Text", 
-  "label": "Writers Introduction"
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "creation": "2013-03-11 17:48:16", 
+ "description": "Blog Settings", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "blog_title", 
+   "fieldtype": "Data", 
+   "label": "Blog Title", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "blog_introduction", 
+   "fieldtype": "Small Text", 
+   "label": "Blog Introduction", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "writers_introduction", 
+   "fieldtype": "Small Text", 
+   "label": "Writers Introduction", 
+   "permlevel": 0
+  }
+ ], 
+ "icon": "icon-cog", 
+ "idx": 1, 
+ "issingle": 1, 
+ "modified": "2013-12-20 19:22:56", 
+ "modified_by": "Administrator", 
+ "module": "Website", 
+ "name": "Blog Settings", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "create": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "role": "Website Manager", 
+   "write": 1
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/blogger/blogger.txt b/frappe/website/doctype/blogger/blogger.txt
index 3d7f343ea2..143ab0245c 100644
--- a/frappe/website/doctype/blogger/blogger.txt
+++ b/frappe/website/doctype/blogger/blogger.txt
@@ -1,104 +1,89 @@
-[
- {
-  "creation": "2013-03-25 16:00:51", 
-  "docstatus": 0, 
-  "modified": "2013-12-20 19:23:58", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_attach": 1, 
-  "allow_import": 1, 
-  "autoname": "field:short_name", 
-  "description": "User ID of a Blogger", 
-  "doctype": "DocType", 
-  "document_type": "Master", 
-  "icon": "icon-user", 
-  "max_attachments": 1, 
-  "module": "Website", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Blogger", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Blogger", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Blogger"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "disabled", 
-  "fieldtype": "Check", 
-  "label": "Disabled"
- }, 
- {
-  "description": "Will be used in url (usually first name).", 
-  "doctype": "DocField", 
-  "fieldname": "short_name", 
-  "fieldtype": "Data", 
-  "label": "Short Name", 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "full_name", 
-  "fieldtype": "Data", 
-  "in_list_view": 1, 
-  "label": "Full Name", 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "user", 
-  "fieldtype": "Link", 
-  "label": "User", 
-  "options": "User"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "bio", 
-  "fieldtype": "Small Text", 
-  "label": "Bio"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "avatar", 
-  "fieldtype": "Select", 
-  "label": "Avatar", 
-  "options": "attach_files:"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "posts", 
-  "fieldtype": "Int", 
-  "in_list_view": 1, 
-  "label": "Posts", 
-  "read_only": 1
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "role": "Website Manager"
- }, 
- {
-  "doctype": "DocPerm", 
-  "role": "Blogger"
- }
-]
\ No newline at end of file
+{
+ "allow_attach": 1, 
+ "allow_import": 1, 
+ "autoname": "field:short_name", 
+ "creation": "2013-03-25 16:00:51", 
+ "description": "User ID of a Blogger", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Master", 
+ "fields": [
+  {
+   "fieldname": "disabled", 
+   "fieldtype": "Check", 
+   "label": "Disabled", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Will be used in url (usually first name).", 
+   "fieldname": "short_name", 
+   "fieldtype": "Data", 
+   "label": "Short Name", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "full_name", 
+   "fieldtype": "Data", 
+   "in_list_view": 1, 
+   "label": "Full Name", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "user", 
+   "fieldtype": "Link", 
+   "label": "User", 
+   "options": "User", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "bio", 
+   "fieldtype": "Small Text", 
+   "label": "Bio", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "avatar", 
+   "fieldtype": "Select", 
+   "label": "Avatar", 
+   "options": "attach_files:", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "posts", 
+   "fieldtype": "Int", 
+   "in_list_view": 1, 
+   "label": "Posts", 
+   "permlevel": 0, 
+   "read_only": 1
+  }
+ ], 
+ "icon": "icon-user", 
+ "idx": 1, 
+ "max_attachments": 1, 
+ "modified": "2013-12-20 19:23:58", 
+ "modified_by": "Administrator", 
+ "module": "Website", 
+ "name": "Blogger", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "create": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "role": "Website Manager", 
+   "write": 1
+  }, 
+  {
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "role": "Blogger", 
+   "write": 1
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/company_history/company_history.txt b/frappe/website/doctype/company_history/company_history.txt
index e605049a48..d3eef62a42 100644
--- a/frappe/website/doctype/company_history/company_history.txt
+++ b/frappe/website/doctype/company_history/company_history.txt
@@ -1,42 +1,30 @@
-[
- {
-  "creation": "2013-02-22 01:28:08", 
-  "docstatus": 0, 
-  "modified": "2013-12-20 19:23:01", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "doctype": "DocType", 
-  "istable": 1, 
-  "module": "Website", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "in_list_view": 1, 
-  "name": "__common__", 
-  "parent": "Company History", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Company History"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "year", 
-  "fieldtype": "Data", 
-  "label": "Year"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "highlight", 
-  "fieldtype": "Text", 
-  "label": "Highlight", 
-  "print_width": "300px", 
-  "width": "300px"
- }
-]
\ No newline at end of file
+{
+ "creation": "2013-02-22 01:28:08", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "year", 
+   "fieldtype": "Data", 
+   "in_list_view": 1, 
+   "label": "Year", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "highlight", 
+   "fieldtype": "Text", 
+   "in_list_view": 1, 
+   "label": "Highlight", 
+   "permlevel": 0, 
+   "print_width": "300px", 
+   "width": "300px"
+  }
+ ], 
+ "idx": 1, 
+ "istable": 1, 
+ "modified": "2013-12-20 19:23:01", 
+ "modified_by": "Administrator", 
+ "module": "Website", 
+ "name": "Company History", 
+ "owner": "Administrator"
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/contact_us_settings/contact_us_settings.txt b/frappe/website/doctype/contact_us_settings/contact_us_settings.txt
index cadce62a63..120d4feef5 100644
--- a/frappe/website/doctype/contact_us_settings/contact_us_settings.txt
+++ b/frappe/website/doctype/contact_us_settings/contact_us_settings.txt
@@ -1,137 +1,118 @@
-[
- {
-  "creation": "2013-02-21 20:12:42", 
-  "docstatus": 0, 
-  "modified": "2014-02-28 11:32:25", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "description": "Settings for Contact Us Page", 
-  "doctype": "DocType", 
-  "icon": "icon-cog", 
-  "issingle": 1, 
-  "module": "Website", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Contact Us Settings", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Contact Us Settings", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "report": 0, 
-  "role": "Website Manager", 
-  "submit": 0, 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Contact Us Settings"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "help", 
-  "fieldtype": "HTML", 
-  "label": "Help", 
-  "options": "<div class=\"alert alert-info\">Link for Contact Page is \"/contact\"</div>"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "introduction_section", 
-  "fieldtype": "Section Break", 
-  "label": "Introduction"
- }, 
- {
-  "description": "Send enquiries to this email address", 
-  "doctype": "DocField", 
-  "fieldname": "forward_to_email", 
-  "fieldtype": "Data", 
-  "label": "Forward To Email Address"
- }, 
- {
-  "description": "Default: \"Contact Us\"", 
-  "doctype": "DocField", 
-  "fieldname": "heading", 
-  "fieldtype": "Data", 
-  "label": "Heading"
- }, 
- {
-  "description": "Introductory information for the Contact Us Page", 
-  "doctype": "DocField", 
-  "fieldname": "introduction", 
-  "fieldtype": "Text Editor", 
-  "label": "Introduction"
- }, 
- {
-  "description": "Contact options, like \"Sales Query, Support Query\" etc each on a new line or separated by commas.", 
-  "doctype": "DocField", 
-  "fieldname": "query_options", 
-  "fieldtype": "Small Text", 
-  "label": "Query Options"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "address", 
-  "fieldtype": "Section Break", 
-  "label": "Address"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "address_title", 
-  "fieldtype": "Data", 
-  "label": "Address Title"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "address_line1", 
-  "fieldtype": "Data", 
-  "label": "Address Line 1"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "address_line2", 
-  "fieldtype": "Data", 
-  "label": "Address Line 2"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "city", 
-  "fieldtype": "Data", 
-  "label": "City"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "state", 
-  "fieldtype": "Data", 
-  "label": "State"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "pincode", 
-  "fieldtype": "Data", 
-  "label": "Pincode"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "country", 
-  "fieldtype": "Data", 
-  "label": "Country"
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "creation": "2013-02-21 20:12:42", 
+ "description": "Settings for Contact Us Page", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "help", 
+   "fieldtype": "HTML", 
+   "label": "Help", 
+   "options": "<div class=\"alert alert-info\">Link for Contact Page is \"/contact\"</div>", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "introduction_section", 
+   "fieldtype": "Section Break", 
+   "label": "Introduction", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Send enquiries to this email address", 
+   "fieldname": "forward_to_email", 
+   "fieldtype": "Data", 
+   "label": "Forward To Email Address", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Default: \"Contact Us\"", 
+   "fieldname": "heading", 
+   "fieldtype": "Data", 
+   "label": "Heading", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Introductory information for the Contact Us Page", 
+   "fieldname": "introduction", 
+   "fieldtype": "Text Editor", 
+   "label": "Introduction", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Contact options, like \"Sales Query, Support Query\" etc each on a new line or separated by commas.", 
+   "fieldname": "query_options", 
+   "fieldtype": "Small Text", 
+   "label": "Query Options", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "address", 
+   "fieldtype": "Section Break", 
+   "label": "Address", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "address_title", 
+   "fieldtype": "Data", 
+   "label": "Address Title", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "address_line1", 
+   "fieldtype": "Data", 
+   "label": "Address Line 1", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "address_line2", 
+   "fieldtype": "Data", 
+   "label": "Address Line 2", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "city", 
+   "fieldtype": "Data", 
+   "label": "City", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "state", 
+   "fieldtype": "Data", 
+   "label": "State", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "pincode", 
+   "fieldtype": "Data", 
+   "label": "Pincode", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "country", 
+   "fieldtype": "Data", 
+   "label": "Country", 
+   "permlevel": 0
+  }
+ ], 
+ "icon": "icon-cog", 
+ "idx": 1, 
+ "issingle": 1, 
+ "modified": "2014-02-28 11:32:25", 
+ "modified_by": "Administrator", 
+ "module": "Website", 
+ "name": "Contact Us Settings", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "create": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Website Manager", 
+   "submit": 0, 
+   "write": 1
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/post/post.txt b/frappe/website/doctype/post/post.txt
index a9970af463..d519e75168 100644
--- a/frappe/website/doctype/post/post.txt
+++ b/frappe/website/doctype/post/post.txt
@@ -1,147 +1,128 @@
-[
- {
-  "creation": "2014-01-07 14:00:04", 
-  "docstatus": 0, 
-  "modified": "2014-03-03 14:53:19", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "autoname": "P.#######", 
-  "doctype": "DocType", 
-  "document_type": "Transaction", 
-  "icon": "icon-comment", 
-  "module": "Website", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Post", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "cancel": 0, 
-  "create": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "export": 1, 
-  "name": "__common__", 
-  "parent": "Post", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "read": 1, 
-  "report": 1, 
-  "role": "System Manager", 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Post"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "title", 
-  "fieldtype": "Data", 
-  "label": "Title", 
-  "reqd": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "content", 
-  "fieldtype": "Text", 
-  "in_list_view": 1, 
-  "label": "Content", 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "picture_url", 
-  "fieldtype": "Attach", 
-  "label": "Picture URL"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "website_group", 
-  "fieldtype": "Link", 
-  "in_list_view": 1, 
-  "label": "Website Group", 
-  "options": "Website Group", 
-  "reqd": 1, 
-  "search_index": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "is_event", 
-  "fieldtype": "Check", 
-  "label": "Is Event"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "event_datetime", 
-  "fieldtype": "Datetime", 
-  "label": "Event Datetime"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "is_task", 
-  "fieldtype": "Check", 
-  "label": "Is Task"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "assigned_to", 
-  "fieldtype": "Link", 
-  "label": "Assigned To", 
-  "options": "User"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "assigned_to_fullname", 
-  "fieldtype": "Data", 
-  "label": "Assigned To Fullname"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "status", 
-  "fieldtype": "Select", 
-  "label": "Status", 
-  "options": "\nOpen\nClosed", 
-  "reqd": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "parent_post", 
-  "fieldtype": "Link", 
-  "in_list_view": 1, 
-  "label": "Parent Post", 
-  "options": "Post", 
-  "search_index": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "unsubscribe", 
-  "fieldtype": "Check", 
-  "label": "Unsubscribe"
- }, 
- {
-  "default": "0", 
-  "doctype": "DocField", 
-  "fieldname": "upvotes", 
-  "fieldtype": "Int", 
-  "label": "Upvotes"
- }, 
- {
-  "default": "0", 
-  "doctype": "DocField", 
-  "fieldname": "replies", 
-  "fieldtype": "Int", 
-  "label": "Replies"
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "autoname": "P.#######", 
+ "creation": "2014-01-07 14:00:04", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Transaction", 
+ "fields": [
+  {
+   "fieldname": "title", 
+   "fieldtype": "Data", 
+   "label": "Title", 
+   "permlevel": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "content", 
+   "fieldtype": "Text", 
+   "in_list_view": 1, 
+   "label": "Content", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "picture_url", 
+   "fieldtype": "Attach", 
+   "label": "Picture URL", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "website_group", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Website Group", 
+   "options": "Website Group", 
+   "permlevel": 0, 
+   "reqd": 1, 
+   "search_index": 1
+  }, 
+  {
+   "fieldname": "is_event", 
+   "fieldtype": "Check", 
+   "label": "Is Event", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "event_datetime", 
+   "fieldtype": "Datetime", 
+   "label": "Event Datetime", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "is_task", 
+   "fieldtype": "Check", 
+   "label": "Is Task", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "assigned_to", 
+   "fieldtype": "Link", 
+   "label": "Assigned To", 
+   "options": "User", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "assigned_to_fullname", 
+   "fieldtype": "Data", 
+   "label": "Assigned To Fullname", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "label": "Status", 
+   "options": "\nOpen\nClosed", 
+   "permlevel": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "parent_post", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Parent Post", 
+   "options": "Post", 
+   "permlevel": 0, 
+   "search_index": 1
+  }, 
+  {
+   "fieldname": "unsubscribe", 
+   "fieldtype": "Check", 
+   "label": "Unsubscribe", 
+   "permlevel": 0
+  }, 
+  {
+   "default": "0", 
+   "fieldname": "upvotes", 
+   "fieldtype": "Int", 
+   "label": "Upvotes", 
+   "permlevel": 0
+  }, 
+  {
+   "default": "0", 
+   "fieldname": "replies", 
+   "fieldtype": "Int", 
+   "label": "Replies", 
+   "permlevel": 0
+  }
+ ], 
+ "icon": "icon-comment", 
+ "idx": 1, 
+ "modified": "2014-03-03 14:53:19", 
+ "modified_by": "Administrator", 
+ "module": "Website", 
+ "name": "Post", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "export": 1, 
+   "permlevel": 0, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "write": 1
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/style_settings/style_settings.txt b/frappe/website/doctype/style_settings/style_settings.txt
index 3582672e71..6f4022e48f 100644
--- a/frappe/website/doctype/style_settings/style_settings.txt
+++ b/frappe/website/doctype/style_settings/style_settings.txt
@@ -1,203 +1,187 @@
-[
- {
-  "creation": "2013-03-25 16:01:33", 
-  "docstatus": 0, 
-  "modified": "2013-12-20 19:22:48", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_attach": 1, 
-  "description": "Set your background color, font and image (tiled)", 
-  "doctype": "DocType", 
-  "icon": "icon-cog", 
-  "issingle": 1, 
-  "max_attachments": 1, 
-  "module": "Website", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Style Settings", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocPerm", 
-  "name": "__common__", 
-  "parent": "Style Settings", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "read": 1, 
-  "report": 0, 
-  "role": "Website Manager", 
-  "submit": 0
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Style Settings"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "color", 
-  "fieldtype": "Section Break", 
-  "label": "Color"
- }, 
- {
-  "description": "If image is selected, color will be ignored (attach first)", 
-  "doctype": "DocField", 
-  "fieldname": "background_image", 
-  "fieldtype": "Select", 
-  "label": "Background Image", 
-  "options": "attach_files:"
- }, 
- {
-  "description": "Solid background color (default light gray)", 
-  "doctype": "DocField", 
-  "fieldname": "background_color", 
-  "fieldtype": "Data", 
-  "label": "Background Color"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "page_background", 
-  "fieldtype": "Data", 
-  "label": "Page Background"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "page_border", 
-  "fieldtype": "Check", 
-  "label": "Page Border"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "page_headings", 
-  "fieldtype": "Data", 
-  "label": "Page Headings"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "page_text", 
-  "fieldtype": "Data", 
-  "label": "Page Text"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "page_links", 
-  "fieldtype": "Data", 
-  "label": "Page Links"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "cb0", 
-  "fieldtype": "Column Break", 
-  "label": "Top Bar", 
-  "print_width": "50%", 
-  "width": "50%"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "top_bar_background", 
-  "fieldtype": "Data", 
-  "label": "Top Bar Background"
- }, 
- {
-  "description": "000 is black, fff is white", 
-  "doctype": "DocField", 
-  "fieldname": "top_bar_foreground", 
-  "fieldtype": "Data", 
-  "label": "Top Bar Text"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "fonts", 
-  "fieldtype": "Section Break", 
-  "label": "Fonts"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "heading_font", 
-  "fieldtype": "Select", 
-  "label": "Font (Heading)", 
-  "options": "\nHelvetica Neue\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma\nLato\nOpen Sans"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "font", 
-  "fieldtype": "Select", 
-  "label": "Font (Text)", 
-  "options": "\nHelvetica Neue\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "font_size", 
-  "fieldtype": "Select", 
-  "label": "Font Size (Text)", 
-  "options": "\n12px\n13px\n14px\n15px\n16px\n17px\n18px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "heading_text_as", 
-  "fieldtype": "Select", 
-  "label": "Heading Text As", 
-  "options": "\nUPPERCASE\nTitle Case\nlowercase"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break_13", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "description": "Add the name of <a href=\"http://google.com/webfonts\" target=\"_blank\">Google Web Font</a> e.g. \"Open Sans\"", 
-  "doctype": "DocField", 
-  "fieldname": "google_web_font_for_heading", 
-  "fieldtype": "Data", 
-  "label": "Google Web Font (Heading)"
- }, 
- {
-  "description": "Add the name of <a href=\"http://google.com/webfonts\" target=\"_blank\">Google Web Font</a> e.g. \"Open Sans\"", 
-  "doctype": "DocField", 
-  "fieldname": "google_web_font_for_text", 
-  "fieldtype": "Data", 
-  "label": "Google Web Font (Text)"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "css", 
-  "fieldtype": "Section Break", 
-  "label": "CSS"
- }, 
- {
-  "description": "add your own CSS (careful!)", 
-  "doctype": "DocField", 
-  "fieldname": "add_css", 
-  "fieldtype": "Code", 
-  "label": "Add CSS"
- }, 
- {
-  "description": "Auto generated", 
-  "doctype": "DocField", 
-  "fieldname": "custom_css", 
-  "fieldtype": "Code", 
-  "label": "Custom CSS", 
-  "read_only": 1
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "permlevel": 0, 
-  "print": 1, 
-  "write": 1
- }, 
- {
-  "amend": 0, 
-  "cancel": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "permlevel": 1
- }
-]
\ No newline at end of file
+{
+ "allow_attach": 1, 
+ "creation": "2013-03-25 16:01:33", 
+ "description": "Set your background color, font and image (tiled)", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "color", 
+   "fieldtype": "Section Break", 
+   "label": "Color", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "If image is selected, color will be ignored (attach first)", 
+   "fieldname": "background_image", 
+   "fieldtype": "Select", 
+   "label": "Background Image", 
+   "options": "attach_files:", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Solid background color (default light gray)", 
+   "fieldname": "background_color", 
+   "fieldtype": "Data", 
+   "label": "Background Color", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "page_background", 
+   "fieldtype": "Data", 
+   "label": "Page Background", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "page_border", 
+   "fieldtype": "Check", 
+   "label": "Page Border", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "page_headings", 
+   "fieldtype": "Data", 
+   "label": "Page Headings", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "page_text", 
+   "fieldtype": "Data", 
+   "label": "Page Text", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "page_links", 
+   "fieldtype": "Data", 
+   "label": "Page Links", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "cb0", 
+   "fieldtype": "Column Break", 
+   "label": "Top Bar", 
+   "permlevel": 0, 
+   "print_width": "50%", 
+   "width": "50%"
+  }, 
+  {
+   "fieldname": "top_bar_background", 
+   "fieldtype": "Data", 
+   "label": "Top Bar Background", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "000 is black, fff is white", 
+   "fieldname": "top_bar_foreground", 
+   "fieldtype": "Data", 
+   "label": "Top Bar Text", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "fonts", 
+   "fieldtype": "Section Break", 
+   "label": "Fonts", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "heading_font", 
+   "fieldtype": "Select", 
+   "label": "Font (Heading)", 
+   "options": "\nHelvetica Neue\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma\nLato\nOpen Sans", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "font", 
+   "fieldtype": "Select", 
+   "label": "Font (Text)", 
+   "options": "\nHelvetica Neue\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "font_size", 
+   "fieldtype": "Select", 
+   "label": "Font Size (Text)", 
+   "options": "\n12px\n13px\n14px\n15px\n16px\n17px\n18px", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "heading_text_as", 
+   "fieldtype": "Select", 
+   "label": "Heading Text As", 
+   "options": "\nUPPERCASE\nTitle Case\nlowercase", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "column_break_13", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Add the name of <a href=\"http://google.com/webfonts\" target=\"_blank\">Google Web Font</a> e.g. \"Open Sans\"", 
+   "fieldname": "google_web_font_for_heading", 
+   "fieldtype": "Data", 
+   "label": "Google Web Font (Heading)", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Add the name of <a href=\"http://google.com/webfonts\" target=\"_blank\">Google Web Font</a> e.g. \"Open Sans\"", 
+   "fieldname": "google_web_font_for_text", 
+   "fieldtype": "Data", 
+   "label": "Google Web Font (Text)", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "css", 
+   "fieldtype": "Section Break", 
+   "label": "CSS", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "add your own CSS (careful!)", 
+   "fieldname": "add_css", 
+   "fieldtype": "Code", 
+   "label": "Add CSS", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Auto generated", 
+   "fieldname": "custom_css", 
+   "fieldtype": "Code", 
+   "label": "Custom CSS", 
+   "permlevel": 0, 
+   "read_only": 1
+  }
+ ], 
+ "icon": "icon-cog", 
+ "idx": 1, 
+ "issingle": 1, 
+ "max_attachments": 1, 
+ "modified": "2013-12-20 19:22:48", 
+ "modified_by": "Administrator", 
+ "module": "Website", 
+ "name": "Style Settings", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "create": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Website Manager", 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "permlevel": 1, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Website Manager", 
+   "submit": 0
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/top_bar_item/top_bar_item.txt b/frappe/website/doctype/top_bar_item/top_bar_item.txt
index e5ee3aeaca..cff2f817ed 100644
--- a/frappe/website/doctype/top_bar_item/top_bar_item.txt
+++ b/frappe/website/doctype/top_bar_item/top_bar_item.txt
@@ -1,60 +1,50 @@
-[
- {
-  "creation": "2013-02-22 01:28:08", 
-  "docstatus": 0, 
-  "modified": "2013-12-20 19:21:53", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "doctype": "DocType", 
-  "istable": 1, 
-  "module": "Website", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "in_list_view": 1, 
-  "name": "__common__", 
-  "parent": "Top Bar Item", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Top Bar Item"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "label", 
-  "fieldtype": "Data", 
-  "label": "Label", 
-  "print_width": "120px", 
-  "width": "120px"
- }, 
- {
-  "description": "If you set this, this Item will come in a drop-down under the selected parent.", 
-  "doctype": "DocField", 
-  "fieldname": "parent_label", 
-  "fieldtype": "Select", 
-  "label": "Parent Label"
- }, 
- {
-  "description": "Link to the page you want to open", 
-  "doctype": "DocField", 
-  "fieldname": "url", 
-  "fieldtype": "Data", 
-  "label": "URL", 
-  "print_width": "200px", 
-  "width": "200px"
- }, 
- {
-  "description": "Select target = \"_blank\" to open in a new page.", 
-  "doctype": "DocField", 
-  "fieldname": "target", 
-  "fieldtype": "Select", 
-  "label": "Target", 
-  "options": "\ntarget = \"_blank\""
- }
-]
\ No newline at end of file
+{
+ "creation": "2013-02-22 01:28:08", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "label", 
+   "fieldtype": "Data", 
+   "in_list_view": 1, 
+   "label": "Label", 
+   "permlevel": 0, 
+   "print_width": "120px", 
+   "width": "120px"
+  }, 
+  {
+   "description": "If you set this, this Item will come in a drop-down under the selected parent.", 
+   "fieldname": "parent_label", 
+   "fieldtype": "Select", 
+   "in_list_view": 1, 
+   "label": "Parent Label", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Link to the page you want to open", 
+   "fieldname": "url", 
+   "fieldtype": "Data", 
+   "in_list_view": 1, 
+   "label": "URL", 
+   "permlevel": 0, 
+   "print_width": "200px", 
+   "width": "200px"
+  }, 
+  {
+   "description": "Select target = \"_blank\" to open in a new page.", 
+   "fieldname": "target", 
+   "fieldtype": "Select", 
+   "in_list_view": 1, 
+   "label": "Target", 
+   "options": "\ntarget = \"_blank\"", 
+   "permlevel": 0
+  }
+ ], 
+ "idx": 1, 
+ "istable": 1, 
+ "modified": "2013-12-20 19:21:53", 
+ "modified_by": "Administrator", 
+ "module": "Website", 
+ "name": "Top Bar Item", 
+ "owner": "Administrator"
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/user_vote/user_vote.txt b/frappe/website/doctype/user_vote/user_vote.txt
index 86bbc7bc02..e46a005642 100644
--- a/frappe/website/doctype/user_vote/user_vote.txt
+++ b/frappe/website/doctype/user_vote/user_vote.txt
@@ -1,61 +1,43 @@
-[
- {
-  "creation": "2014-01-17 16:26:21", 
-  "docstatus": 0, 
-  "modified": "2014-01-21 15:45:30", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "autoname": "_VOTE.#######", 
-  "doctype": "DocType", 
-  "document_type": "Transaction", 
-  "module": "Website", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "User Vote", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "search_index": 0
- }, 
- {
-  "cancel": 0, 
-  "create": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "export": 1, 
-  "name": "__common__", 
-  "parent": "User Vote", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "read": 1, 
-  "report": 1, 
-  "role": "System Manager", 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "User Vote"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "ref_doctype", 
-  "fieldtype": "Link", 
-  "label": "Ref DocType", 
-  "options": "DocType"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "ref_name", 
-  "fieldtype": "Data", 
-  "label": "Ref Name"
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "autoname": "_VOTE.#######", 
+ "creation": "2014-01-17 16:26:21", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Transaction", 
+ "fields": [
+  {
+   "fieldname": "ref_doctype", 
+   "fieldtype": "Link", 
+   "label": "Ref DocType", 
+   "options": "DocType", 
+   "permlevel": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "ref_name", 
+   "fieldtype": "Data", 
+   "label": "Ref Name", 
+   "permlevel": 0, 
+   "search_index": 0
+  }
+ ], 
+ "idx": 1, 
+ "modified": "2014-01-21 15:45:30", 
+ "modified_by": "Administrator", 
+ "module": "Website", 
+ "name": "User Vote", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "export": 1, 
+   "permlevel": 0, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "write": 1
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/web_page/web_page.txt b/frappe/website/doctype/web_page/web_page.txt
index 774e2ddccb..fcdc3a6c52 100644
--- a/frappe/website/doctype/web_page/web_page.txt
+++ b/frappe/website/doctype/web_page/web_page.txt
@@ -1,185 +1,166 @@
-[
- {
-  "creation": "2013-03-28 10:35:30", 
-  "docstatus": 0, 
-  "modified": "2014-02-28 14:24:14", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_attach": 1, 
-  "description": "Page to show on the website\n", 
-  "doctype": "DocType", 
-  "document_type": "Transaction", 
-  "icon": "icon-file-alt", 
-  "max_attachments": 20, 
-  "module": "Website", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Web Page", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "cancel": 0, 
-  "create": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Web Page", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "report": 1, 
-  "role": "Website Manager", 
-  "submit": 0, 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Web Page"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "section_title", 
-  "fieldtype": "Section Break", 
-  "label": "Title"
- }, 
- {
-  "description": "Title / headline of your page", 
-  "doctype": "DocField", 
-  "fieldname": "title", 
-  "fieldtype": "Data", 
-  "label": "Title", 
-  "reqd": 1
- }, 
- {
-  "description": "Page url name (auto-generated)", 
-  "doctype": "DocField", 
-  "fieldname": "page_name", 
-  "fieldtype": "Data", 
-  "in_list_view": 1, 
-  "label": "Page Name", 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "parent_website_route", 
-  "fieldtype": "Link", 
-  "label": "Parent Website Page", 
-  "options": "Website Route"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "published", 
-  "fieldtype": "Check", 
-  "label": "Published"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "cb1", 
-  "fieldtype": "Column Break", 
-  "width": "50%"
- }, 
- {
-  "description": "Description for page header.", 
-  "doctype": "DocField", 
-  "fieldname": "description", 
-  "fieldtype": "Small Text", 
-  "label": "Description"
- }, 
- {
-  "description": "Page content", 
-  "doctype": "DocField", 
-  "fieldname": "sb1", 
-  "fieldtype": "Section Break", 
-  "label": "Content"
- }, 
- {
-  "description": "Begin this page with a slideshow of images", 
-  "doctype": "DocField", 
-  "fieldname": "slideshow", 
-  "fieldtype": "Link", 
-  "label": "Slideshow", 
-  "options": "Website Slideshow"
- }, 
- {
-  "description": "Content in markdown format that appears on the main side of your page", 
-  "doctype": "DocField", 
-  "fieldname": "main_section", 
-  "fieldtype": "Text Editor", 
-  "label": "Main Section"
- }, 
- {
-  "depends_on": "eval:!doc.__islocal", 
-  "description": "Link to other pages in the side bar and next section", 
-  "doctype": "DocField", 
-  "fieldname": "sb2", 
-  "fieldtype": "Section Break", 
-  "label": "More"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "enable_comments", 
-  "fieldtype": "Check", 
-  "label": "Enable Comments"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "text_align", 
-  "fieldtype": "Select", 
-  "label": "Text Align", 
-  "options": "Left\nCenter\nRight"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "custom_javascript", 
-  "fieldtype": "Section Break", 
-  "label": "Custom Javascript"
- }, 
- {
-  "description": "Add code as &lt;script&gt;", 
-  "doctype": "DocField", 
-  "fieldname": "insert_code", 
-  "fieldtype": "Check", 
-  "label": "Insert Code"
- }, 
- {
-  "depends_on": "insert_code", 
-  "doctype": "DocField", 
-  "fieldname": "javascript", 
-  "fieldtype": "Code", 
-  "label": "Javascript", 
-  "options": "Javascript"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "custom_css", 
-  "fieldtype": "Section Break", 
-  "label": "Custom CSS"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "insert_style", 
-  "fieldtype": "Check", 
-  "label": "Insert Style"
- }, 
- {
-  "depends_on": "insert_style", 
-  "doctype": "DocField", 
-  "fieldname": "css", 
-  "fieldtype": "Code", 
-  "label": "CSS", 
-  "options": "CSS"
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "allow_attach": 1, 
+ "creation": "2013-03-28 10:35:30", 
+ "description": "Page to show on the website\n", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Transaction", 
+ "fields": [
+  {
+   "fieldname": "section_title", 
+   "fieldtype": "Section Break", 
+   "label": "Title", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Title / headline of your page", 
+   "fieldname": "title", 
+   "fieldtype": "Data", 
+   "label": "Title", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "description": "Page url name (auto-generated)", 
+   "fieldname": "page_name", 
+   "fieldtype": "Data", 
+   "in_list_view": 1, 
+   "label": "Page Name", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
+  {
+   "fieldname": "parent_website_route", 
+   "fieldtype": "Link", 
+   "label": "Parent Website Page", 
+   "options": "Website Route", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "published", 
+   "fieldtype": "Check", 
+   "label": "Published", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "cb1", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
+   "width": "50%"
+  }, 
+  {
+   "description": "Description for page header.", 
+   "fieldname": "description", 
+   "fieldtype": "Small Text", 
+   "label": "Description", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Page content", 
+   "fieldname": "sb1", 
+   "fieldtype": "Section Break", 
+   "label": "Content", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Begin this page with a slideshow of images", 
+   "fieldname": "slideshow", 
+   "fieldtype": "Link", 
+   "label": "Slideshow", 
+   "options": "Website Slideshow", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Content in markdown format that appears on the main side of your page", 
+   "fieldname": "main_section", 
+   "fieldtype": "Text Editor", 
+   "label": "Main Section", 
+   "permlevel": 0
+  }, 
+  {
+   "depends_on": "eval:!doc.__islocal", 
+   "description": "Link to other pages in the side bar and next section", 
+   "fieldname": "sb2", 
+   "fieldtype": "Section Break", 
+   "label": "More", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "enable_comments", 
+   "fieldtype": "Check", 
+   "label": "Enable Comments", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "text_align", 
+   "fieldtype": "Select", 
+   "label": "Text Align", 
+   "options": "Left\nCenter\nRight", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "custom_javascript", 
+   "fieldtype": "Section Break", 
+   "label": "Custom Javascript", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Add code as &lt;script&gt;", 
+   "fieldname": "insert_code", 
+   "fieldtype": "Check", 
+   "label": "Insert Code", 
+   "permlevel": 0
+  }, 
+  {
+   "depends_on": "insert_code", 
+   "fieldname": "javascript", 
+   "fieldtype": "Code", 
+   "label": "Javascript", 
+   "options": "Javascript", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "custom_css", 
+   "fieldtype": "Section Break", 
+   "label": "Custom CSS", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "insert_style", 
+   "fieldtype": "Check", 
+   "label": "Insert Style", 
+   "permlevel": 0
+  }, 
+  {
+   "depends_on": "insert_style", 
+   "fieldname": "css", 
+   "fieldtype": "Code", 
+   "label": "CSS", 
+   "options": "CSS", 
+   "permlevel": 0
+  }
+ ], 
+ "icon": "icon-file-alt", 
+ "idx": 1, 
+ "max_attachments": 20, 
+ "modified": "2014-02-28 14:24:14", 
+ "modified_by": "Administrator", 
+ "module": "Website", 
+ "name": "Web Page", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Website Manager", 
+   "submit": 0, 
+   "write": 1
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/website_group/website_group.txt b/frappe/website/doctype/website_group/website_group.txt
index 65e4942638..c9fa332f65 100644
--- a/frappe/website/doctype/website_group/website_group.txt
+++ b/frappe/website/doctype/website_group/website_group.txt
@@ -1,142 +1,123 @@
-[
- {
-  "creation": "2014-01-29 15:57:42", 
-  "docstatus": 0, 
-  "modified": "2014-03-04 09:36:30", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "doctype": "DocType", 
-  "document_type": "Master", 
-  "icon": "icon-group", 
-  "module": "Website", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Website Group", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "cancel": 0, 
-  "create": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "export": 1, 
-  "name": "__common__", 
-  "parent": "Website Group", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "read": 1, 
-  "report": 1, 
-  "role": "Website Manager", 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Website Group"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "name_and_description", 
-  "fieldtype": "Section Break", 
-  "label": "Name and Description"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "group_name", 
-  "fieldtype": "Data", 
-  "label": "Group Name", 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "group_title", 
-  "fieldtype": "Data", 
-  "label": "Group Title", 
-  "no_copy": 0, 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "group_type", 
-  "fieldtype": "Select", 
-  "label": "Group Type", 
-  "options": "Forum\nTasks\nEvents", 
-  "reqd": 1
- }, 
- {
-  "description": "Display in the sidebar of this Website Route node", 
-  "doctype": "DocField", 
-  "fieldname": "parent_website_route", 
-  "fieldtype": "Link", 
-  "in_list_view": 0, 
-  "label": "Parent Website Page", 
-  "options": "Website Route"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break_6", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "group_description", 
-  "fieldtype": "Text", 
-  "label": "Group Description"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "page_name", 
-  "fieldtype": "Data", 
-  "in_list_view": 1, 
-  "label": "Page Name", 
-  "no_copy": 1, 
-  "reqd": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "details", 
-  "fieldtype": "Section Break", 
-  "label": "Details"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "public_read", 
-  "fieldtype": "Check", 
-  "label": "Anyone Can Read"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "public_write", 
-  "fieldtype": "Check", 
-  "label": "Anyone Can Write"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break_12", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "upvotes", 
-  "fieldtype": "Int", 
-  "label": "Upvotes", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "replies", 
-  "fieldtype": "Int", 
-  "label": "Replies", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "creation": "2014-01-29 15:57:42", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Master", 
+ "fields": [
+  {
+   "fieldname": "name_and_description", 
+   "fieldtype": "Section Break", 
+   "label": "Name and Description", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "group_name", 
+   "fieldtype": "Data", 
+   "label": "Group Name", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "group_title", 
+   "fieldtype": "Data", 
+   "label": "Group Title", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "group_type", 
+   "fieldtype": "Select", 
+   "label": "Group Type", 
+   "options": "Forum\nTasks\nEvents", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
+  {
+   "description": "Display in the sidebar of this Website Route node", 
+   "fieldname": "parent_website_route", 
+   "fieldtype": "Link", 
+   "in_list_view": 0, 
+   "label": "Parent Website Page", 
+   "options": "Website Route", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "column_break_6", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "group_description", 
+   "fieldtype": "Text", 
+   "label": "Group Description", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "page_name", 
+   "fieldtype": "Data", 
+   "in_list_view": 1, 
+   "label": "Page Name", 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "details", 
+   "fieldtype": "Section Break", 
+   "label": "Details", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "public_read", 
+   "fieldtype": "Check", 
+   "label": "Anyone Can Read", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "public_write", 
+   "fieldtype": "Check", 
+   "label": "Anyone Can Write", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "column_break_12", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "upvotes", 
+   "fieldtype": "Int", 
+   "label": "Upvotes", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "replies", 
+   "fieldtype": "Int", 
+   "label": "Replies", 
+   "permlevel": 0, 
+   "read_only": 1
+  }
+ ], 
+ "icon": "icon-group", 
+ "idx": 1, 
+ "modified": "2014-03-04 09:36:30", 
+ "modified_by": "Administrator", 
+ "module": "Website", 
+ "name": "Website Group", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "export": 1, 
+   "permlevel": 0, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Website Manager", 
+   "write": 1
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/website_route/website_route.txt b/frappe/website/doctype/website_route/website_route.txt
index 65f3f4e9e1..7352b7509b 100644
--- a/frappe/website/doctype/website_route/website_route.txt
+++ b/frappe/website/doctype/website_route/website_route.txt
@@ -1,151 +1,132 @@
-[
- {
-  "creation": "2013-11-18 15:38:40", 
-  "docstatus": 0, 
-  "modified": "2014-02-24 12:46:59", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_rename": 1, 
-  "autoname": "field:page_name", 
-  "doctype": "DocType", 
-  "module": "Website", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Website Route", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "cancel": 0, 
-  "create": 0, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "name": "__common__", 
-  "parent": "Website Route", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "read": 1, 
-  "report": 1, 
-  "role": "Website Manager", 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Website Route"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "page_or_generator", 
-  "fieldtype": "Select", 
-  "label": "Page or Generator", 
-  "options": "Page\nGenerator", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "page_name", 
-  "fieldtype": "Data", 
-  "label": "Page Name", 
-  "read_only": 1, 
-  "reqd": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "page_title", 
-  "fieldtype": "Data", 
-  "label": "Page Title", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "ref_doctype", 
-  "fieldtype": "Link", 
-  "label": "Ref DocType", 
-  "options": "DocType", 
-  "reqd": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "docname", 
-  "fieldtype": "Data", 
-  "label": "Docname", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "lastmod", 
-  "fieldtype": "Data", 
-  "label": "Lastmod"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "website_template", 
-  "fieldtype": "Link", 
-  "label": "Website Template", 
-  "options": "Website Template"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "parent_website_route", 
-  "fieldtype": "Link", 
-  "in_list_view": 1, 
-  "label": "Parent Website Sitemap", 
-  "options": "Website Route", 
-  "search_index": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "lft", 
-  "fieldtype": "Int", 
-  "hidden": 1, 
-  "label": "lft", 
-  "read_only": 1, 
-  "search_index": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "rgt", 
-  "fieldtype": "Int", 
-  "hidden": 1, 
-  "in_list_view": 0, 
-  "label": "rgt", 
-  "read_only": 1, 
-  "search_index": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "old_parent", 
-  "fieldtype": "Data", 
-  "hidden": 1, 
-  "label": "Old Parent", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "public_read", 
-  "fieldtype": "Check", 
-  "label": "Anyone Can Read"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "public_write", 
-  "fieldtype": "Check", 
-  "label": "Anyone Can Write"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "static_file_timestamp", 
-  "fieldtype": "Data", 
-  "label": "Static File Timestamp"
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "allow_rename": 1, 
+ "autoname": "field:page_name", 
+ "creation": "2013-11-18 15:38:40", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "page_or_generator", 
+   "fieldtype": "Select", 
+   "label": "Page or Generator", 
+   "options": "Page\nGenerator", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "page_name", 
+   "fieldtype": "Data", 
+   "label": "Page Name", 
+   "permlevel": 0, 
+   "read_only": 1, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "page_title", 
+   "fieldtype": "Data", 
+   "label": "Page Title", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "ref_doctype", 
+   "fieldtype": "Link", 
+   "label": "Ref DocType", 
+   "options": "DocType", 
+   "permlevel": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "docname", 
+   "fieldtype": "Data", 
+   "label": "Docname", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "lastmod", 
+   "fieldtype": "Data", 
+   "label": "Lastmod", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "website_template", 
+   "fieldtype": "Link", 
+   "label": "Website Template", 
+   "options": "Website Template", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "parent_website_route", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Parent Website Sitemap", 
+   "options": "Website Route", 
+   "permlevel": 0, 
+   "search_index": 1
+  }, 
+  {
+   "fieldname": "lft", 
+   "fieldtype": "Int", 
+   "hidden": 1, 
+   "label": "lft", 
+   "permlevel": 0, 
+   "read_only": 1, 
+   "search_index": 1
+  }, 
+  {
+   "fieldname": "rgt", 
+   "fieldtype": "Int", 
+   "hidden": 1, 
+   "in_list_view": 0, 
+   "label": "rgt", 
+   "permlevel": 0, 
+   "read_only": 1, 
+   "search_index": 1
+  }, 
+  {
+   "fieldname": "old_parent", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "label": "Old Parent", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "public_read", 
+   "fieldtype": "Check", 
+   "label": "Anyone Can Read", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "public_write", 
+   "fieldtype": "Check", 
+   "label": "Anyone Can Write", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "static_file_timestamp", 
+   "fieldtype": "Data", 
+   "label": "Static File Timestamp", 
+   "permlevel": 0
+  }
+ ], 
+ "idx": 1, 
+ "modified": "2014-02-24 12:46:59", 
+ "modified_by": "Administrator", 
+ "module": "Website", 
+ "name": "Website Route", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 1, 
+   "permlevel": 0, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Website Manager", 
+   "write": 1
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/website_route_permission/website_route_permission.txt b/frappe/website/doctype/website_route_permission/website_route_permission.txt
index ee5e3390b7..f37be1daa9 100644
--- a/frappe/website/doctype/website_route_permission/website_route_permission.txt
+++ b/frappe/website/doctype/website_route_permission/website_route_permission.txt
@@ -1,85 +1,70 @@
-[
- {
-  "creation": "2014-01-29 17:56:29", 
-  "docstatus": 0, 
-  "modified": "2014-02-24 13:17:18", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "autoname": "WSP.######", 
-  "doctype": "DocType", 
-  "icon": "icon-shield", 
-  "module": "Website", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "in_list_view": 1, 
-  "name": "__common__", 
-  "parent": "Website Route Permission", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "cancel": 0, 
-  "create": 1, 
-  "delete": 0, 
-  "doctype": "DocPerm", 
-  "export": 1, 
-  "import": 0, 
-  "name": "__common__", 
-  "parent": "Website Route Permission", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "read": 1, 
-  "report": 1, 
-  "role": "Website Manager", 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Website Route Permission"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "website_route", 
-  "fieldtype": "Link", 
-  "label": "Website Route", 
-  "options": "Website Route", 
-  "reqd": 1, 
-  "search_index": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "user", 
-  "fieldtype": "Link", 
-  "label": "User", 
-  "options": "User", 
-  "reqd": 1, 
-  "search_index": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "read", 
-  "fieldtype": "Check", 
-  "label": "Read"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "write", 
-  "fieldtype": "Check", 
-  "label": "Write"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "admin", 
-  "fieldtype": "Check", 
-  "label": "Admin"
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "autoname": "WSP.######", 
+ "creation": "2014-01-29 17:56:29", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "website_route", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "Website Route", 
+   "options": "Website Route", 
+   "permlevel": 0, 
+   "reqd": 1, 
+   "search_index": 1
+  }, 
+  {
+   "fieldname": "user", 
+   "fieldtype": "Link", 
+   "in_list_view": 1, 
+   "label": "User", 
+   "options": "User", 
+   "permlevel": 0, 
+   "reqd": 1, 
+   "search_index": 1
+  }, 
+  {
+   "fieldname": "read", 
+   "fieldtype": "Check", 
+   "in_list_view": 1, 
+   "label": "Read", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "write", 
+   "fieldtype": "Check", 
+   "in_list_view": 1, 
+   "label": "Write", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "admin", 
+   "fieldtype": "Check", 
+   "in_list_view": 1, 
+   "label": "Admin", 
+   "permlevel": 0
+  }
+ ], 
+ "icon": "icon-shield", 
+ "idx": 1, 
+ "modified": "2014-02-24 13:17:18", 
+ "modified_by": "Administrator", 
+ "module": "Website", 
+ "name": "Website Route Permission", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "export": 1, 
+   "import": 0, 
+   "permlevel": 0, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Website Manager", 
+   "write": 1
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/website_script/website_script.txt b/frappe/website/doctype/website_script/website_script.txt
index ce016d020c..68b9f81b38 100644
--- a/frappe/website/doctype/website_script/website_script.txt
+++ b/frappe/website/doctype/website_script/website_script.txt
@@ -1,54 +1,35 @@
-[
- {
-  "creation": "2012-12-27 11:51:24", 
-  "docstatus": 0, 
-  "modified": "2013-12-20 19:21:54", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "description": "Script to attach to all web pages.", 
-  "doctype": "DocType", 
-  "document_type": "Other", 
-  "icon": "icon-code", 
-  "issingle": 1, 
-  "module": "Website", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "javascript", 
-  "fieldtype": "Code", 
-  "label": "Javascript", 
-  "name": "__common__", 
-  "options": "Javascript", 
-  "parent": "Website Script", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Website Script", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "role": "Website Manager", 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Website Script"
- }, 
- {
-  "doctype": "DocField"
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "creation": "2012-12-27 11:51:24", 
+ "description": "Script to attach to all web pages.", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Other", 
+ "fields": [
+  {
+   "fieldname": "javascript", 
+   "fieldtype": "Code", 
+   "label": "Javascript", 
+   "options": "Javascript", 
+   "permlevel": 0
+  }
+ ], 
+ "icon": "icon-code", 
+ "idx": 1, 
+ "issingle": 1, 
+ "modified": "2013-12-20 19:21:54", 
+ "modified_by": "Administrator", 
+ "module": "Website", 
+ "name": "Website Script", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "create": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "role": "Website Manager", 
+   "write": 1
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/website_settings/website_settings.txt b/frappe/website/doctype/website_settings/website_settings.txt
index 50975bc243..4f89c3061b 100644
--- a/frappe/website/doctype/website_settings/website_settings.txt
+++ b/frappe/website/doctype/website_settings/website_settings.txt
@@ -1,266 +1,251 @@
-[
- {
-  "creation": "2013-04-30 12:58:46", 
-  "docstatus": 0, 
-  "modified": "2014-02-26 11:39:10", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_attach": 1, 
-  "doctype": "DocType", 
-  "document_type": "Other", 
-  "icon": "icon-cog", 
-  "issingle": 1, 
-  "max_attachments": 10, 
-  "module": "Website", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Website Settings", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "cancel": 0, 
-  "delete": 0, 
-  "doctype": "DocPerm", 
-  "name": "__common__", 
-  "parent": "Website Settings", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "read": 1, 
-  "report": 0, 
-  "submit": 0
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Website Settings"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "sb0", 
-  "fieldtype": "Section Break", 
-  "label": "Landing Page"
- }, 
- {
-  "description": "Link that is the website home page. Standard Links (index, login, products, blog, about, contact)", 
-  "doctype": "DocField", 
-  "fieldname": "home_page", 
-  "fieldtype": "Link", 
-  "label": "Home Page", 
-  "options": "Website Route", 
-  "reqd": 0
- }, 
- {
-  "description": "The name of your company / website as you want to appear on browser title bar. All pages will have this as the prefix to the title.", 
-  "doctype": "DocField", 
-  "fieldname": "title_prefix", 
-  "fieldtype": "Data", 
-  "label": "Title Prefix"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "cb4", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "description": "If checked, the Home page will be the default Item Group for the website.", 
-  "doctype": "DocField", 
-  "fieldname": "home_page_is_products", 
-  "fieldtype": "Check", 
-  "label": "Home Page is Products"
- }, 
- {
-  "description": "Add a banner to the site. (small banners are usually good)", 
-  "doctype": "DocField", 
-  "fieldname": "banner", 
-  "fieldtype": "Section Break", 
-  "label": "Banner"
- }, 
- {
-  "description": "Select an image of approx width 150px with a transparent background for best results.", 
-  "doctype": "DocField", 
-  "fieldname": "banner_image", 
-  "fieldtype": "Select", 
-  "label": "Banner Image", 
-  "options": "attach_files:"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "set_banner_from_image", 
-  "fieldtype": "Button", 
-  "label": "Set Banner from Image"
- }, 
- {
-  "description": "Banner is above the Top Menu Bar.", 
-  "doctype": "DocField", 
-  "fieldname": "banner_html", 
-  "fieldtype": "Small Text", 
-  "label": "Banner HTML"
- }, 
- {
-  "description": "Menu items in the Top Bar. For setting the color of the Top Bar, go to <a href=\"#Form/Style Settings\">Style Settings</a>", 
-  "doctype": "DocField", 
-  "fieldname": "top_bar", 
-  "fieldtype": "Section Break", 
-  "label": "Top Bar"
- }, 
- {
-  "description": "Brand is what appears on the top-right of the toolbar. If it is an image, make sure it\nhas a transparent background and use the &lt;img /&gt; tag. Keep size as 200px x 30px", 
-  "doctype": "DocField", 
-  "fieldname": "brand_html", 
-  "fieldtype": "Small Text", 
-  "label": "Brand HTML"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "top_bar_items", 
-  "fieldtype": "Table", 
-  "label": "Top Bar Items", 
-  "options": "Top Bar Item"
- }, 
- {
-  "description": "Sidebar Links for Home Page only", 
-  "doctype": "DocField", 
-  "fieldname": "sidebar", 
-  "fieldtype": "Section Break", 
-  "label": "Sidebar"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "sidebar_items", 
-  "fieldtype": "Table", 
-  "label": "Sidebar Items", 
-  "options": "Top Bar Item"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "footer", 
-  "fieldtype": "Section Break", 
-  "label": "Footer"
- }, 
- {
-  "description": "Address and other legal information you may want to put in the footer.", 
-  "doctype": "DocField", 
-  "fieldname": "address", 
-  "fieldtype": "Text Editor", 
-  "label": "Address"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "copyright", 
-  "fieldtype": "Data", 
-  "label": "Copyright"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "footer_items", 
-  "fieldtype": "Table", 
-  "label": "Footer Items", 
-  "options": "Top Bar Item"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "integrations", 
-  "fieldtype": "Section Break", 
-  "label": "Integrations"
- }, 
- {
-  "description": "Add Google Analytics ID: eg. UA-89XXX57-1. Please search help on Google Analytics for more information.", 
-  "doctype": "DocField", 
-  "fieldname": "google_analytics_id", 
-  "fieldtype": "Data", 
-  "label": "Google Analytics ID"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break_17", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "google_plus_one", 
-  "fieldtype": "Check", 
-  "label": "Google Plus One"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "facebook_share", 
-  "fieldtype": "Check", 
-  "label": "Facebook Share"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "linked_in_share", 
-  "fieldtype": "Check", 
-  "label": "Linked In Share"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "twitter_share", 
-  "fieldtype": "Check", 
-  "label": "Twitter Share"
- }, 
- {
-  "description": "Tweet will be shared via your user account (if specified)", 
-  "doctype": "DocField", 
-  "fieldname": "twitter_share_via", 
-  "fieldtype": "Data", 
-  "label": "Twitter Share via"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "misc_section", 
-  "fieldtype": "Section Break", 
-  "label": "Misc"
- }, 
- {
-  "description": "An icon file with .ico extension. Should be 16 x 16 px. Generated using a favicon generator. [<a href=\"http://favicon-generator.org/\" target=\"_blank\">favicon-generator.org</a>]", 
-  "doctype": "DocField", 
-  "fieldname": "favicon", 
-  "fieldtype": "Select", 
-  "label": "FavIcon", 
-  "options": "attach_files:"
- }, 
- {
-  "description": "Sub-domain provided by erpnext.com", 
-  "doctype": "DocField", 
-  "fieldname": "subdomain", 
-  "fieldtype": "Text", 
-  "label": "Subdomain", 
-  "read_only": 1, 
-  "reqd": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break_28", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "description": "Disable Customer Signup link in Login page", 
-  "doctype": "DocField", 
-  "fieldname": "disable_signup", 
-  "fieldtype": "Check", 
-  "label": "Disable Signup"
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "permlevel": 0, 
-  "print": 1, 
-  "role": "Website Manager", 
-  "write": 1
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "permlevel": 1, 
-  "role": "All"
- }
-]
\ No newline at end of file
+{
+ "allow_attach": 1, 
+ "creation": "2013-04-30 12:58:46", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Other", 
+ "fields": [
+  {
+   "fieldname": "sb0", 
+   "fieldtype": "Section Break", 
+   "label": "Landing Page", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Link that is the website home page. Standard Links (index, login, products, blog, about, contact)", 
+   "fieldname": "home_page", 
+   "fieldtype": "Link", 
+   "label": "Home Page", 
+   "options": "Website Route", 
+   "permlevel": 0, 
+   "reqd": 0
+  }, 
+  {
+   "description": "The name of your company / website as you want to appear on browser title bar. All pages will have this as the prefix to the title.", 
+   "fieldname": "title_prefix", 
+   "fieldtype": "Data", 
+   "label": "Title Prefix", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "cb4", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "If checked, the Home page will be the default Item Group for the website.", 
+   "fieldname": "home_page_is_products", 
+   "fieldtype": "Check", 
+   "label": "Home Page is Products", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Add a banner to the site. (small banners are usually good)", 
+   "fieldname": "banner", 
+   "fieldtype": "Section Break", 
+   "label": "Banner", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Select an image of approx width 150px with a transparent background for best results.", 
+   "fieldname": "banner_image", 
+   "fieldtype": "Select", 
+   "label": "Banner Image", 
+   "options": "attach_files:", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "set_banner_from_image", 
+   "fieldtype": "Button", 
+   "label": "Set Banner from Image", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Banner is above the Top Menu Bar.", 
+   "fieldname": "banner_html", 
+   "fieldtype": "Small Text", 
+   "label": "Banner HTML", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Menu items in the Top Bar. For setting the color of the Top Bar, go to <a href=\"#Form/Style Settings\">Style Settings</a>", 
+   "fieldname": "top_bar", 
+   "fieldtype": "Section Break", 
+   "label": "Top Bar", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Brand is what appears on the top-right of the toolbar. If it is an image, make sure it\nhas a transparent background and use the &lt;img /&gt; tag. Keep size as 200px x 30px", 
+   "fieldname": "brand_html", 
+   "fieldtype": "Small Text", 
+   "label": "Brand HTML", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "top_bar_items", 
+   "fieldtype": "Table", 
+   "label": "Top Bar Items", 
+   "options": "Top Bar Item", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Sidebar Links for Home Page only", 
+   "fieldname": "sidebar", 
+   "fieldtype": "Section Break", 
+   "label": "Sidebar", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "sidebar_items", 
+   "fieldtype": "Table", 
+   "label": "Sidebar Items", 
+   "options": "Top Bar Item", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "footer", 
+   "fieldtype": "Section Break", 
+   "label": "Footer", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Address and other legal information you may want to put in the footer.", 
+   "fieldname": "address", 
+   "fieldtype": "Text Editor", 
+   "label": "Address", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "copyright", 
+   "fieldtype": "Data", 
+   "label": "Copyright", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "footer_items", 
+   "fieldtype": "Table", 
+   "label": "Footer Items", 
+   "options": "Top Bar Item", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "integrations", 
+   "fieldtype": "Section Break", 
+   "label": "Integrations", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Add Google Analytics ID: eg. UA-89XXX57-1. Please search help on Google Analytics for more information.", 
+   "fieldname": "google_analytics_id", 
+   "fieldtype": "Data", 
+   "label": "Google Analytics ID", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "column_break_17", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "google_plus_one", 
+   "fieldtype": "Check", 
+   "label": "Google Plus One", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "facebook_share", 
+   "fieldtype": "Check", 
+   "label": "Facebook Share", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "linked_in_share", 
+   "fieldtype": "Check", 
+   "label": "Linked In Share", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "twitter_share", 
+   "fieldtype": "Check", 
+   "label": "Twitter Share", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Tweet will be shared via your user account (if specified)", 
+   "fieldname": "twitter_share_via", 
+   "fieldtype": "Data", 
+   "label": "Twitter Share via", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "misc_section", 
+   "fieldtype": "Section Break", 
+   "label": "Misc", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "An icon file with .ico extension. Should be 16 x 16 px. Generated using a favicon generator. [<a href=\"http://favicon-generator.org/\" target=\"_blank\">favicon-generator.org</a>]", 
+   "fieldname": "favicon", 
+   "fieldtype": "Select", 
+   "label": "FavIcon", 
+   "options": "attach_files:", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Sub-domain provided by erpnext.com", 
+   "fieldname": "subdomain", 
+   "fieldtype": "Text", 
+   "label": "Subdomain", 
+   "permlevel": 0, 
+   "read_only": 1, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "column_break_28", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "description": "Disable Customer Signup link in Login page", 
+   "fieldname": "disable_signup", 
+   "fieldtype": "Check", 
+   "label": "Disable Signup", 
+   "permlevel": 0
+  }
+ ], 
+ "icon": "icon-cog", 
+ "idx": 1, 
+ "issingle": 1, 
+ "max_attachments": 10, 
+ "modified": "2014-02-26 11:39:10", 
+ "modified_by": "Administrator", 
+ "module": "Website", 
+ "name": "Website Settings", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Website Manager", 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "permlevel": 1, 
+   "read": 1, 
+   "report": 0, 
+   "role": "All", 
+   "submit": 0
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/website_slideshow/website_slideshow.txt b/frappe/website/doctype/website_slideshow/website_slideshow.txt
index ee6a074148..b0d32cd687 100644
--- a/frappe/website/doctype/website_slideshow/website_slideshow.txt
+++ b/frappe/website/doctype/website_slideshow/website_slideshow.txt
@@ -1,85 +1,66 @@
-[
- {
-  "creation": "2013-03-07 15:53:15", 
-  "docstatus": 0, 
-  "modified": "2014-01-20 17:49:35", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_attach": 1, 
-  "autoname": "field:slideshow_name", 
-  "description": "Slideshow like display for the website", 
-  "doctype": "DocType", 
-  "document_type": "Transaction", 
-  "icon": "icon-play", 
-  "max_attachments": 10, 
-  "module": "Website", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Website Slideshow", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "cancel": 0, 
-  "create": 1, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "email": 1, 
-  "name": "__common__", 
-  "parent": "Website Slideshow", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "print": 1, 
-  "read": 1, 
-  "report": 1, 
-  "role": "Website Manager", 
-  "submit": 0, 
-  "write": 1
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Website Slideshow"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "slideshow_name", 
-  "fieldtype": "Data", 
-  "label": "Slideshow Name", 
-  "read_only": 0, 
-  "reqd": 1
- }, 
- {
-  "depends_on": "eval:!doc.__islocal", 
-  "description": "Note: For best results, images must be of the same size and width must be greater than height.", 
-  "doctype": "DocField", 
-  "fieldname": "sb0", 
-  "fieldtype": "Section Break", 
-  "label": "Slideshow Items"
- }, 
- {
-  "depends_on": "eval:!doc.__islocal", 
-  "doctype": "DocField", 
-  "fieldname": "slideshow_items", 
-  "fieldtype": "Table", 
-  "label": "Slideshow Items", 
-  "options": "Website Slideshow Item"
- }, 
- {
-  "depends_on": "eval:!doc.__islocal", 
-  "description": "This goes above the slideshow.", 
-  "doctype": "DocField", 
-  "fieldname": "header", 
-  "fieldtype": "Text Editor", 
-  "label": "Header"
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "allow_attach": 1, 
+ "autoname": "field:slideshow_name", 
+ "creation": "2013-03-07 15:53:15", 
+ "description": "Slideshow like display for the website", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Transaction", 
+ "fields": [
+  {
+   "fieldname": "slideshow_name", 
+   "fieldtype": "Data", 
+   "label": "Slideshow Name", 
+   "permlevel": 0, 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "depends_on": "eval:!doc.__islocal", 
+   "description": "Note: For best results, images must be of the same size and width must be greater than height.", 
+   "fieldname": "sb0", 
+   "fieldtype": "Section Break", 
+   "label": "Slideshow Items", 
+   "permlevel": 0
+  }, 
+  {
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "slideshow_items", 
+   "fieldtype": "Table", 
+   "label": "Slideshow Items", 
+   "options": "Website Slideshow Item", 
+   "permlevel": 0
+  }, 
+  {
+   "depends_on": "eval:!doc.__islocal", 
+   "description": "This goes above the slideshow.", 
+   "fieldname": "header", 
+   "fieldtype": "Text Editor", 
+   "label": "Header", 
+   "permlevel": 0
+  }
+ ], 
+ "icon": "icon-play", 
+ "idx": 1, 
+ "max_attachments": 10, 
+ "modified": "2014-01-20 17:49:35", 
+ "modified_by": "Administrator", 
+ "module": "Website", 
+ "name": "Website Slideshow", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Website Manager", 
+   "submit": 0, 
+   "write": 1
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/website_slideshow_item/website_slideshow_item.txt b/frappe/website/doctype/website_slideshow_item/website_slideshow_item.txt
index f549c36a1d..e7ed1a21fb 100644
--- a/frappe/website/doctype/website_slideshow_item/website_slideshow_item.txt
+++ b/frappe/website/doctype/website_slideshow_item/website_slideshow_item.txt
@@ -1,53 +1,42 @@
-[
- {
-  "creation": "2013-03-07 12:26:33", 
-  "docstatus": 0, 
-  "modified": "2013-12-20 19:21:55", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "allow_attach": 0, 
-  "doctype": "DocType", 
-  "istable": 1, 
-  "max_attachments": 10, 
-  "module": "Website", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "in_list_view": 1, 
-  "name": "__common__", 
-  "parent": "Website Slideshow Item", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Website Slideshow Item"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "image", 
-  "fieldtype": "Select", 
-  "label": "Image", 
-  "options": "attach_files:"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "heading", 
-  "fieldtype": "Data", 
-  "label": "Heading", 
-  "print_width": "200px", 
-  "width": "200px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "description", 
-  "fieldtype": "Text", 
-  "label": "Description", 
-  "print_width": "200px", 
-  "width": "200px"
- }
-]
\ No newline at end of file
+{
+ "allow_attach": 0, 
+ "creation": "2013-03-07 12:26:33", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "fieldname": "image", 
+   "fieldtype": "Select", 
+   "in_list_view": 1, 
+   "label": "Image", 
+   "options": "attach_files:", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "heading", 
+   "fieldtype": "Data", 
+   "in_list_view": 1, 
+   "label": "Heading", 
+   "permlevel": 0, 
+   "print_width": "200px", 
+   "width": "200px"
+  }, 
+  {
+   "fieldname": "description", 
+   "fieldtype": "Text", 
+   "in_list_view": 1, 
+   "label": "Description", 
+   "permlevel": 0, 
+   "print_width": "200px", 
+   "width": "200px"
+  }
+ ], 
+ "idx": 1, 
+ "istable": 1, 
+ "max_attachments": 10, 
+ "modified": "2013-12-20 19:21:55", 
+ "modified_by": "Administrator", 
+ "module": "Website", 
+ "name": "Website Slideshow Item", 
+ "owner": "Administrator"
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/website_template/website_template.txt b/frappe/website/doctype/website_template/website_template.txt
index f7f9d545d5..07e7de11ef 100644
--- a/frappe/website/doctype/website_template/website_template.txt
+++ b/frappe/website/doctype/website_template/website_template.txt
@@ -1,149 +1,130 @@
-[
- {
-  "creation": "2013-11-18 15:35:00", 
-  "docstatus": 0, 
-  "modified": "2014-02-24 12:47:44", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "autoname": "field:link_name", 
-  "doctype": "DocType", 
-  "document_type": "System", 
-  "module": "Website", 
-  "name": "__common__"
- }, 
- {
-  "doctype": "DocField", 
-  "name": "__common__", 
-  "parent": "Website Template", 
-  "parentfield": "fields", 
-  "parenttype": "DocType", 
-  "permlevel": 0
- }, 
- {
-  "cancel": 0, 
-  "create": 0, 
-  "delete": 1, 
-  "doctype": "DocPerm", 
-  "export": 0, 
-  "name": "__common__", 
-  "parent": "Website Template", 
-  "parentfield": "permissions", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "read": 1, 
-  "report": 1, 
-  "role": "System Manager", 
-  "write": 0
- }, 
- {
-  "doctype": "DocType", 
-  "name": "Website Template"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "page_or_generator", 
-  "fieldtype": "Select", 
-  "label": "Page or Generator", 
-  "options": "Page\nGenerator", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "ref_doctype", 
-  "fieldtype": "Link", 
-  "label": "Ref DocType", 
-  "options": "DocType", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "link_name", 
-  "fieldtype": "Data", 
-  "label": "Link Name", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "page_title", 
-  "fieldtype": "Data", 
-  "label": "Page Title"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "base_template_path", 
-  "fieldtype": "Data", 
-  "label": "Base Template Path", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "template_path", 
-  "fieldtype": "Data", 
-  "label": "Template Path", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "controller", 
-  "fieldtype": "Data", 
-  "label": "Controller", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "lastmod", 
-  "fieldtype": "Data", 
-  "label": "Lastmod"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "no_cache", 
-  "fieldtype": "Check", 
-  "label": "No Cache", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "no_sitemap", 
-  "fieldtype": "Check", 
-  "label": "No Sitemap", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "no_sidebar", 
-  "fieldtype": "Check", 
-  "label": "No Sidebar"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "page_name_field", 
-  "fieldtype": "Data", 
-  "label": "Page Name Field", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "condition_field", 
-  "fieldtype": "Data", 
-  "label": "Condition Field", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "sort_by", 
-  "fieldtype": "Data", 
-  "label": "Sort By"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "sort_order", 
-  "fieldtype": "Data", 
-  "label": "Sort Order"
- }, 
- {
-  "doctype": "DocPerm"
- }
-]
\ No newline at end of file
+{
+ "autoname": "field:link_name", 
+ "creation": "2013-11-18 15:35:00", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "System", 
+ "fields": [
+  {
+   "fieldname": "page_or_generator", 
+   "fieldtype": "Select", 
+   "label": "Page or Generator", 
+   "options": "Page\nGenerator", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "ref_doctype", 
+   "fieldtype": "Link", 
+   "label": "Ref DocType", 
+   "options": "DocType", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "link_name", 
+   "fieldtype": "Data", 
+   "label": "Link Name", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "page_title", 
+   "fieldtype": "Data", 
+   "label": "Page Title", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "base_template_path", 
+   "fieldtype": "Data", 
+   "label": "Base Template Path", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "template_path", 
+   "fieldtype": "Data", 
+   "label": "Template Path", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "controller", 
+   "fieldtype": "Data", 
+   "label": "Controller", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "lastmod", 
+   "fieldtype": "Data", 
+   "label": "Lastmod", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "no_cache", 
+   "fieldtype": "Check", 
+   "label": "No Cache", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "no_sitemap", 
+   "fieldtype": "Check", 
+   "label": "No Sitemap", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "no_sidebar", 
+   "fieldtype": "Check", 
+   "label": "No Sidebar", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "page_name_field", 
+   "fieldtype": "Data", 
+   "label": "Page Name Field", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "condition_field", 
+   "fieldtype": "Data", 
+   "label": "Condition Field", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
+   "fieldname": "sort_by", 
+   "fieldtype": "Data", 
+   "label": "Sort By", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "sort_order", 
+   "fieldtype": "Data", 
+   "label": "Sort Order", 
+   "permlevel": 0
+  }
+ ], 
+ "idx": 1, 
+ "modified": "2014-02-24 12:47:44", 
+ "modified_by": "Administrator", 
+ "module": "Website", 
+ "name": "Website Template", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 1, 
+   "export": 0, 
+   "permlevel": 0, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "write": 0
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/website/page/sitemap_browser/sitemap_browser.txt b/frappe/website/page/sitemap_browser/sitemap_browser.txt
index 00d46e2f2a..520ae06c4f 100644
--- a/frappe/website/page/sitemap_browser/sitemap_browser.txt
+++ b/frappe/website/page/sitemap_browser/sitemap_browser.txt
@@ -1,37 +1,23 @@
-[
- {
-  "creation": "2014-02-18 10:47:22", 
-  "docstatus": 0, 
-  "modified": "2014-02-18 10:47:22", 
-  "modified_by": "Administrator", 
-  "owner": "Administrator"
- }, 
- {
-  "doctype": "Page", 
-  "icon": "icon-sitemap", 
-  "module": "Website", 
-  "name": "__common__", 
-  "page_name": "sitemap-browser", 
-  "standard": "Yes", 
-  "title": "Sitemap Browser"
- }, 
- {
-  "doctype": "Page Role", 
-  "name": "__common__", 
-  "parent": "sitemap-browser", 
-  "parentfield": "roles", 
-  "parenttype": "Page"
- }, 
- {
-  "doctype": "Page", 
-  "name": "sitemap-browser"
- }, 
- {
-  "doctype": "Page Role", 
-  "role": "Website Manager"
- }, 
- {
-  "doctype": "Page Role", 
-  "role": "System Manager"
- }
-]
\ No newline at end of file
+{
+ "creation": "2014-02-18 10:47:22", 
+ "docstatus": 0, 
+ "doctype": "Page", 
+ "icon": "icon-sitemap", 
+ "idx": 1, 
+ "modified": "2014-02-18 10:47:22", 
+ "modified_by": "Administrator", 
+ "module": "Website", 
+ "name": "sitemap-browser", 
+ "owner": "Administrator", 
+ "page_name": "sitemap-browser", 
+ "roles": [
+  {
+   "role": "Website Manager"
+  }, 
+  {
+   "role": "System Manager"
+  }
+ ], 
+ "standard": "Yes", 
+ "title": "Sitemap Browser"
+}
\ No newline at end of file