Merge branch 'master' of github.com:webnotes/erpnext

2026-06-01 03:09:09 +00:00 · 2011-07-06 10:47:50 +05:30
parent af18af57e3 4c38fbb211
commit 486ec28b85
1441 changed files with 66656 additions and 103051 deletions
--- a/home/init.py
+++ b/home/init.py
@@ -1,8 +1,9 @@
 import webnotes
+from webnotes import msgprint

 feed_dict = {
 	# Project
-	'Ticket':		       ['[%(status)s] %(subject)s', '#000080'],
+	'Project':		       ['[%(status)s] %(subject)s', '#000080'],

 	# Sales
 	'Lead':			 ['%(lead_name)s', '#000080'],
@@ -29,12 +30,44 @@ feed_dict = {
 	# Support
 	'Customer Issue':       ['[%(status)s] %(description)s by %(customer_name)s', '#000080'],
 	'Maintenance Visit':['To %(customer_name)s', '#4169E1'],
-	'Support Ticket':       ['[%(status)s] %(subject)s', '#000080']
+	'Support Ticket':       ['[%(status)s] %(subject)s', '#000080']	
 }

+feed_dict_color = {
+	# Project
+	'Project': '#000080',
+	
+	# Sales
+	'Lead':	'#000080',
+	'Quotation': '#4169E1',
+	'Sales Order': '#4169E1',
+
+	# Purchase
+	'Supplier': '#6495ED',
+	'Purchase Order': '#4169E1',
+
+	# Stock
+	'Delivery Note': '#4169E1',
+
+	# Accounts
+	'Journal Voucher': '#4169E1',
+	'Payable Voucher': '#4169E1',
+	'Receivable Voucher': '#4169E1',
+
+	# HR
+	'Expense Voucher': '#4169E1',
+	'Salary Slip': '#4169E1',
+	'Leave Transaction': '#4169E1',
+
+	# Support
+	'Customer Issue': '#000080',
+	'Maintenance Visit': '#4169E1',
+	'Support Ticket': '#000080'
+}

 def make_feed(doc, subject, color):
 	"makes a new Feed record"
+	#msgprint(subject)
 	from webnotes.model.doc import Document
 	webnotes.conn.sql("delete from tabFeed where doc_type=%s and doc_name=%s", (doc.doctype, doc.name))
 	f = Document('Feed')
@@ -43,11 +76,24 @@ def make_feed(doc, subject, color):
 	f.subject = subject
 	f.color = color
 	f.save(1)
+
+def update_feed1(doc):   
+	"adds a new feed"
+	prop_rec = webnotes.conn.sql("select value from `tabProperty Setter` where doc_type = %s and property = 'subject'", (doc.doctype))
+	if prop_rec:		
+		subject = prop_rec[0][0]
+	else:	
+		rec = webnotes.conn.sql("select subject from tabDocType where name=%s", (doc.doctype))
+		subject = rec[0][0]
 	
+	subject, color = [subject, feed_dict_color.get(doc.doctype)]
+	if subject:
+		subject = subject % doc.fields
+		make_feed(doc, subject, color)
+		
 def update_feed(doc):   
 	"adds a new feed"
 	subject, color = feed_dict.get(doc.doctype, [None, None])
 	if subject:
 		subject = subject % doc.fields
 		make_feed(doc, subject, color)
-
--- a/home/doctype/company_control/company_control.txt
+++ b/home/doctype/company_control/company_control.txt
@@ -1,58 +1,31 @@
+# DocType, Company Control
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': '',
-		'client_string': None,
-		'colour': 'White:FFF',
 		'creation': '2010-08-08 17:08:55',
-		'description': None,
 		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': 1,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2010-11-17 16:25:34',
+		'modified': '2011-01-13 12:14:36',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
 		'module': 'Home',
-		'name': 'Company Control',
-		'name_case': '',
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': '',
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
+		'name': '__common__',
 		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
+		'server_code': '\n\n\t# Update roles of given user\n\tdef update_roles(self,arg):\n\t\targ = eval(arg)\n\t\tsql("delete from `tabUserRole` where parenttype=\'Profile\' and parent =\'%s\'" % (cstr(arg[\'usr\'])))\n\t\trole_list = arg[\'role_list\'].split(\',\')\n\t\tmsgprint(sql("select role from tabUserRole where parent = \'%s\'" % cstr(arg[\'usr\'])))\n\t\tmsgprint(role_list)\n\t\tfor r in role_list:\n\t\t\tpr=Document(\'UserRole\')\n\t\t\tpr.parent = arg[\'usr\']\n\t\t\tpr.parenttype = \'Profile\'\n\t\t\tpr.role = r\n\t\t\tpr.parentfield = \'userroles\'\n\t\t\tpr.save(1)\n\t\tmsgprint(sql("select role from tabUserRole where parent = \'%s\'" % cstr(arg[\'usr\'])))\n\n\n  # Create New Profile\n  # ====================\n\tdef create_new_profile(self, arg):\n\t\tp = Document(\'Profile\')\n\t\tp.first_name = arg.get(\'first_name\') or arg.get(\'email_id\')\n\t\tp.last_name = arg.get(\'last_name\')\n\t\tp.email = arg.get(\'email_id\')\n\t\tp.name = arg.get(\'email_id\')\n\t\tp.user_type = arg.get(\'user_type\') or \'System User\'\n\t\tp.enabled = 0\t\n\t\tp.save(new=1)\n\t\tp_obj = get_obj(\'Profile\', p.name)\n\t\tp_obj.on_update()',
 		'server_code_error': ' ',
-		'show_in_menu': None,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
-		'version': 7
+		'version': 13
+	},
+
+	# DocType, Company Control
+	{
+		'doctype': 'DocType',
+		'name': 'Company Control'
 	}
 ]
--- a/home/doctype/feed/feed.txt
+++ b/home/doctype/feed/feed.txt
@@ -1,202 +1,73 @@
+# DocType, Feed
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': '_FEED.#####',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
-		'colour': 'White:FFF',
-		'creation': '2011-04-06 18:07:23',
-		'description': None,
+		'creation': '2011-04-08 10:50:41',
 		'docstatus': 0,
-		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-06-09 16:42:12',
+		'modified': '2011-04-05 09:16:57',
 		'modified_by': 'Administrator',
-		'module': 'Home',
-		'name': 'Feed',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
-		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
-		'server_code_error': None,
-		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
-		'version': 2
+		'owner': 'Administrator'
 	},
+
+	# These values are common for all DocType
+	{
+		'autoname': '_FEED.#####',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'Home',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'show_in_menu': 0,
+		'version': 1
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'fieldtype': 'Data',
+		'name': '__common__',
+		'parent': 'Feed',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0
+	},
+
+	# DocType, Feed
+	{
+		'doctype': 'DocType',
+		'name': 'Feed'
+	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-06 18:07:23',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'doc_type',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 1,
-		'in_filter': None,
-		'label': 'Doc Type',
-		'modified': '2011-06-09 16:42:12',
-		'modified_by': 'Administrator',
-		'name': '000000498',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Feed',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Doc Type'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-06 18:07:24',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'doc_name',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 2,
-		'in_filter': None,
-		'label': 'Doc Name',
-		'modified': '2011-06-09 16:42:12',
-		'modified_by': 'Administrator',
-		'name': '000000499',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Feed',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Doc Name'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-06 18:07:24',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'subject',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
-		'in_filter': None,
-		'label': 'Subject',
-		'modified': '2011-06-09 16:42:12',
-		'modified_by': 'Administrator',
-		'name': '000000500',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Feed',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Subject'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-06 18:07:24',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'color',
-		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 4,
-		'in_filter': None,
-		'label': 'Color',
-		'modified': '2011-06-09 16:42:12',
-		'modified_by': 'Administrator',
-		'name': '000000501',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Feed',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'label': 'Color'
 	}
 ]
--- a/home/doctype/home_control/home_control.py
+++ b/home/doctype/home_control/home_control.py
@@ -287,7 +287,7 @@ class DocType:
 	# module settings
 	# -------------------------------------------------------------------------------------------------------
 	def get_module_order(self):
-		show_list = ['Event Updates','My Company','Setup','Accounts','CRM','SRM','Maintenance','Material Management','Payroll','Projects','Analysis','Production']
+		show_list = ['Home','Setup','Accounts','Selling','Buying','Support','Stock','HR','Projects','Analysis','Production']
 		ml = filter(lambda x: x[0] in show_list, \
 			sql("select name, module_label, module_seq, is_hidden from `tabModule Def` where docstatus<2 order by module_seq asc, module_label asc"))
 		return convert_to_lists(ml)
--- a/home/doctype/home_control/home_control.txt
+++ b/home/doctype/home_control/home_control.txt
@@ -1,81 +1,55 @@
+# DocType, Home Control
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': '',
-		'client_string': None,
-		'colour': 'White:FFF',
 		'creation': '2009-07-09 16:32:49',
-		'description': None,
 		'docstatus': 0,
+		'modified': '2010-12-24 17:08:55',
+		'modified_by': 'nabin@webnotestech.com',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
 		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
 		'issingle': 1,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-06-09 16:42:37',
-		'modified_by': 'Administrator',
 		'module': 'Home',
-		'name': 'Home Control',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
+		'name': '__common__',
 		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
 		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
-		'version': 4
+		'version': 6
 	},
+
+	# These values are common for all DocPerm
 	{
-		'amend': None,
-		'cancel': None,
 		'create': 1,
-		'creation': '2010-10-19 13:01:06',
-		'docstatus': 0,
 		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-06-09 16:42:37',
-		'modified_by': 'Administrator',
-		'name': 'PERM00716',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'parent': 'Home Control',
 		'parentfield': 'permissions',
 		'parenttype': 'DocType',
 		'permlevel': 0,
 		'read': 1,
 		'role': 'Guest',
-		'submit': None,
 		'write': 1
+	},
+
+	# DocType, Home Control
+	{
+		'doctype': 'DocType',
+		'name': 'Home Control'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
 	}
 ]
--- a/home/doctype/widget_control/widget_control.txt
+++ b/home/doctype/widget_control/widget_control.txt
@@ -1,58 +1,32 @@
+# DocType, Widget Control
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
-		'allow_trash': None,
-		'autoname': None,
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': '',
-		'client_string': None,
-		'colour': 'White:FFF',
 		'creation': '2010-08-08 17:09:30',
-		'description': None,
 		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
 		'doctype': 'DocType',
-		'document_type': None,
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
 		'issingle': 1,
 		'istable': 0,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-06-09 16:44:21',
-		'modified_by': 'Administrator',
 		'module': 'Home',
-		'name': 'Widget Control',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
+		'name': '__common__',
 		'section_style': 'Simple',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
 		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
-		'version': 28
+		'version': 27
+	},
+
+	# DocType, Widget Control
+	{
+		'doctype': 'DocType',
+		'name': 'Widget Control'
 	}
 ]
--- a/home/page/event_updates/event_updates.txt
+++ b/home/page/event_updates/event_updates.txt
@@ -1,36 +1,27 @@
+# Page, Event Updates
 [
+
+	# These values are common in all dictionaries
 	{
-		'author': None,
-		'category': None,
-		'content': None,
-		'creation': '2010-12-14 10:33:09',
+		'creation': '2010-12-14 10:23:23',
 		'docstatus': 0,
-		'doctype': 'Page',
-		'file_list': None,
-		'icon': None,
-		'idx': None,
-		'keywords': None,
-		'menu_index': None,
-		'modified': '2010-12-23 11:48:49',
+		'modified': '2010-12-27 10:58:56',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Page
+	{
+		'doctype': 'Page',
 		'module': 'Home',
-		'name': 'Event Updates',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_name': 'Event Updates',
-		'page_title': None,
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'publish': None,
-		'script': None,
-		'show_in_menu': None,
-		'site_description': None,
-		'standard': 'Yes',
-		'static_content': None,
-		'style': None,
-		'stylesheet': None,
-		'template': None,
-		'write_content': None
+		'standard': 'Yes'
+	},
+
+	# Page, Event Updates
+	{
+		'doctype': 'Page',
+		'name': 'Event Updates'
 	}
 ]
--- a/home/page/my_company/my_company.py
+++ b/home/page/my_company/my_company.py
@@ -108,7 +108,7 @@ def post_comment(arg):
 			fn = webnotes.user.name

 		from webnotes.utils.email_lib import sendmail
-		from settings.doctype.notification_control.notification_control import get_formatted_message
+		from setup.doctype.notification_control.notification_control import get_formatted_message
 		
 		message = '''A new comment has been posted on your page by %s:
 		
--- a/home/page/my_company/my_company.txt
+++ b/home/page/my_company/my_company.txt
@@ -1,64 +1,51 @@
+# Page, My Company
 [
+
+	# These values are common in all dictionaries
 	{
-		'author': None,
-		'category': None,
-		'content': '',
-		'creation': '2010-12-14 10:33:09',
+		'creation': '2010-12-14 10:23:19',
 		'docstatus': 0,
-		'doctype': 'Page',
-		'file_list': None,
-		'icon': None,
-		'idx': None,
-		'keywords': None,
-		'menu_index': None,
-		'modified': '2010-12-01 17:09:46',
+		'modified': '2010-12-27 17:44:15',
 		'modified_by': 'Administrator',
-		'module': 'Home',
-		'name': 'My Company',
-		'owner': 'Administrator',
-		'page_name': 'My Company',
-		'page_title': None,
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'publish': None,
-		'script': None,
-		'show_in_menu': 1,
-		'site_description': None,
-		'standard': 'Yes',
-		'static_content': '',
-		'style': '',
-		'stylesheet': None,
-		'template': None,
-		'write_content': None
+		'owner': 'Administrator'
 	},
+
+	# These values are common for all Page
+	{
+		'doctype': 'Page',
+		'module': 'Home',
+		'name': '__common__',
+		'page_name': 'My Company',
+		'show_in_menu': 1,
+		'standard': 'Yes'
+	},
+
+	# These values are common for all Page Role
+	{
+		'doctype': 'Page Role',
+		'name': '__common__',
+		'parent': 'My Company',
+		'parentfield': 'roles',
+		'parenttype': 'Page'
+	},
+
+	# Page, My Company
+	{
+		'doctype': 'Page',
+		'name': 'My Company'
+	},
+
+	# Page Role
 	{
-		'creation': '2010-12-14 10:33:09',
-		'docstatus': 0,
 		'doctype': 'Page Role',
 		'idx': 1,
-		'modified': '2010-12-14 10:33:09',
-		'modified_by': 'Administrator',
-		'name': 'PR000235',
-		'owner': 'Administrator',
-		'parent': 'My Company',
-		'parentfield': 'roles',
-		'parenttype': 'Page',
 		'role': 'Administrator'
 	},
+
+	# Page Role
 	{
-		'creation': '2010-12-14 10:33:09',
-		'docstatus': 0,
 		'doctype': 'Page Role',
 		'idx': 2,
-		'modified': '2010-12-14 10:33:09',
-		'modified_by': 'Administrator',
-		'name': 'PR000236',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'My Company',
-		'parentfield': 'roles',
-		'parenttype': 'Page',
 		'role': 'All'
 	}
 ]
--- a/home/page/profile_settings/profile_settings.txt
+++ b/home/page/profile_settings/profile_settings.txt
@@ -1,36 +1,27 @@
+# Page, profile-settings
 [
+
+	# These values are common in all dictionaries
 	{
-		'author': None,
-		'category': 'Standard',
-		'content': None,
-		'creation': '2011-04-13 12:08:59',
+		'creation': '2011-04-18 10:19:10',
 		'docstatus': 0,
-		'doctype': 'Page',
-		'file_list': None,
-		'icon': None,
-		'idx': None,
-		'keywords': None,
-		'menu_index': None,
 		'modified': '2011-04-13 12:08:59',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Page
+	{
+		'doctype': 'Page',
 		'module': 'Home',
-		'name': 'profile-settings',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_name': 'Profile Settings',
-		'page_title': None,
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'publish': None,
-		'script': None,
-		'show_in_menu': None,
-		'site_description': None,
-		'standard': 'Yes',
-		'static_content': None,
-		'style': None,
-		'stylesheet': None,
-		'template': None,
-		'write_content': None
+		'standard': 'Yes'
+	},
+
+	# Page, profile-settings
+	{
+		'doctype': 'Page',
+		'name': 'profile-settings'
 	}
 ]
--- a/home/search_criteria/bills_to_be_paid/bills_to_be_paid.txt
+++ b/home/search_criteria/bills_to_be_paid/bills_to_be_paid.txt
@@ -1,37 +1,34 @@
+# Search Criteria, bills-to_be_paid
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': '`tabPayable Voucher`.outstanding_amount!=0\n`tabPayable Voucher`.docstatus=1',
-		'add_tab': None,
-		'columns': 'Payable Voucher\x01ID,Payable Voucher\x01Voucher Date,Payable Voucher\x01Due Date,Payable Voucher\x01Credit To,Payable Voucher\x01Bill Date,Payable Voucher\x01Outstanding Amount',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Bills-To be paid',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Payable Voucher',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Payable Voucher\x01Submitted':1,'Payable Voucher\x01Is Opening':'','Payable Voucher\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-13 17:26:48',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': '`tabPayable Voucher`.outstanding_amount!=0\n`tabPayable Voucher`.docstatus=1',
+		'columns': 'Payable Voucher\x01ID,Payable Voucher\x01Voucher Date,Payable Voucher\x01Due Date,Payable Voucher\x01Credit To,Payable Voucher\x01Bill Date,Payable Voucher\x01Outstanding Amount',
+		'criteria_name': 'Bills-To be paid',
+		'doc_type': 'Payable Voucher',
+		'doctype': 'Search Criteria',
+		'filters': "{'Payable Voucher\x01Submitted':1,'Payable Voucher\x01Is Opening':'','Payable Voucher\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'bills-to_be_paid',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabPayable Voucher`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, bills-to_be_paid
+	{
+		'doctype': 'Search Criteria',
+		'name': 'bills-to_be_paid'
 	}
 ]
--- a/home/search_criteria/bills_to_be_submitted/bills_to_be_submitted.txt
+++ b/home/search_criteria/bills_to_be_submitted/bills_to_be_submitted.txt
@@ -1,37 +1,33 @@
+# Search Criteria, bills-to_be_submitted
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Payable Voucher\x01ID,Payable Voucher\x01Voucher Date,Payable Voucher\x01Due Date,Payable Voucher\x01Credit To,Payable Voucher\x01Bill No,Payable Voucher\x01Bill Date,Payable Voucher\x01Outstanding Amount',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Bills-To be submitted',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Payable Voucher',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Payable Voucher\x01Saved':1,'Payable Voucher\x01Is Opening':'','Payable Voucher\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-03 12:24:43',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Payable Voucher\x01ID,Payable Voucher\x01Voucher Date,Payable Voucher\x01Due Date,Payable Voucher\x01Credit To,Payable Voucher\x01Bill No,Payable Voucher\x01Bill Date,Payable Voucher\x01Outstanding Amount',
+		'criteria_name': 'Bills-To be submitted',
+		'doc_type': 'Payable Voucher',
+		'doctype': 'Search Criteria',
+		'filters': "{'Payable Voucher\x01Saved':1,'Payable Voucher\x01Is Opening':'','Payable Voucher\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'bills-to_be_submitted',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabPayable Voucher`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, bills-to_be_submitted
+	{
+		'doctype': 'Search Criteria',
+		'name': 'bills-to_be_submitted'
 	}
 ]
--- a/home/search_criteria/delivery_note_to_be_billed/delivery_note_to_be_billed.txt
+++ b/home/search_criteria/delivery_note_to_be_billed/delivery_note_to_be_billed.txt
@@ -1,37 +1,34 @@
+# Search Criteria, delivery_note-to_be_billed
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': 'ifnull(`tabDelivery Note`.per_billed, 0) < 100',
-		'add_tab': None,
-		'columns': 'Delivery Note\x01ID,Delivery Note\x01Owner,Delivery Note\x01Customer Name,Delivery Note\x01% Billed,Delivery Note\x01Company',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Delivery Note-To be billed',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Delivery Note',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Delivery Note\x01Submitted':1,'Delivery Note\x01Status':'Submitted','Delivery Note\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-13 17:24:34',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': 'ifnull(`tabDelivery Note`.per_billed, 0) < 100',
+		'columns': 'Delivery Note\x01ID,Delivery Note\x01Owner,Delivery Note\x01Customer Name,Delivery Note\x01% Billed,Delivery Note\x01Company',
+		'criteria_name': 'Delivery Note-To be billed',
+		'doc_type': 'Delivery Note',
+		'doctype': 'Search Criteria',
+		'filters': "{'Delivery Note\x01Submitted':1,'Delivery Note\x01Status':'Submitted','Delivery Note\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'delivery_note-to_be_billed',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabDelivery Note`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, delivery_note-to_be_billed
+	{
+		'doctype': 'Search Criteria',
+		'name': 'delivery_note-to_be_billed'
 	}
 ]
--- a/home/search_criteria/delivery_note_to_be_submitted/delivery_note_to_be_submitted.txt
+++ b/home/search_criteria/delivery_note_to_be_submitted/delivery_note_to_be_submitted.txt
@@ -1,37 +1,33 @@
+# Search Criteria, delivery_note-to_be_submitted
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Delivery Note\x01ID,Delivery Note\x01Owner,Delivery Note\x01Customer Name,Delivery Note\x01Posting Date,Delivery Note\x01Company',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Delivery Note-To be submitted',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Delivery Note',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Delivery Note\x01Saved':1,'Delivery Note\x01Status':'Draft','Delivery Note\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-13 17:17:58',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Delivery Note\x01ID,Delivery Note\x01Owner,Delivery Note\x01Customer Name,Delivery Note\x01Posting Date,Delivery Note\x01Company',
+		'criteria_name': 'Delivery Note-To be submitted',
+		'doc_type': 'Delivery Note',
+		'doctype': 'Search Criteria',
+		'filters': "{'Delivery Note\x01Saved':1,'Delivery Note\x01Status':'Draft','Delivery Note\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'delivery_note-to_be_submitted',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabDelivery Note`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, delivery_note-to_be_submitted
+	{
+		'doctype': 'Search Criteria',
+		'name': 'delivery_note-to_be_submitted'
 	}
 ]
--- a/home/search_criteria/enquiry_quotations_to_be_sent/enquiry_quotations_to_be_sent.txt
+++ b/home/search_criteria/enquiry_quotations_to_be_sent/enquiry_quotations_to_be_sent.txt
@@ -1,37 +1,35 @@
+# Search Criteria, enquiry-quotations_to_be_sent
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:31',
+		'docstatus': 0,
+		'modified': '2010-07-16 13:29:58',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
 	{
-		'add_col': None,
 		'add_cond': '`tabQuotation`.enq_no!=`tabEnquiry`.name\n',
 		'add_tab': 'tabQuotation',
 		'columns': 'Enquiry\x01ID,Enquiry\x01Owner',
-		'creation': '2010-08-08 17:09:31',
 		'criteria_name': 'Enquiry-Quotations to be sent',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
 		'doc_type': 'Enquiry',
-		'docstatus': 0,
 		'doctype': 'Search Criteria',
 		'filters': '{}',
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-07-16 13:29:58',
-		'modified_by': 'Administrator',
 		'module': 'Home',
-		'name': 'enquiry-quotations_to_be_sent',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabEnquiry`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, enquiry-quotations_to_be_sent
+	{
+		'doctype': 'Search Criteria',
+		'name': 'enquiry-quotations_to_be_sent'
 	}
 ]
--- a/home/search_criteria/enquiry_to_follow_up/enquiry_to_follow_up.txt
+++ b/home/search_criteria/enquiry_to_follow_up/enquiry_to_follow_up.txt
@@ -1,37 +1,34 @@
+# Search Criteria, enquiry-to_follow_up
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': '',
-		'add_cond': "`tabEnquiry`.name=`tabQuotation`.enq_no\n`tabEnquiry`.docstatus=1\n`tabQuotation`.status='Submitted'",
-		'add_tab': None,
-		'columns': 'Enquiry\x01ID,Enquiry\x01Owner,Enquiry\x01Company,Enquiry\x01Fiscal Year',
-		'creation': '2010-09-01 15:47:57',
-		'criteria_name': 'Enquiry-To follow up',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Enquiry',
+		'creation': '2010-09-01 15:48:09',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Enquiry\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-08-30 12:08:00',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "`tabEnquiry`.name=`tabQuotation`.enq_no\n`tabEnquiry`.docstatus=1\n`tabQuotation`.status='Submitted'",
+		'columns': 'Enquiry\x01ID,Enquiry\x01Owner,Enquiry\x01Company,Enquiry\x01Fiscal Year',
+		'criteria_name': 'Enquiry-To follow up',
+		'doc_type': 'Enquiry',
+		'doctype': 'Search Criteria',
+		'filters': "{'Enquiry\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'enquiry-to_follow_up',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabEnquiry`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, enquiry-to_follow_up
+	{
+		'doctype': 'Search Criteria',
+		'name': 'enquiry-to_follow_up'
 	}
 ]
--- a/home/search_criteria/indent_purchase_order_to_be_made/indent_purchase_order_to_be_made.txt
+++ b/home/search_criteria/indent_purchase_order_to_be_made/indent_purchase_order_to_be_made.txt
@@ -1,37 +1,34 @@
+# Search Criteria, indent-purchase_order_to_be_made
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': "`tabIndent`.status='Submitted'\nifnull(`tabIndent`.per_ordered,0)<100",
-		'add_tab': '',
-		'columns': 'Indent\x01ID,Indent\x01Indent Date,Indent\x01Requested By,Indent\x01Owner,Indent\x01% Ordered',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Indent-Purchase Order to be made',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Indent',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Indent\x01Submitted':1,'Indent\x01Status':'Submitted','Indent\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-13 17:37:18',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "`tabIndent`.status='Submitted'\nifnull(`tabIndent`.per_ordered,0)<100",
+		'columns': 'Indent\x01ID,Indent\x01Indent Date,Indent\x01Requested By,Indent\x01Owner,Indent\x01% Ordered',
+		'criteria_name': 'Indent-Purchase Order to be made',
+		'doc_type': 'Indent',
+		'doctype': 'Search Criteria',
+		'filters': "{'Indent\x01Submitted':1,'Indent\x01Status':'Submitted','Indent\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'indent-purchase_order_to_be_made',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabIndent`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, indent-purchase_order_to_be_made
+	{
+		'doctype': 'Search Criteria',
+		'name': 'indent-purchase_order_to_be_made'
 	}
 ]
--- a/home/search_criteria/indent_to_be_submitted/indent_to_be_submitted.txt
+++ b/home/search_criteria/indent_to_be_submitted/indent_to_be_submitted.txt
@@ -1,37 +1,34 @@
+# Search Criteria, indent-to_be_submitted
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': "`tabIndent`.status='Draft'",
-		'add_tab': None,
-		'columns': 'Indent\x01ID,Indent\x01Owner,Indent\x01Indent Date,Indent\x01Remarks',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Indent-To be submitted',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Indent',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Indent\x01Saved':1,'Indent\x01Status':'Draft','Indent\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-13 17:38:49',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "`tabIndent`.status='Draft'",
+		'columns': 'Indent\x01ID,Indent\x01Owner,Indent\x01Indent Date,Indent\x01Remarks',
+		'criteria_name': 'Indent-To be submitted',
+		'doc_type': 'Indent',
+		'doctype': 'Search Criteria',
+		'filters': "{'Indent\x01Saved':1,'Indent\x01Status':'Draft','Indent\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'indent-to_be_submitted',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabIndent`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, indent-to_be_submitted
+	{
+		'doctype': 'Search Criteria',
+		'name': 'indent-to_be_submitted'
 	}
 ]
--- a/home/search_criteria/invoices_overdue/invoices_overdue.txt
+++ b/home/search_criteria/invoices_overdue/invoices_overdue.txt
@@ -1,37 +1,34 @@
+# Search Criteria, invoices-overdue
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': '`tabReceivable Voucher`.due_date<now()\n`tabReceivable Voucher`.outstanding_amount!=0\n`tabReceivable Voucher`.docstatus=1',
-		'add_tab': None,
-		'columns': 'Receivable Voucher\x01ID,Receivable Voucher\x01Debit To,Receivable Voucher\x01Voucher Date,Receivable Voucher\x01Due Date,Receivable Voucher\x01Outstanding Amount',
 		'creation': '2010-08-08 17:09:31',
-		'criteria_name': 'Invoices-Overdue',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Receivable Voucher',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Receivable Voucher\x01Saved':1,'Receivable Voucher\x01Submitted':1,'Receivable Voucher\x01Is Opening':'','Receivable Voucher\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-04-30 17:08:52',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': '`tabReceivable Voucher`.due_date<now()\n`tabReceivable Voucher`.outstanding_amount!=0\n`tabReceivable Voucher`.docstatus=1',
+		'columns': 'Receivable Voucher\x01ID,Receivable Voucher\x01Debit To,Receivable Voucher\x01Voucher Date,Receivable Voucher\x01Due Date,Receivable Voucher\x01Outstanding Amount',
+		'criteria_name': 'Invoices-Overdue',
+		'doc_type': 'Receivable Voucher',
+		'doctype': 'Search Criteria',
+		'filters': "{'Receivable Voucher\x01Saved':1,'Receivable Voucher\x01Submitted':1,'Receivable Voucher\x01Is Opening':'','Receivable Voucher\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'invoices-overdue',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabReceivable Voucher`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, invoices-overdue
+	{
+		'doctype': 'Search Criteria',
+		'name': 'invoices-overdue'
 	}
 ]
--- a/home/search_criteria/invoices_to_be_submitted/invoices_to_be_submitted.txt
+++ b/home/search_criteria/invoices_to_be_submitted/invoices_to_be_submitted.txt
@@ -1,37 +1,33 @@
+# Search Criteria, invoices-to_be_submitted
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': '',
-		'add_tab': None,
-		'columns': 'Receivable Voucher\x01ID,Receivable Voucher\x01Debit To,Receivable Voucher\x01Voucher Date,Receivable Voucher\x01Due Date',
 		'creation': '2010-08-08 17:09:31',
-		'criteria_name': 'Invoices-To be submitted',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Receivable Voucher',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Receivable Voucher\x01Saved':1,'Receivable Voucher\x01Is Opening':'','Receivable Voucher\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-03 10:18:56',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Receivable Voucher\x01ID,Receivable Voucher\x01Debit To,Receivable Voucher\x01Voucher Date,Receivable Voucher\x01Due Date',
+		'criteria_name': 'Invoices-To be submitted',
+		'doc_type': 'Receivable Voucher',
+		'doctype': 'Search Criteria',
+		'filters': "{'Receivable Voucher\x01Saved':1,'Receivable Voucher\x01Is Opening':'','Receivable Voucher\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'invoices-to_be_submitted',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabReceivable Voucher`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, invoices-to_be_submitted
+	{
+		'doctype': 'Search Criteria',
+		'name': 'invoices-to_be_submitted'
 	}
 ]
--- a/home/search_criteria/invoices_to_receive_payment/invoices_to_receive_payment.txt
+++ b/home/search_criteria/invoices_to_receive_payment/invoices_to_receive_payment.txt
@@ -1,37 +1,34 @@
+# Search Criteria, invoices-to_receive_payment
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': '`tabReceivable Voucher`.due_date>now() \n`tabReceivable Voucher`.outstanding_amount!=0\n`tabReceivable Voucher`.docstatus=1',
-		'add_tab': None,
-		'columns': 'Receivable Voucher\x01ID,Receivable Voucher\x01Owner,Receivable Voucher\x01Debit To,Receivable Voucher\x01Voucher Date,Receivable Voucher\x01Due Date,Receivable Voucher\x01Outstanding Amount',
 		'creation': '2010-08-08 17:09:31',
-		'criteria_name': 'Invoices-To receive payment',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Receivable Voucher',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Receivable Voucher\x01Submitted':1,'Receivable Voucher\x01Is Opening':'','Receivable Voucher\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-04-30 16:54:26',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': '`tabReceivable Voucher`.due_date>now() \n`tabReceivable Voucher`.outstanding_amount!=0\n`tabReceivable Voucher`.docstatus=1',
+		'columns': 'Receivable Voucher\x01ID,Receivable Voucher\x01Owner,Receivable Voucher\x01Debit To,Receivable Voucher\x01Voucher Date,Receivable Voucher\x01Due Date,Receivable Voucher\x01Outstanding Amount',
+		'criteria_name': 'Invoices-To receive payment',
+		'doc_type': 'Receivable Voucher',
+		'doctype': 'Search Criteria',
+		'filters': "{'Receivable Voucher\x01Submitted':1,'Receivable Voucher\x01Is Opening':'','Receivable Voucher\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'invoices-to_receive_payment',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabReceivable Voucher`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, invoices-to_receive_payment
+	{
+		'doctype': 'Search Criteria',
+		'name': 'invoices-to_receive_payment'
 	}
 ]
--- a/home/search_criteria/lead_to_follow_up/lead_to_follow_up.txt
+++ b/home/search_criteria/lead_to_follow_up/lead_to_follow_up.txt
@@ -1,37 +1,34 @@
+# Search Criteria, lead-to_follow_up
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': "`tabLead`.status!='Converted' \n`tabLead`.status!='Lead Lost' \n`tabLead`.status!='Not Interested'",
-		'add_tab': None,
-		'columns': 'Lead\x01ID,Lead\x01Status,Lead\x01Lead Name,Lead\x01Lead Date,Lead\x01Lead Owner,Lead\x01Next Contact Date',
-		'creation': '2010-09-01 15:47:57',
-		'criteria_name': 'Lead-To follow up',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Lead',
+		'creation': '2010-09-01 15:48:09',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Lead\x01Status':'','Lead\x01Source':'','Lead\x01Expected Month':'','Lead\x01Industry':'','Lead\x01Market Segment':'','Lead\x01Rating':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-08-30 12:01:19',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "`tabLead`.status!='Converted' \n`tabLead`.status!='Lead Lost' \n`tabLead`.status!='Not Interested'",
+		'columns': 'Lead\x01ID,Lead\x01Status,Lead\x01Lead Name,Lead\x01Lead Date,Lead\x01Lead Owner,Lead\x01Next Contact Date',
+		'criteria_name': 'Lead-To follow up',
+		'doc_type': 'Lead',
+		'doctype': 'Search Criteria',
+		'filters': "{'Lead\x01Status':'','Lead\x01Source':'','Lead\x01Expected Month':'','Lead\x01Industry':'','Lead\x01Market Segment':'','Lead\x01Rating':''}",
 		'module': 'Home',
-		'name': 'lead-to_follow_up',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabLead`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, lead-to_follow_up
+	{
+		'doctype': 'Search Criteria',
+		'name': 'lead-to_follow_up'
 	}
 ]
--- a/home/search_criteria/purchase_order_to_be_billed/purchase_order_to_be_billed.txt
+++ b/home/search_criteria/purchase_order_to_be_billed/purchase_order_to_be_billed.txt
@@ -1,37 +1,34 @@
+# Search Criteria, purchase_order-to_be_billed
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': "ifnull(`tabPurchase Order`.per_billed,0)<100\n`tabPurchase Order`.status='Submitted'",
-		'add_tab': None,
-		'columns': 'Purchase Order\x01ID,Purchase Order\x01Supplier,Purchase Order\x01PO Date,Purchase Order\x01Company,Purchase Order\x01Grand Total',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Purchase Order-To be billed',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Purchase Order',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Purchase Order\x01Submitted':1,'Purchase Order\x01Status':'Submitted','Purchase Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-13 17:31:42',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "ifnull(`tabPurchase Order`.per_billed,0)<100\n`tabPurchase Order`.status='Submitted'",
+		'columns': 'Purchase Order\x01ID,Purchase Order\x01Supplier,Purchase Order\x01PO Date,Purchase Order\x01Company,Purchase Order\x01Grand Total',
+		'criteria_name': 'Purchase Order-To be billed',
+		'doc_type': 'Purchase Order',
+		'doctype': 'Search Criteria',
+		'filters': "{'Purchase Order\x01Submitted':1,'Purchase Order\x01Status':'Submitted','Purchase Order\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'purchase_order-to_be_billed',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabPurchase Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, purchase_order-to_be_billed
+	{
+		'doctype': 'Search Criteria',
+		'name': 'purchase_order-to_be_billed'
 	}
 ]
--- a/home/search_criteria/purchase_order_to_be_submitted/purchase_order_to_be_submitted.txt
+++ b/home/search_criteria/purchase_order_to_be_submitted/purchase_order_to_be_submitted.txt
@@ -1,37 +1,33 @@
+# Search Criteria, purchase_order-to_be_submitted
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Purchase Order\x01ID,Purchase Order\x01Supplier,Purchase Order\x01PO Date,Purchase Order\x01Company,Purchase Order\x01Grand Total',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Purchase Order-To be submitted',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Purchase Order',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Purchase Order\x01Saved':1,'Purchase Order\x01Submitted':0,'Purchase Order\x01Status':'Draft','Purchase Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-03 11:19:23',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Purchase Order\x01ID,Purchase Order\x01Supplier,Purchase Order\x01PO Date,Purchase Order\x01Company,Purchase Order\x01Grand Total',
+		'criteria_name': 'Purchase Order-To be submitted',
+		'doc_type': 'Purchase Order',
+		'doctype': 'Search Criteria',
+		'filters': "{'Purchase Order\x01Saved':1,'Purchase Order\x01Submitted':0,'Purchase Order\x01Status':'Draft','Purchase Order\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'purchase_order-to_be_submitted',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabPurchase Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, purchase_order-to_be_submitted
+	{
+		'doctype': 'Search Criteria',
+		'name': 'purchase_order-to_be_submitted'
 	}
 ]
--- a/home/search_criteria/purchase_order_to_receive_items/purchase_order_to_receive_items.txt
+++ b/home/search_criteria/purchase_order_to_receive_items/purchase_order_to_receive_items.txt
@@ -1,37 +1,34 @@
+# Search Criteria, purchase_order-to_receive_items
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': "ifnull(`tabPurchase Order`.per_received,0)<100\n`tabPurchase Order`.status='Submitted'",
-		'add_tab': None,
-		'columns': 'Purchase Order\x01ID,Purchase Order\x01Supplier,Purchase Order\x01PO Date,Purchase Order\x01Company,Purchase Order\x01% Received,Purchase Order\x01Grand Total',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Purchase Order-To receive items',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Purchase Order',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Purchase Order\x01Submitted':1,'Purchase Order\x01Status':'Submitted','Purchase Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-13 17:34:22',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "ifnull(`tabPurchase Order`.per_received,0)<100\n`tabPurchase Order`.status='Submitted'",
+		'columns': 'Purchase Order\x01ID,Purchase Order\x01Supplier,Purchase Order\x01PO Date,Purchase Order\x01Company,Purchase Order\x01% Received,Purchase Order\x01Grand Total',
+		'criteria_name': 'Purchase Order-To receive items',
+		'doc_type': 'Purchase Order',
+		'doctype': 'Search Criteria',
+		'filters': "{'Purchase Order\x01Submitted':1,'Purchase Order\x01Status':'Submitted','Purchase Order\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'purchase_order-to_receive_items',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabPurchase Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, purchase_order-to_receive_items
+	{
+		'doctype': 'Search Criteria',
+		'name': 'purchase_order-to_receive_items'
 	}
 ]
--- a/home/search_criteria/sales_order_overdue/sales_order_overdue.txt
+++ b/home/search_criteria/sales_order_overdue/sales_order_overdue.txt
@@ -1,37 +1,34 @@
+# Search Criteria, sales_order-overdue
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': '`tabSales Order`.delivery_date<now()\nifnull(`tabSales Order`.per_delivered,0)<100',
-		'add_tab': None,
-		'columns': 'Sales Order\x01ID,Sales Order\x01Customer,Sales Order\x01Sales Order Date,Sales Order\x01Expected Delivery Date,Sales Order\x01Quotation No,Sales Order\x01Company,Sales Order\x01%  Delivered',
-		'creation': '2010-08-26 11:52:27',
-		'criteria_name': 'Sales Order-Overdue',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Sales Order',
+		'creation': '2010-08-26 11:52:28',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Sales Order\x01Submitted':1,'Sales Order\x01Status':'Submitted','Sales Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-08-26 11:52:09',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': '`tabSales Order`.delivery_date<now()\nifnull(`tabSales Order`.per_delivered,0)<100',
+		'columns': 'Sales Order\x01ID,Sales Order\x01Customer,Sales Order\x01Sales Order Date,Sales Order\x01Expected Delivery Date,Sales Order\x01Quotation No,Sales Order\x01Company,Sales Order\x01%  Delivered',
+		'criteria_name': 'Sales Order-Overdue',
+		'doc_type': 'Sales Order',
+		'doctype': 'Search Criteria',
+		'filters': "{'Sales Order\x01Submitted':1,'Sales Order\x01Status':'Submitted','Sales Order\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'sales_order-overdue',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabSales Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, sales_order-overdue
+	{
+		'doctype': 'Search Criteria',
+		'name': 'sales_order-overdue'
 	}
 ]
--- a/home/search_criteria/sales_order_to_be_billed/sales_order_to_be_billed.txt
+++ b/home/search_criteria/sales_order_to_be_billed/sales_order_to_be_billed.txt
@@ -1,37 +1,34 @@
+# Search Criteria, sales_order-to_be_billed
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': "ifnull(`tabSales Order`.per_billed,0)<100\n`tabSales Order`.status='Submitted'",
-		'add_tab': None,
-		'columns': 'Sales Order\x01ID,Sales Order\x01Status,Sales Order\x01Quotation No,Sales Order\x01Sales Order Date,Sales Order\x01Expected Delivery Date,Sales Order\x01% Billed,Sales Order\x01Customer',
 		'creation': '2010-08-08 17:09:31',
-		'criteria_name': 'Sales Order-To be billed',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Sales Order',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Sales Order\x01Submitted':1,'Sales Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-13 17:45:37',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "ifnull(`tabSales Order`.per_billed,0)<100\n`tabSales Order`.status='Submitted'",
+		'columns': 'Sales Order\x01ID,Sales Order\x01Status,Sales Order\x01Quotation No,Sales Order\x01Sales Order Date,Sales Order\x01Expected Delivery Date,Sales Order\x01% Billed,Sales Order\x01Customer',
+		'criteria_name': 'Sales Order-To be billed',
+		'doc_type': 'Sales Order',
+		'doctype': 'Search Criteria',
+		'filters': "{'Sales Order\x01Submitted':1,'Sales Order\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'sales_order-to_be_billed',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabSales Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, sales_order-to_be_billed
+	{
+		'doctype': 'Search Criteria',
+		'name': 'sales_order-to_be_billed'
 	}
 ]
--- a/home/search_criteria/sales_order_to_be_delivered/sales_order_to_be_delivered.txt
+++ b/home/search_criteria/sales_order_to_be_delivered/sales_order_to_be_delivered.txt
@@ -1,37 +1,34 @@
+# Search Criteria, sales_order-to_be_delivered
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': "ifnull(`tabSales Order`.per_delivered,0)<100\n`tabSales Order`.status = 'Submitted'\n`tabSales Order`. delivery_date > now()",
-		'add_tab': None,
-		'columns': 'Sales Order\x01ID,Sales Order\x01Owner,Sales Order\x01Status,Sales Order\x01Customer,Sales Order\x01Sales Order Date,Sales Order\x01Expected Delivery Date,Sales Order\x01Quotation No',
 		'creation': '2010-08-08 17:09:31',
-		'criteria_name': 'Sales Order-To be delivered',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Sales Order',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Sales Order\x01Saved':1,'Sales Order\x01Submitted':1,'Sales Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-13 17:53:29',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "ifnull(`tabSales Order`.per_delivered,0)<100\n`tabSales Order`.status = 'Submitted'\n`tabSales Order`. delivery_date > now()",
+		'columns': 'Sales Order\x01ID,Sales Order\x01Owner,Sales Order\x01Status,Sales Order\x01Customer,Sales Order\x01Sales Order Date,Sales Order\x01Expected Delivery Date,Sales Order\x01Quotation No',
+		'criteria_name': 'Sales Order-To be delivered',
+		'doc_type': 'Sales Order',
+		'doctype': 'Search Criteria',
+		'filters': "{'Sales Order\x01Saved':1,'Sales Order\x01Submitted':1,'Sales Order\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'sales_order-to_be_delivered',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 100,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': '',
 		'sort_by': '`tabSales Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, sales_order-to_be_delivered
+	{
+		'doctype': 'Search Criteria',
+		'name': 'sales_order-to_be_delivered'
 	}
 ]
--- a/home/search_criteria/sales_order_to_be_submitted/sales_order_to_be_submitted.txt
+++ b/home/search_criteria/sales_order_to_be_submitted/sales_order_to_be_submitted.txt
@@ -1,37 +1,34 @@
+# Search Criteria, sales_order-to_be_submitted
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': "`tabSales Order`.status='Draft'",
-		'add_tab': None,
-		'columns': 'Sales Order\x01ID,Sales Order\x01Customer,Sales Order\x01Sales Order Date,Sales Order\x01Quotation No',
 		'creation': '2010-08-08 17:09:31',
-		'criteria_name': 'Sales Order-To be submitted',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Sales Order',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Sales Order\x01Saved':1,'Sales Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-13 17:47:45',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "`tabSales Order`.status='Draft'",
+		'columns': 'Sales Order\x01ID,Sales Order\x01Customer,Sales Order\x01Sales Order Date,Sales Order\x01Quotation No',
+		'criteria_name': 'Sales Order-To be submitted',
+		'doc_type': 'Sales Order',
+		'doctype': 'Search Criteria',
+		'filters': "{'Sales Order\x01Saved':1,'Sales Order\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'sales_order-to_be_submitted',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 100,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabSales Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, sales_order-to_be_submitted
+	{
+		'doctype': 'Search Criteria',
+		'name': 'sales_order-to_be_submitted'
 	}
 ]
--- a/home/search_criteria/serial_no_amc_expiring_this_month/serial_no_amc_expiring_this_month.txt
+++ b/home/search_criteria/serial_no_amc_expiring_this_month/serial_no_amc_expiring_this_month.txt
@@ -1,37 +1,34 @@
+# Search Criteria, serial_no-amc_expiring_this_month
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': '',
-		'add_cond': '`tab Serial No`.month(amc_expiry_date)=month(now()) \n`tab Serial No`.year(amc_expiry_date)=year(now())',
-		'add_tab': None,
-		'columns': 'Serial No\x01ID,Serial No\x01Status,Serial No\x01AMC Expiry Date,Serial No\x01Customer Name',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Serial No-AMC expiring this month',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Serial No',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Serial No\x01Saved':1,'Serial No\x01Submitted':1,'Serial No\x01Status':'','Serial No\x01Warranty Status':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-07-29 15:01:33',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': '`tab Serial No`.month(amc_expiry_date)=month(now()) \n`tab Serial No`.year(amc_expiry_date)=year(now())',
+		'columns': 'Serial No\x01ID,Serial No\x01Status,Serial No\x01AMC Expiry Date,Serial No\x01Customer Name',
+		'criteria_name': 'Serial No-AMC expiring this month',
+		'doc_type': 'Serial No',
+		'doctype': 'Search Criteria',
+		'filters': "{'Serial No\x01Saved':1,'Serial No\x01Submitted':1,'Serial No\x01Status':'','Serial No\x01Warranty Status':''}",
 		'module': 'Home',
-		'name': 'serial_no-amc_expiring_this_month',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabSerial No`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, serial_no-amc_expiring_this_month
+	{
+		'doctype': 'Search Criteria',
+		'name': 'serial_no-amc_expiring_this_month'
 	}
 ]
--- a/home/search_criteria/serial_no_warranty_expiring_this_month/serial_no_warranty_expiring_this_month.txt
+++ b/home/search_criteria/serial_no_warranty_expiring_this_month/serial_no_warranty_expiring_this_month.txt
@@ -1,37 +1,34 @@
+# Search Criteria, serial_no-warranty_expiring_this_month
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': '',
-		'add_cond': "`tab Serial No`.docstatus!=2\n`tab Serial No`.maintenance_status='Under Warranty'\n`tab Serial No`.status!='Scrapped'\n`tab Serial No`.status!='Not in Use'\n`tab Serial No`.month(ifnull(warranty_expiry_date,0)) = month(now()) \n`tab Serial No`.yearmonth(ifnull(warranty_expiry_date,0)) = year(now())",
-		'add_tab': None,
-		'columns': 'Serial No\x01ID,Serial No\x01Status,Serial No\x01Warranty Expiry Date,Serial No\x01Customer Name',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Serial No-Warranty expiring this month',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Serial No',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Serial No\x01Saved':1,'Serial No\x01Submitted':1,'Serial No\x01Status':'Issued','Serial No\x01Maintenance Status':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-07-23 09:57:51',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "`tab Serial No`.docstatus!=2\n`tab Serial No`.maintenance_status='Under Warranty'\n`tab Serial No`.status!='Scrapped'\n`tab Serial No`.status!='Not in Use'\n`tab Serial No`.month(ifnull(warranty_expiry_date,0)) = month(now()) \n`tab Serial No`.yearmonth(ifnull(warranty_expiry_date,0)) = year(now())",
+		'columns': 'Serial No\x01ID,Serial No\x01Status,Serial No\x01Warranty Expiry Date,Serial No\x01Customer Name',
+		'criteria_name': 'Serial No-Warranty expiring this month',
+		'doc_type': 'Serial No',
+		'doctype': 'Search Criteria',
+		'filters': "{'Serial No\x01Saved':1,'Serial No\x01Submitted':1,'Serial No\x01Status':'Issued','Serial No\x01Maintenance Status':''}",
 		'module': 'Home',
-		'name': 'serial_no-warranty_expiring_this_month',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabSerial No`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, serial_no-warranty_expiring_this_month
+	{
+		'doctype': 'Search Criteria',
+		'name': 'serial_no-warranty_expiring_this_month'
 	}
 ]
--- a/home/search_criteria/task_open/task_open.txt
+++ b/home/search_criteria/task_open/task_open.txt
@@ -1,37 +1,34 @@
+# Search Criteria, task-open
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': "`tabTicket`.status='Open'",
-		'add_tab': None,
-		'columns': 'Ticket\x01ID,Ticket\x01Subject,Ticket\x01Priority,Ticket\x01Raised By,Ticket\x01Allocated To',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Task-Open',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Ticket',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Ticket\x01Priority':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-07-16 13:03:49',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "`tabTicket`.status='Open'",
+		'columns': 'Ticket\x01ID,Ticket\x01Subject,Ticket\x01Priority,Ticket\x01Raised By,Ticket\x01Allocated To',
+		'criteria_name': 'Task-Open',
+		'doc_type': 'Ticket',
+		'doctype': 'Search Criteria',
+		'filters': "{'Ticket\x01Priority':''}",
 		'module': 'Home',
-		'name': 'task-open',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabTicket`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, task-open
+	{
+		'doctype': 'Search Criteria',
+		'name': 'task-open'
 	}
 ]