Merge branch 'edge'

Conflicts:
	home/page/latest_updates/latest_updates.js

accounts/doctype/c_form/c_form.txt

@@ -1,6 +1,6 @@
 [
  {
-  "creation": "2013-01-30 12:49:46", 
+  "creation": "2013-03-07 14:48:29", 
   "docstatus": 0, 
   "modified": "2013-02-13 11:29:18", 
   "modified_by": "Administrator", 
@@ -24,17 +24,13 @@
   "permlevel": 0
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
   "name": "__common__", 
   "parent": "C-Form", 
   "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "permlevel": 0, 
   "read": 1, 
-  "report": 1, 
+  "submit": 0
-  "submit": 0, 
-  "write": 1
  }, 
  {
   "doctype": "DocType", 
@@ -156,15 +152,6 @@
   "print_hide": 0, 
   "read_only": 1
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
-  "label": "File List", 
-  "print_hide": 1, 
-  "read_only": 0
- }, 
  {
   "doctype": "DocField", 
   "fieldname": "amended_from", 
@@ -176,11 +163,28 @@
   "read_only": 1
  }, 
  {
+  "create": 1, 
   "doctype": "DocPerm", 
-  "role": "Accounts User"
+  "permlevel": 0, 
+  "report": 1, 
+  "role": "Accounts User", 
+  "write": 1
  }, 
  {
+  "create": 1, 
   "doctype": "DocPerm", 
-  "role": "Accounts Manager"
+  "permlevel": 0, 
+  "report": 1, 
+  "role": "Accounts Manager", 
+  "write": 1
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "match": "", 
+  "permlevel": 1, 
+  "role": "All"
  }
 ]

accounts/doctype/purchase_invoice/purchase_invoice.txt

@@ -1,6 +1,6 @@
 [
  {
-  "creation": "2013-03-07 13:16:13", 
+  "creation": "2013-04-09 10:18:10", 
   "docstatus": 0, 
   "modified": "2013-03-22 18:17:14", 
   "modified_by": "Administrator", 
@@ -30,9 +30,7 @@
   "parent": "Purchase Invoice", 
   "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "permlevel": 0, 
+  "read": 1
-  "read": 1, 
-  "report": 1
  }, 
  {
   "doctype": "DocType", 
@@ -758,19 +756,69 @@
   "reqd": 0
  }, 
  {
-  "doctype": "DocField", 
+  "amend": 0, 
-  "fieldname": "file_list", 
+  "cancel": 0, 
-  "fieldtype": "Text", 
+  "create": 0, 
-  "hidden": 1, 
+  "doctype": "DocPerm", 
-  "label": "File List", 
+  "match": "", 
-  "no_copy": 1, 
+  "permlevel": 1, 
-  "print_hide": 1
+  "report": 0, 
+  "role": "Accounts Manager", 
+  "submit": 0, 
+  "write": 0
  }, 
  {
   "amend": 1, 
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
+  "permlevel": 0, 
+  "report": 1, 
+  "role": "Accounts Manager", 
+  "submit": 1, 
+  "write": 1
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "match": "", 
+  "permlevel": 1, 
+  "report": 0, 
+  "role": "Accounts User", 
+  "submit": 0, 
+  "write": 0
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "match": "", 
+  "permlevel": 1, 
+  "role": "Purchase User", 
+  "submit": 0
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "match": "", 
+  "permlevel": 0, 
+  "report": 1, 
+  "role": "Purchase User", 
+  "submit": 0, 
+  "write": 1
+ }, 
+ {
+  "amend": 1, 
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "permlevel": 0, 
+  "report": 1, 
   "role": "Accounts User", 
   "submit": 1, 
   "write": 1
@@ -778,6 +826,8 @@
  {
   "doctype": "DocPerm", 
   "match": "supplier", 
+  "permlevel": 0, 
+  "report": 1, 
   "role": "Supplier"
  }
 ]

accounts/doctype/sales_invoice/sales_invoice.txt

@@ -30,9 +30,7 @@
   "parent": "Sales Invoice", 
   "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "permlevel": 0, 
+  "read": 1
-  "read": 1, 
-  "report": 1
  }, 
  {
   "doctype": "DocType", 
@@ -1285,21 +1283,13 @@
   "read_only": 0, 
   "report_hide": 1
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
-  "label": "File List", 
-  "no_copy": 1, 
-  "print_hide": 1, 
-  "read_only": 0
- }, 
  {
   "amend": 1, 
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
+  "permlevel": 0, 
+  "report": 1, 
   "role": "Accounts User", 
   "submit": 1, 
   "write": 1
@@ -1307,6 +1297,8 @@
  {
   "doctype": "DocPerm", 
   "match": "customer", 
+  "permlevel": 0, 
+  "report": 1, 
   "role": "Customer"
- }
+ }, 
 ]

buying/doctype/purchase_order/purchase_order.txt

@@ -1,6 +1,6 @@
 [
  {
-  "creation": "2013-01-29 19:25:50", 
+  "creation": "2013-03-25 16:01:24", 
   "docstatus": 0, 
   "modified": "2013-02-18 13:37:11", 
   "modified_by": "Administrator", 
@@ -803,20 +803,12 @@
   "print_hide": 1, 
   "read_only": 1
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
-  "label": "File List", 
-  "no_copy": 1, 
-  "print_hide": 1
- }, 
  {
   "amend": 0, 
   "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
+  "match": "", 
   "permlevel": 1, 
   "report": 0, 
   "role": "Material User", 
@@ -839,6 +831,7 @@
   "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
+  "match": "", 
   "permlevel": 1, 
   "report": 0, 
   "role": "Purchase Manager", 
@@ -861,6 +854,7 @@
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
+  "match": "", 
   "permlevel": 0, 
   "report": 1, 
   "role": "Purchase User", 
@@ -872,6 +866,7 @@
   "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
+  "match": "", 
   "permlevel": 1, 
   "role": "All", 
   "submit": 0

buying/doctype/supplier_quotation/supplier_quotation.txt

@@ -1,6 +1,6 @@
 [
  {
-  "creation": "2013-01-29 19:25:54", 
+  "creation": "2013-03-25 16:01:25", 
   "docstatus": 0, 
   "modified": "2013-02-18 13:40:17", 
   "modified_by": "Administrator", 
@@ -663,15 +663,6 @@
   "print_hide": 1, 
   "read_only": 1
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
-  "label": "File List", 
-  "no_copy": 1, 
-  "print_hide": 1
- }, 
  {
   "amend": 1, 
   "cancel": 1, 
@@ -732,6 +723,7 @@
   "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
+  "match": "", 
   "permlevel": 1, 
   "report": 0, 
   "role": "All", 

home/page/latest_updates/latest_updates.js

@@ -1,6 +1,7 @@
 erpnext.updates = [
 	["18th April", ["Cost Center: Set a default Cost Center for a Company"]],
 	["12th April", ["Employee: List of Leave Approvers who can approve the Employee's Leave Applications"]],
+	["10th April", ["Redesigned File Uploads and added File Manager in Setup"]],
 	["3rd April", ["Update Manager: Open source users can update their ERPNext instance from Setup > Update Manager"]],
 	["27th March", ["Rename multiple items together. Go to Setup > Rename Tool"]],
 	["26th March", ["Added project to Stock Ledger and Balance",

hr/doctype/employee/employee.py

@@ -101,18 +101,19 @@ class DocType:
 		if self.doc.gender:
 			profile_wrapper.doc.gender = self.doc.gender
 			
-		if self.doc.image and self.doc.file_list:
+		if self.doc.image:
-			# add to file list and user_image
+			if not profile_wrapper.doc.user_image == self.doc.image:
-			for file_args in self.doc.file_list.split("\n"):
+				profile_wrapper.doc.user_image = self.doc.image
-				fname, fid = file_args.split(",")
+				try:
-				if self.doc.image == fname:
+					webnotes.doc({
-					new_file_args = fname + "," + fid
+						"doctype": "File Data",
-					file_list = cstr(profile_wrapper.doc.file_list).split("\n")
+						"file_name": self.doc.image,
-					if new_file_args not in file_list:
+						"attached_to_doctype": "Profile",
-						file_list += [new_file_args]
+						"attached_to_name": self.doc.user_id
-					profile_wrapper.doc.file_list = "\n".join(file_list)
+					}).insert()
-					profile_wrapper.doc.user_image = fname
+				except webnotes.DuplicateEntryError, e:
-					break
+					# already exists
+					pass
 			
 		profile_wrapper.save()
 		

hr/doctype/employee/employee.txt

@@ -30,9 +30,7 @@
   "parent": "Employee", 
   "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "permlevel": 0, 
   "read": 1, 
-  "report": 1, 
   "submit": 0
  }, 
  {
@@ -741,14 +739,6 @@
   "oldfieldname": "feedback", 
   "oldfieldtype": "Text"
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
-  "label": "File List", 
-  "print_hide": 1
- }, 
  {
   "doctype": "DocField", 
   "fieldname": "trash_reason", 
@@ -763,6 +753,18 @@
   "create": 0, 
   "doctype": "DocPerm", 
   "match": "employee", 
+  "permlevel": 0, 
+  "report": 1, 
+  "role": "Employee", 
+  "write": 0
+ }, 
+ {
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "match": "", 
+  "permlevel": 1, 
+  "report": 0, 
   "role": "Employee", 
   "write": 0
  }, 
@@ -771,6 +773,8 @@
   "create": 1, 
   "doctype": "DocPerm", 
   "match": "company", 
+  "permlevel": 0, 
+  "report": 1, 
   "role": "HR User", 
   "write": 1
  }, 
@@ -778,7 +782,29 @@
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
+  "permlevel": 0, 
+  "report": 1, 
   "role": "HR Manager", 
   "write": 1
+ }, 
+ {
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "match": "", 
+  "permlevel": 1, 
+  "report": 0, 
+  "role": "HR User", 
+  "write": 0
+ }, 
+ {
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "match": "", 
+  "permlevel": 1, 
+  "report": 0, 
+  "role": "HR Manager", 
+  "write": 0
  }
 ]

hr/doctype/job_applicant/job_applicant.txt

@@ -1,6 +1,6 @@
 [
  {
-  "creation": "2013-01-15 16:32:13", 
+  "creation": "2013-01-29 19:25:37", 
   "docstatus": 0, 
   "modified": "2013-01-29 17:44:52", 
   "modified_by": "Administrator", 
@@ -88,16 +88,6 @@
   "fieldtype": "HTML", 
   "label": "Thread HTML"
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
-  "in_list_view": 1, 
-  "label": "File List", 
-  "no_copy": 1, 
-  "print_hide": 1
- }, 
  {
   "doctype": "DocPerm"
  }

hr/doctype/leave_application/leave_application.txt

@@ -1,6 +1,6 @@
 [
  {
-  "creation": "2013-02-18 18:37:56", 
+  "creation": "2013-02-20 11:18:11", 
   "docstatus": 0, 
   "modified": "2013-02-19 16:30:05", 
   "modified_by": "Administrator", 
@@ -8,7 +8,6 @@
  }, 
  {
   "allow_attach": 1, 
-  "allow_import": 1, 
   "autoname": "LAP/.#####", 
   "description": "Apply / Approve Leaves", 
   "doctype": "DocType", 
@@ -227,16 +226,6 @@
   "print_hide": 1, 
   "read_only": 1
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
-  "label": "File List", 
-  "no_copy": 1, 
-  "permlevel": 0, 
-  "print_hide": 1
- }, 
  {
   "create": 1, 
   "doctype": "DocPerm", 
@@ -251,6 +240,7 @@
   "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
+  "match": "", 
   "permlevel": 1, 
   "role": "All", 
   "submit": 0
@@ -260,7 +250,6 @@
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "match": "company", 
   "permlevel": 0, 
   "report": 1, 
   "role": "HR User", 
@@ -269,8 +258,8 @@
  }, 
  {
   "amend": 1, 
-  "cancel": 1, 
+  "cancel": 0, 
-  "create": 1, 
+  "create": 0, 
   "doctype": "DocPerm", 
   "match": "leave_approver:user", 
   "permlevel": 0, 
@@ -284,6 +273,7 @@
   "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
+  "match": "", 
   "permlevel": 1, 
   "report": 1, 
   "role": "HR User", 
@@ -295,6 +285,7 @@
   "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
+  "match": "", 
   "permlevel": 1, 
   "report": 1, 
   "role": "Leave Approver", 

patches/april_2013/p05_update_file_data.py

@@ -0,0 +1,54 @@
+import webnotes, webnotes.utils, os
+from webnotes.modules.export_file import export_to_files
+
+def execute():
+	webnotes.reload_doc("core", "doctype", "file_data")
+	webnotes.reset_perms("File Data")
+	
+	singles = webnotes.conn.sql_list("""select name from tabDocType
+		where ifnull(issingle,0)=1""")
+	for doctype in webnotes.conn.sql_list("""select parent from tabDocField where 
+		fieldname='file_list' and fieldtype='Text'"""):
+		if doctype in singles:
+			doc = webnotes.doc(doctype, doctype)
+			if doc.file_list:
+				update_for_doc(doctype, doc)
+				webnotes.conn.set_value(doctype, None, "file_list", None)
+		else:
+			try:
+				for doc in webnotes.conn.sql("""select name, file_list from `tab%s` where 
+					ifnull(file_list, '')!=''""" % doctype, as_dict=True):
+					update_for_doc(doctype, doc)
+				webnotes.conn.commit()
+				webnotes.conn.sql("""alter table `tab%s` drop column file_list""" % doctype)
+			except Exception, e:
+				if e.args[0]!=1054: raise e
+		
+		webnotes.conn.sql("""delete from tabDocField where fieldname='file_list'
+				and parent=%s""", doctype)
+		export_to_files([["DocType", doctype]])
+
+def update_for_doc(doctype, doc):
+	for filedata in doc.file_list.split("\n"):
+		if not filedata:
+			continue
+			
+		filedata = filedata.split(",")
+		if len(filedata)==2:
+			filename, fileid = filedata[0], filedata[1] 
+		else:
+			continue
+		
+		exists = True
+		if not (filename.startswith("http://") or filename.startswith("https://")):
+			if not os.path.exists(webnotes.utils.get_path("public", "files", filename)):
+				exists = False
+
+		if exists:
+			webnotes.conn.sql("""update `tabFile Data` 
+				set attached_to_doctype=%s, attached_to_name=%s
+				where name=%s""", (doctype, doc.name, fileid))
+		
+		else:
+			webnotes.conn.sql("""delete from `tabFile Data` where name=%s""",
+				fileid)	

patches/april_2013/p06_update_file_size.py

@@ -0,0 +1,12 @@
+import webnotes, os, webnotes.utils
+
+def execute():
+	files_path = webnotes.utils.get_path("public", "files")
+	for f in webnotes.conn.sql("""select name, file_name from 
+		`tabFile Data`""", as_dict=True):
+		if f.file_name:
+			filepath = os.path.join(files_path, f.file_name)
+			if os.path.exists(filepath):
+				webnotes.conn.set_value("File Data", f.name, "file_size", os.stat(filepath).st_size)
+			
+		

patches/patch_list.py

@@ -240,8 +240,11 @@ patch_list = [
 	"patches.april_2013.p04_reverse_modules_list",
 	"execute:webnotes.delete_doc('Search Criteria', 'time_log_summary')",
 	"patches.april_2013.p04_update_role_in_pages",
+	"patches.april_2013.p05_update_file_data",
+	"patches.april_2013.p06_update_file_size",
 	"patches.april_2013.p05_fixes_in_reverse_modules",
 	"execute:webnotes.delete_doc('DocType Mapper', 'Delivery Note-Packing Slip')",
     "execute:webnotes.reload_doc('Stock', 'DocType', 'Delivery Note Item')",
 	"patches.april_2013.p06_default_cost_center",
+	"execute:webnotes.reset_perms('File Data')",
 ]

projects/doctype/task/task.txt

@@ -1,6 +1,6 @@
 [
  {
-  "creation": "2013-01-10 16:34:17", 
+  "creation": "2013-01-29 19:25:50", 
   "docstatus": 0, 
   "modified": "2013-01-29 16:27:52", 
   "modified_by": "Administrator", 
@@ -249,15 +249,6 @@
   "label": "Company", 
   "options": "Company"
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
-  "label": "File List", 
-  "no_copy": 1, 
-  "print_hide": 1
- }, 
  {
   "doctype": "DocPerm"
  }

projects/doctype/time_log/time_log.txt

@@ -1,6 +1,6 @@
 [
  {
-  "creation": "2013-03-06 14:08:07", 
+  "creation": "2013-04-03 16:38:41", 
   "docstatus": 0, 
   "modified": "2013-04-03 15:51:32", 
   "modified_by": "Administrator", 
@@ -185,17 +185,6 @@
   "permlevel": 0, 
   "read_only": 0
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
-  "label": "File List", 
-  "no_copy": 1, 
-  "permlevel": 0, 
-  "print_hide": 1, 
-  "read_only": 0
- }, 
  {
   "doctype": "DocField", 
   "fieldname": "amended_from", 

selling/doctype/sales_order/sales_order.txt

@@ -1,6 +1,6 @@
 [
  {
-  "creation": "2013-01-22 15:24:17", 
+  "creation": "2013-03-07 14:48:34", 
   "docstatus": 0, 
   "modified": "2013-01-29 17:14:58", 
   "modified_by": "Administrator", 
@@ -32,7 +32,6 @@
   "parent": "Sales Order", 
   "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "permlevel": 0, 
   "read": 1
  }, 
  {
@@ -952,21 +951,25 @@
   "print_hide": 1
  }, 
  {
-  "doctype": "DocField", 
+  "amend": 0, 
-  "fieldname": "file_list", 
+  "cancel": 0, 
-  "fieldtype": "Text", 
+  "create": 0, 
-  "hidden": 1, 
+  "doctype": "DocPerm", 
-  "label": "File List", 
+  "match": "", 
-  "no_copy": 1, 
+  "permlevel": 1, 
-  "print_hide": 1
+  "report": 0, 
+  "role": "Sales Manager", 
+  "submit": 0, 
+  "write": 0
  }, 
  {
   "amend": 1, 
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
+  "permlevel": 0, 
   "report": 1, 
-  "role": "Sales User", 
+  "role": "Sales Manager", 
   "submit": 1, 
   "write": 1
  }, 
@@ -975,6 +978,52 @@
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
+  "match": "", 
+  "permlevel": 0, 
+  "report": 1, 
+  "role": "Sales User", 
+  "submit": 1, 
+  "write": 1
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "match": "", 
+  "permlevel": 1, 
+  "report": 0, 
+  "role": "Sales User", 
+  "submit": 0, 
+  "write": 0
+ }, 
+ {
+  "amend": 1, 
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "permlevel": 0, 
+  "report": 1, 
+  "role": "Maintenance Manager", 
+  "submit": 1, 
+  "write": 1
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "match": "", 
+  "permlevel": 1, 
+  "role": "Maintenance Manager", 
+  "submit": 0
+ }, 
+ {
+  "amend": 1, 
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "permlevel": 0, 
   "report": 1, 
   "role": "Maintenance User", 
   "submit": 1, 
@@ -984,11 +1033,21 @@
   "amend": 0, 
   "cancel": 0, 
   "create": 0, 
+  "doctype": "DocPerm", 
+  "match": "", 
+  "permlevel": 1, 
+  "role": "Maintenance User", 
+  "submit": 0
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "permlevel": 0, 
+  "role": "Accounts User"
+ }, 
+ {
   "doctype": "DocPerm", 
   "match": "customer", 
-  "report": 0, 
+  "permlevel": 0, 
-  "role": "Customer", 
+  "role": "Customer"
-  "submit": 0, 
-  "write": 0
  }
 ]

setup/doctype/item_group/item_group.txt

@@ -173,15 +173,6 @@
   "report_hide": 1, 
   "search_index": 0
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
-  "label": "File List", 
-  "no_copy": 1, 
-  "print_hide": 1
- }, 
  {
   "amend": 0, 
   "cancel": 0, 

setup/doctype/price_list/price_list.txt

@@ -1,6 +1,6 @@
 [
  {
-  "creation": "2013-01-10 16:34:23", 
+  "creation": "2013-01-25 11:35:09", 
   "docstatus": 0, 
   "modified": "2013-01-22 14:56:41", 
   "modified_by": "Administrator", 
@@ -60,13 +60,6 @@
   "label": "How to upload", 
   "options": "<div class=\"help\">Use the <a href=\"#data-import-tool\">Data Import Tool</a> to upload, update Item Prices in bulk:\n<ol> \n<li>Go to Data Import Tool.\n<li>Select \"Item\"\n<li>Check on \"With Data\"\n<li>Download \"Item Price\" from Child Tables.\n<li>Update the prices required and add new rows if required.\n<li>Check on \"Overwrite\"\n<li>Upload the modified sheet.\n</div>\n"
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
-  "label": "File List"
- }, 
  {
   "cancel": 0, 
   "create": 0, 
@@ -85,6 +78,7 @@
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
+  "match": "", 
   "role": "Sales Master Manager", 
   "write": 1
  }

setup/page/setup/setup.js

@@ -82,6 +82,12 @@ wn.module_page["Setup"] = [
 				label: wn._("Rename Tool"),
 				"description":wn._("Rename multiple items in one go")
 			},
+			{
+				"route":"List/File Data",
+				doctype: "File Data",
+				label: wn._("File Manager"),
+				"description":wn._("List, delete uploaded files.")
+			},
 		]
 	},
 	{

stock/doctype/batch/batch.txt

@@ -1,6 +1,6 @@
 [
  {
-  "creation": "2013-03-01 08:21:54", 
+  "creation": "2013-03-01 19:09:43", 
   "docstatus": 0, 
   "modified": "2013-03-01 08:22:16", 
   "modified_by": "Administrator", 
@@ -24,19 +24,14 @@
   "permlevel": 0
  }, 
  {
-  "cancel": 1, 
-  "create": 1, 
   "doctype": "DocPerm", 
   "name": "__common__", 
   "parent": "Batch", 
   "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "permlevel": 0, 
   "read": 1, 
-  "report": 1, 
   "role": "Material Master Manager", 
-  "submit": 0, 
+  "submit": 0
-  "write": 1
  }, 
  {
   "doctype": "DocType", 
@@ -108,15 +103,19 @@
   "read_only": 1
  }, 
  {
-  "doctype": "DocField", 
+  "cancel": 1, 
-  "fieldname": "file_list", 
+  "create": 1, 
-  "fieldtype": "Text", 
+  "doctype": "DocPerm", 
-  "hidden": 1, 
+  "permlevel": 0, 
-  "label": "File List", 
+  "report": 1, 
-  "no_copy": 1, 
+  "write": 1
-  "print_hide": 1
  }, 
  {
-  "doctype": "DocPerm"
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "match": "", 
+  "permlevel": 1
  }
 ]

stock/doctype/delivery_note/delivery_note.txt

@@ -1,6 +1,6 @@
 [
  {
-  "creation": "2013-01-29 17:54:12", 
+  "creation": "2013-04-02 10:50:50", 
   "docstatus": 0, 
   "modified": "2013-02-02 19:18:38", 
   "modified_by": "Administrator", 
@@ -32,9 +32,7 @@
   "parent": "Delivery Note", 
   "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "permlevel": 0, 
+  "read": 1
-  "read": 1, 
-  "report": 1
  }, 
  {
   "doctype": "DocType", 
@@ -1123,20 +1121,25 @@
   "read_only": 0
  }, 
  {
-  "doctype": "DocField", 
+  "amend": 1, 
-  "fieldname": "file_list", 
+  "cancel": 1, 
-  "fieldtype": "Text", 
+  "create": 1, 
-  "hidden": 1, 
+  "doctype": "DocPerm", 
-  "label": "File List", 
+  "permlevel": 0, 
-  "no_copy": 1, 
+  "report": 1, 
-  "print_hide": 1, 
+  "role": "Material User", 
-  "read_only": 0
+  "submit": 1, 
+  "write": 1
  }, 
  {
+  "amend": 0, 
   "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "role": "Accounts User", 
+  "match": "", 
+  "permlevel": 1, 
+  "report": 0, 
+  "role": "Material User", 
   "submit": 0, 
   "write": 0
  }, 
@@ -1145,31 +1148,73 @@
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "role": "Sales User", 
+  "permlevel": 0, 
-  "submit": 1, 
+  "report": 1, 
-  "write": 1
- }, 
- {
-  "doctype": "DocPerm", 
-  "match": "customer_name", 
-  "role": "Customer"
- }, 
- {
-  "amend": 1, 
-  "cancel": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
   "role": "Material Manager", 
   "submit": 1, 
   "write": 1
  }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "match": "", 
+  "permlevel": 1, 
+  "report": 0, 
+  "role": "Material Manager", 
+  "submit": 0, 
+  "write": 0
+ }, 
  {
   "amend": 1, 
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "role": "Material User", 
+  "match": "", 
+  "permlevel": 0, 
+  "report": 1, 
+  "role": "Sales User", 
   "submit": 1, 
   "write": 1
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "match": "", 
+  "permlevel": 1, 
+  "report": 0, 
+  "role": "Sales User", 
+  "submit": 0, 
+  "write": 0
+ }, 
+ {
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "permlevel": 0, 
+  "report": 1, 
+  "role": "Accounts User", 
+  "submit": 0, 
+  "write": 0
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "match": "", 
+  "permlevel": 1, 
+  "role": "Accounts User", 
+  "submit": 0
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "match": "customer_name", 
+  "permlevel": 0, 
+  "report": 1, 
+  "role": "Customer"
  }
 ]

stock/doctype/item/item.txt

@@ -28,6 +28,7 @@
   "permlevel": 0
  }, 
  {
+  "amend": 0, 
   "doctype": "DocPerm", 
   "name": "__common__", 
   "parent": "Item", 
@@ -35,7 +36,6 @@
   "parenttype": "DocType", 
   "permlevel": 0, 
   "read": 1, 
-  "report": 1, 
   "submit": 0
  }, 
  {
@@ -746,16 +746,6 @@
   "read_only": 0, 
   "reqd": 1
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
-  "label": "File List", 
-  "no_copy": 1, 
-  "print_hide": 1, 
-  "read_only": 0
- }, 
  {
   "doctype": "DocField", 
   "fieldname": "customer_code", 
@@ -895,7 +885,6 @@
   "write": 1
  }, 
  {
-  "amend": 0, 
   "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
@@ -903,7 +892,6 @@
   "write": 0
  }, 
  {
-  "amend": 0, 
   "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 

stock/doctype/material_request/material_request.txt

@@ -1,6 +1,6 @@
 [
  {
-  "creation": "2013-02-21 14:15:25", 
+  "creation": "2013-03-07 14:48:38", 
   "docstatus": 0, 
   "modified": "2013-02-25 15:38:02", 
   "modified_by": "Administrator", 
@@ -331,15 +331,6 @@
   "options": "Print Heading", 
   "print_hide": 1
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
-  "label": "File List", 
-  "no_copy": 1, 
-  "print_hide": 1
- }, 
  {
   "amend": 0, 
   "cancel": 0, 

stock/doctype/purchase_receipt/purchase_receipt.txt

@@ -1,6 +1,6 @@
 [
  {
-  "creation": "2013-01-22 15:24:18", 
+  "creation": "2013-03-25 16:01:29", 
   "docstatus": 0, 
   "modified": "2013-02-02 19:09:37", 
   "modified_by": "Administrator", 
@@ -31,9 +31,7 @@
   "parent": "Purchase Receipt", 
   "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "permlevel": 0, 
+  "read": 1
-  "read": 1, 
-  "report": 1
  }, 
  {
   "doctype": "DocType", 
@@ -886,44 +884,78 @@
   "read_only": 1
  }, 
  {
-  "doctype": "DocField", 
+  "amend": 0, 
-  "fieldname": "file_list", 
+  "cancel": 0, 
-  "fieldtype": "Text", 
+  "create": 0, 
-  "hidden": 1, 
+  "doctype": "DocPerm", 
-  "label": "File List", 
+  "match": "", 
-  "no_copy": 1, 
+  "permlevel": 1, 
-  "print_hide": 1
+  "report": 0, 
- }, 
+  "role": "Material Manager", 
- {
+  "submit": 0, 
-  "amend": 1, 
+  "write": 0
-  "cancel": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "role": "Purchase User", 
-  "submit": 1, 
-  "write": 1
- }, 
- {
-  "doctype": "DocPerm", 
-  "match": "supplier", 
-  "role": "Supplier"
  }, 
  {
   "amend": 1, 
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
+  "permlevel": 0, 
+  "report": 1, 
   "role": "Material Manager", 
   "submit": 1, 
   "write": 1
  }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "match": "", 
+  "permlevel": 1, 
+  "report": 0, 
+  "role": "Material User", 
+  "submit": 0, 
+  "write": 0
+ }, 
  {
   "amend": 1, 
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
+  "permlevel": 0, 
+  "report": 1, 
   "role": "Material User", 
   "submit": 1, 
   "write": 1
+ }, 
+ {
+  "amend": 1, 
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "match": "", 
+  "permlevel": 0, 
+  "report": 1, 
+  "role": "Purchase User", 
+  "submit": 1, 
+  "write": 1
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "match": "", 
+  "permlevel": 1, 
+  "role": "Purchase User", 
+  "submit": 0
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "match": "supplier", 
+  "permlevel": 0, 
+  "report": 1, 
+  "role": "Supplier"
  }
 ]

stock/doctype/serial_no/serial_no.txt

@@ -1,6 +1,6 @@
 [
  {
-  "creation": "2013-01-10 16:34:29", 
+  "creation": "2013-01-29 19:25:41", 
   "docstatus": 0, 
   "modified": "2013-01-29 16:27:57", 
   "modified_by": "Administrator", 
@@ -31,8 +31,8 @@
   "parent": "Serial No", 
   "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "permlevel": 0, 
+  "read": 1, 
-  "read": 1
+  "submit": 0
  }, 
  {
   "doctype": "DocType", 
@@ -476,15 +476,6 @@
   "oldfieldtype": "Small Text", 
   "read_only": 1
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
-  "label": "File List", 
-  "no_copy": 1, 
-  "print_hide": 1
- }, 
  {
   "doctype": "DocField", 
   "fieldname": "sle_exists", 
@@ -496,25 +487,82 @@
   "read_only": 1, 
   "report_hide": 1
  }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "match": "", 
+  "permlevel": 1, 
+  "report": 0, 
+  "role": "Material Manager", 
+  "write": 0
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "permlevel": 0, 
+  "report": 1, 
+  "role": "Material Manager", 
+  "write": 0
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "match": "", 
+  "permlevel": 1, 
+  "report": 0, 
+  "role": "Material User", 
+  "write": 0
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "permlevel": 0, 
+  "report": 1, 
+  "role": "Material User", 
+  "write": 0
+ }, 
  {
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
+  "permlevel": 0, 
   "report": 1, 
-  "role": "Material User", 
+  "role": "System Manager", 
-  "submit": 0, 
   "write": 1
  }, 
  {
+  "cancel": 1, 
+  "create": 1, 
   "doctype": "DocPerm", 
-  "role": "Sales User"
+  "permlevel": 0, 
+  "report": 1, 
+  "role": "Material Master Manager", 
+  "write": 1
  }, 
  {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
   "doctype": "DocPerm", 
-  "role": "Purchase User"
+  "match": "", 
+  "permlevel": 1, 
+  "role": "System Manager"
  }, 
  {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
   "doctype": "DocPerm", 
-  "role": "Accounts User"
+  "match": "", 
+  "permlevel": 1, 
+  "role": "Sales Master Manager"
  }
 ]

stock/doctype/stock_reconciliation/stock_reconciliation.txt

@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-03-26 06:51:17", 
+  "creation": "2013-03-28 10:35:31", 
   "docstatus": 0, 
-  "modified": "2013-03-26 08:32:03", 
+  "modified": "2013-04-10 13:44:19", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -52,6 +52,7 @@
   "fieldname": "posting_date", 
   "fieldtype": "Date", 
   "in_filter": 0, 
+  "in_list_view": 1, 
   "label": "Posting Date", 
   "oldfieldname": "reconciliation_date", 
   "oldfieldtype": "Date", 
@@ -63,6 +64,7 @@
   "fieldname": "posting_time", 
   "fieldtype": "Time", 
   "in_filter": 0, 
+  "in_list_view": 1, 
   "label": "Posting Time", 
   "oldfieldname": "reconciliation_time", 
   "oldfieldtype": "Time", 
@@ -148,6 +150,7 @@
   "fieldname": "stock_value_difference", 
   "fieldtype": "Currency", 
   "hidden": 1, 
+  "in_list_view": 1, 
   "label": "Stock Value Difference", 
   "print_hide": 1
  }, 

support/doctype/support_ticket/support_ticket.txt

@@ -1,6 +1,6 @@
 [
  {
-  "creation": "2013-01-10 16:34:31", 
+  "creation": "2013-01-31 22:22:27", 
   "docstatus": 0, 
   "modified": "2013-01-31 22:17:24", 
   "modified_by": "Administrator", 
@@ -23,18 +23,13 @@
   "permlevel": 0
  }, 
  {
-  "amend": 0, 
-  "create": 1, 
   "doctype": "DocPerm", 
   "name": "__common__", 
   "parent": "Support Ticket", 
   "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "permlevel": 0, 
   "read": 1, 
-  "report": 1, 
+  "submit": 0
-  "submit": 0, 
-  "write": 1
  }, 
  {
   "doctype": "DocType", 
@@ -242,27 +237,51 @@
   "label": "Content Type"
  }, 
  {
-  "doctype": "DocField", 
+  "amend": 0, 
-  "fieldname": "file_list", 
+  "cancel": 0, 
-  "fieldtype": "Text", 
+  "create": 1, 
-  "hidden": 1, 
+  "doctype": "DocPerm", 
-  "label": "File List", 
+  "permlevel": 0, 
-  "no_copy": 1, 
+  "report": 1, 
-  "print_hide": 1
+  "role": "Guest", 
+  "write": 1
  }, 
  {
-  "cancel": 0, 
+  "create": 1, 
   "doctype": "DocPerm", 
-  "role": "Guest"
+  "match": "customer", 
- }, 
+  "permlevel": 0, 
- {
+  "report": 1, 
-  "cancel": 0, 
+  "role": "Customer", 
-  "doctype": "DocPerm", 
+  "write": 1
-  "role": "Customer"
  }, 
  {
   "cancel": 1, 
+  "create": 1, 
   "doctype": "DocPerm", 
+  "permlevel": 0, 
+  "report": 1, 
+  "role": "Support Team", 
+  "write": 1
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "match": "", 
+  "permlevel": 1, 
+  "report": 1, 
+  "role": "Support Team", 
+  "write": 1
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "match": "", 
+  "permlevel": 2, 
   "role": "Support Team"
  }
 ]

utilities/doctype/question/question.txt

@@ -1,75 +1,76 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-02 17:08:46", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:30:42", 
+  "modified": "2013-01-01 18:58:55", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-01 18:58:55"
+  "owner": "Administrator"
  }, 
  {
-  "read_only": 1, 
+  "allow_attach": 0, 
-  "in_create": 1, 
   "autoname": "QUES.#######", 
-  "name": "__common__", 
-  "module": "Utilities", 
   "doctype": "DocType", 
-  "allow_attach": 0
+  "in_create": 1, 
+  "module": "Utilities", 
+  "name": "__common__", 
+  "read_only": 1
  }, 
  {
-  "name": "__common__", 
-  "parent": "Question", 
   "doctype": "DocField", 
+  "name": "__common__", 
+  "parent": "Question", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "permlevel": 0, 
+  "permlevel": 0
-  "parentfield": "fields"
  }, 
  {
-  "parent": "Question", 
-  "read": 1, 
-  "report": 1, 
   "cancel": 1, 
-  "name": "__common__", 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
+  "name": "__common__", 
+  "parent": "Question", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "role": "All", 
   "permlevel": 0, 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "role": "All", 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Question", 
+  "doctype": "DocType", 
-  "doctype": "DocType"
+  "name": "Question"
  }, 
  {
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
+  "fieldname": "question", 
+  "fieldtype": "Text", 
   "label": "Question", 
   "oldfieldname": "question", 
-  "fieldname": "question", 
+  "oldfieldtype": "Text"
-  "fieldtype": "Text"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Points", 
   "fieldname": "points", 
   "fieldtype": "Int", 
-  "hidden": 1
+  "hidden": 1, 
+  "label": "Points"
  }, 
  {
-  "oldfieldtype": "Text Editor", 
   "doctype": "DocField", 
+  "fieldname": "answer", 
+  "fieldtype": "Text Editor", 
   "label": "Answer", 
   "oldfieldname": "answer", 
-  "fieldname": "answer", 
+  "oldfieldtype": "Text Editor"
-  "fieldtype": "Text Editor"
  }, 
  {
   "doctype": "DocField", 
-  "label": "User Tags", 
   "fieldname": "_user_tags", 
   "fieldtype": "Data", 
-  "hidden": 1
+  "hidden": 1, 
+  "label": "User Tags"
  }, 
  {
   "doctype": "DocField", 
@@ -77,15 +78,6 @@
   "fieldtype": "Text", 
   "label": "Users Voted"
  }, 
- {
-  "oldfieldtype": "Text", 
-  "doctype": "DocField", 
-  "label": "File List", 
-  "oldfieldname": "file_list", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1
- }, 
  {
   "doctype": "DocPerm"
  }

website/doctype/about_us_settings/about_us_settings.txt

@@ -1,6 +1,6 @@
 [
  {
-  "creation": "2013-03-07 15:53:15", 
+  "creation": "2013-03-26 12:48:00", 
   "docstatus": 0, 
   "modified": "2013-03-12 14:48:34", 
   "modified_by": "Administrator", 
@@ -102,15 +102,6 @@
   "fieldtype": "Text Editor", 
   "label": "Footer"
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
-  "label": "File List", 
-  "no_copy": 1, 
-  "print_hide": 1
- }, 
  {
   "doctype": "DocPerm"
  }

website/doctype/blog_post/blog_post.txt

@@ -1,6 +1,6 @@
 [
  {
-  "creation": "2013-03-08 11:36:50", 
+  "creation": "2013-03-28 10:35:30", 
   "docstatus": 0, 
   "modified": "2013-03-18 13:55:53", 
   "modified_by": "Administrator", 
@@ -114,15 +114,6 @@
   "hidden": 1, 
   "label": "Email Sent"
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
-  "label": "File List", 
-  "no_copy": 1, 
-  "print_hide": 1
- }, 
  {
   "create": 1, 
   "doctype": "DocPerm", 

website/doctype/blogger/blogger.txt

@@ -82,15 +82,6 @@
   "label": "Posts", 
   "read_only": 1
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
-  "label": "File List", 
-  "no_copy": 1, 
-  "print_hide": 1
- }, 
  {
   "create": 1, 
   "doctype": "DocPerm", 

website/doctype/style_settings/style_settings.txt

@@ -1,6 +1,6 @@
 [
  {
-  "creation": "2013-03-08 11:36:53", 
+  "creation": "2013-03-25 16:01:33", 
   "docstatus": 0, 
   "modified": "2013-03-14 11:57:20", 
   "modified_by": "Administrator", 
@@ -184,15 +184,6 @@
   "label": "Custom CSS", 
   "read_only": 1
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
-  "label": "File List", 
-  "no_copy": 1, 
-  "print_hide": 1
- }, 
  {
   "create": 1, 
   "doctype": "DocPerm", 

website/doctype/web_page/web_page.txt

@@ -1,6 +1,6 @@
 [
  {
-  "creation": "2013-02-12 13:19:11", 
+  "creation": "2013-03-28 10:35:30", 
   "docstatus": 0, 
   "modified": "2013-03-11 17:41:11", 
   "modified_by": "Administrator", 
@@ -24,14 +24,12 @@
   "permlevel": 0
  }, 
  {
-  "amend": 0, 
   "doctype": "DocPerm", 
   "name": "__common__", 
   "parent": "Web Page", 
   "parentfield": "permissions", 
   "parenttype": "DocType", 
   "read": 1, 
-  "report": 1, 
   "role": "Website Manager", 
   "submit": 0
  }, 
@@ -139,26 +137,18 @@
   "options": "CSS"
  }, 
  {
-  "doctype": "DocField", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
-  "label": "File List", 
-  "no_copy": 1, 
-  "print_hide": 1
- }, 
- {
-  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
   "permlevel": 0, 
+  "report": 1, 
   "write": 1
  }, 
  {
+  "amend": 0, 
   "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "permlevel": 1, 
+  "match": "", 
-  "write": 0
+  "permlevel": 1
  }
 ]

website/doctype/website_settings/website_settings.txt

@@ -2,7 +2,7 @@
  {
   "creation": "2013-03-26 06:51:18", 
   "docstatus": 0, 
-  "modified": "2013-04-17 11:51:24", 
+  "modified": "2013-04-17 11:51:30", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -227,15 +227,6 @@
   "label": "Domain List", 
   "reqd": 0
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
-  "label": "File List", 
-  "no_copy": 1, 
-  "print_hide": 1
- }, 
  {
   "create": 1, 
   "doctype": "DocPerm", 

website/doctype/website_slideshow/website_slideshow.txt

@@ -1,84 +1,78 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-03-07 14:48:40", 
   "docstatus": 0, 
-  "creation": "2012-12-25 16:47:53", 
+  "modified": "2012-12-25 16:56:34", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-25 16:56:34"
+  "owner": "Administrator"
  }, 
  {
   "allow_attach": 1, 
   "autoname": "field:slideshow_name", 
-  "name": "__common__", 
+  "description": "Slideshow like display for the website", 
-  "module": "Website", 
   "doctype": "DocType", 
-  "max_attachments": 10, 
   "document_type": "Transaction", 
-  "description": "Slideshow like display for the website"
+  "max_attachments": 10, 
+  "module": "Website", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Website Slideshow", 
   "doctype": "DocField", 
+  "name": "__common__", 
+  "parent": "Website Slideshow", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "permlevel": 0, 
+  "permlevel": 0
-  "parentfield": "fields"
  }, 
  {
-  "parent": "Website Slideshow", 
-  "read": 1, 
-  "report": 1, 
   "cancel": 1, 
-  "name": "__common__", 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
+  "name": "__common__", 
+  "parent": "Website Slideshow", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "role": "Website Manager", 
   "permlevel": 0, 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "role": "Website Manager", 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Website Slideshow", 
+  "doctype": "DocType", 
-  "doctype": "DocType"
+  "name": "Website Slideshow"
  }, 
  {
-  "read_only": 0, 
   "doctype": "DocField", 
-  "label": "Slideshow Name", 
   "fieldname": "slideshow_name", 
   "fieldtype": "Data", 
+  "label": "Slideshow Name", 
+  "read_only": 0, 
   "reqd": 1
  }, 
  {
   "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Slideshow Items", 
   "fieldname": "sb0", 
-  "fieldtype": "Section Break"
+  "fieldtype": "Section Break", 
+  "label": "Slideshow Items"
  }, 
  {
   "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Slideshow Items", 
   "fieldname": "slideshow_items", 
   "fieldtype": "Table", 
+  "label": "Slideshow Items", 
   "options": "Website Slideshow Item"
  }, 
  {
-  "description": "This goes above the slideshow.", 
   "depends_on": "eval:!doc.__islocal", 
+  "description": "This goes above the slideshow.", 
   "doctype": "DocField", 
-  "label": "Header", 
   "fieldname": "header", 
-  "fieldtype": "Text Editor"
+  "fieldtype": "Text Editor", 
- }, 
+  "label": "Header"
- {
-  "doctype": "DocField", 
-  "label": "File List", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1
  }, 
  {
   "doctype": "DocPerm"

website/doctype/website_slideshow_item/website_slideshow_item.txt

@@ -1,6 +1,6 @@
 [
  {
-  "creation": "2013-02-22 01:28:09", 
+  "creation": "2013-03-07 12:26:33", 
   "docstatus": 0, 
   "modified": "2013-03-07 07:03:34", 
   "modified_by": "Administrator", 
@@ -48,14 +48,5 @@
   "label": "Description", 
   "print_width": "200px", 
   "width": "200px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
-  "label": "File List", 
-  "no_copy": 1, 
-  "print_hide": 1
  }
 ]