Merge branch 'master' into edge
diff --git a/accounts/doctype/c_form/c_form.txt b/accounts/doctype/c_form/c_form.txt
index 3a956e9..9243d36 100644
--- a/accounts/doctype/c_form/c_form.txt
+++ b/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,
- "write": 1
+ "submit": 0
},
{
"doctype": "DocType",
@@ -158,15 +154,6 @@
},
{
"doctype": "DocField",
- "fieldname": "file_list",
- "fieldtype": "Text",
- "hidden": 1,
- "label": "File List",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
"fieldname": "amended_from",
"fieldtype": "Link",
"label": "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"
}
]
\ No newline at end of file
diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.txt b/accounts/doctype/purchase_invoice/purchase_invoice.txt
index 4228264..43d2c79 100755
--- a/accounts/doctype/purchase_invoice/purchase_invoice.txt
+++ b/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,
- "report": 1
+ "read": 1
},
{
"doctype": "DocType",
@@ -758,19 +756,69 @@
"reqd": 0
},
{
- "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": "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"
}
]
\ No newline at end of file
diff --git a/accounts/doctype/sales_invoice/sales_invoice.txt b/accounts/doctype/sales_invoice/sales_invoice.txt
index 2464cb6..a2c422f 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.txt
+++ b/accounts/doctype/sales_invoice/sales_invoice.txt
@@ -30,9 +30,7 @@
"parent": "Sales Invoice",
"parentfield": "permissions",
"parenttype": "DocType",
- "permlevel": 0,
- "read": 1,
- "report": 1
+ "read": 1
},
{
"doctype": "DocType",
@@ -1286,20 +1284,12 @@
"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"
- }
+ },
]
\ No newline at end of file
diff --git a/buying/doctype/purchase_order/purchase_order.txt b/buying/doctype/purchase_order/purchase_order.txt
index 101b0a9..8a56f26 100644
--- a/buying/doctype/purchase_order/purchase_order.txt
+++ b/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",
@@ -804,19 +804,11 @@
"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
diff --git a/buying/doctype/supplier_quotation/supplier_quotation.txt b/buying/doctype/supplier_quotation/supplier_quotation.txt
index d180651..dace56a 100644
--- a/buying/doctype/supplier_quotation/supplier_quotation.txt
+++ b/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",
@@ -664,15 +664,6 @@
"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,
"create": 1,
@@ -732,6 +723,7 @@
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
+ "match": "",
"permlevel": 1,
"report": 0,
"role": "All",
diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js
index 949849d..1e35a92 100644
--- a/home/page/latest_updates/latest_updates.js
+++ b/home/page/latest_updates/latest_updates.js
@@ -1,4 +1,5 @@
erpnext.updates = [
+ ["10th April", ["Redesigned File Uploads and added File Manager in Setup"]],
["12th April", ["Employee: List of Leave Approvers who can approve the Employee's Leave Applications"]],
["27th March", ["Rename multiple items together. Go to Setup > Rename Tool"]],
["26th March", ["Added project to Stock Ledger and Balance",
diff --git a/hr/doctype/employee/employee.py b/hr/doctype/employee/employee.py
index 59c8380..87fe9a4 100644
--- a/hr/doctype/employee/employee.py
+++ b/hr/doctype/employee/employee.py
@@ -101,18 +101,19 @@
if self.doc.gender:
profile_wrapper.doc.gender = self.doc.gender
- if self.doc.image and self.doc.file_list:
- # add to file list and user_image
- for file_args in self.doc.file_list.split("\n"):
- fname, fid = file_args.split(",")
- if self.doc.image == fname:
- new_file_args = fname + "," + fid
- file_list = cstr(profile_wrapper.doc.file_list).split("\n")
- if new_file_args not in file_list:
- file_list += [new_file_args]
- profile_wrapper.doc.file_list = "\n".join(file_list)
- profile_wrapper.doc.user_image = fname
- break
+ if self.doc.image:
+ if not profile_wrapper.doc.user_image == self.doc.image:
+ profile_wrapper.doc.user_image = self.doc.image
+ try:
+ webnotes.doc({
+ "doctype": "File Data",
+ "file_name": self.doc.image,
+ "attached_to_doctype": "Profile",
+ "attached_to_name": self.doc.user_id
+ }).insert()
+ except webnotes.DuplicateEntryError, e:
+ # already exists
+ pass
profile_wrapper.save()
diff --git a/hr/doctype/employee/employee.txt b/hr/doctype/employee/employee.txt
index 997a1ef..705eaa7 100644
--- a/hr/doctype/employee/employee.txt
+++ b/hr/doctype/employee/employee.txt
@@ -30,9 +30,7 @@
"parent": "Employee",
"parentfield": "permissions",
"parenttype": "DocType",
- "permlevel": 0,
"read": 1,
- "report": 1,
"submit": 0
},
{
@@ -743,14 +741,6 @@
},
{
"doctype": "DocField",
- "fieldname": "file_list",
- "fieldtype": "Text",
- "hidden": 1,
- "label": "File List",
- "print_hide": 1
- },
- {
- "doctype": "DocField",
"fieldname": "trash_reason",
"fieldtype": "Small Text",
"label": "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
}
]
\ No newline at end of file
diff --git a/hr/doctype/job_applicant/job_applicant.txt b/hr/doctype/job_applicant/job_applicant.txt
index 4500d9b..d2a2d77 100644
--- a/hr/doctype/job_applicant/job_applicant.txt
+++ b/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",
@@ -89,16 +89,6 @@
"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"
}
]
\ No newline at end of file
diff --git a/hr/doctype/leave_application/leave_application.txt b/hr/doctype/leave_application/leave_application.txt
index f0f1560..0710a5c 100644
--- a/hr/doctype/leave_application/leave_application.txt
+++ b/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",
@@ -228,16 +227,6 @@
"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",
"match": "employee",
@@ -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,
- "create": 1,
+ "cancel": 0,
+ "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",
diff --git a/patches/april_2013/p05_update_file_data.py b/patches/april_2013/p05_update_file_data.py
new file mode 100644
index 0000000..a5540cc
--- /dev/null
+++ b/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)
\ No newline at end of file
diff --git a/patches/april_2013/p06_update_file_size.py b/patches/april_2013/p06_update_file_size.py
new file mode 100644
index 0000000..8709c7b
--- /dev/null
+++ b/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)
+
+
\ No newline at end of file
diff --git a/patches/patch_list.py b/patches/patch_list.py
index e0493dc..abee4f0 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -240,6 +240,8 @@
"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')",
diff --git a/projects/doctype/task/task.txt b/projects/doctype/task/task.txt
index f0e0f23..85d6aaa 100644
--- a/projects/doctype/task/task.txt
+++ b/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",
@@ -250,15 +250,6 @@
"options": "Company"
},
{
- "doctype": "DocField",
- "fieldname": "file_list",
- "fieldtype": "Text",
- "hidden": 1,
- "label": "File List",
- "no_copy": 1,
- "print_hide": 1
- },
- {
"doctype": "DocPerm"
}
]
\ No newline at end of file
diff --git a/projects/doctype/time_log/time_log.txt b/projects/doctype/time_log/time_log.txt
index 09c04c5..897d6be 100644
--- a/projects/doctype/time_log/time_log.txt
+++ b/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",
@@ -187,17 +187,6 @@
},
{
"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",
"fieldtype": "Link",
"label": "Amended From",
diff --git a/selling/doctype/sales_order/sales_order.txt b/selling/doctype/sales_order/sales_order.txt
index e6f762e..ba0b1de 100644
--- a/selling/doctype/sales_order/sales_order.txt
+++ b/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",
- "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": "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,
@@ -985,10 +1034,20 @@
"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,
- "role": "Customer",
- "submit": 0,
- "write": 0
+ "permlevel": 0,
+ "role": "Customer"
}
]
\ No newline at end of file
diff --git a/setup/doctype/item_group/item_group.txt b/setup/doctype/item_group/item_group.txt
index a8da12c..568cf9d 100644
--- a/setup/doctype/item_group/item_group.txt
+++ b/setup/doctype/item_group/item_group.txt
@@ -174,15 +174,6 @@
"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,
"create": 0,
diff --git a/setup/doctype/price_list/price_list.txt b/setup/doctype/price_list/price_list.txt
index 7e48b78..a230f5b 100644
--- a/setup/doctype/price_list/price_list.txt
+++ b/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",
@@ -61,13 +61,6 @@
"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,
"doctype": "DocPerm",
@@ -85,6 +78,7 @@
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
+ "match": "",
"role": "Sales Master Manager",
"write": 1
}
diff --git a/setup/page/setup/setup.js b/setup/page/setup/setup.js
index 4ab7578..b47f6f2 100644
--- a/setup/page/setup/setup.js
+++ b/setup/page/setup/setup.js
@@ -82,6 +82,12 @@
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.")
+ },
]
},
{
diff --git a/stock/doctype/batch/batch.txt b/stock/doctype/batch/batch.txt
index 6a6de8b..4722996 100644
--- a/stock/doctype/batch/batch.txt
+++ b/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,
- "write": 1
+ "submit": 0
},
{
"doctype": "DocType",
@@ -108,15 +103,19 @@
"read_only": 1
},
{
- "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
},
{
- "doctype": "DocPerm"
+ "amend": 0,
+ "cancel": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "match": "",
+ "permlevel": 1
}
]
\ No newline at end of file
diff --git a/stock/doctype/delivery_note/delivery_note.txt b/stock/doctype/delivery_note/delivery_note.txt
index 618d172..36c2789 100644
--- a/stock/doctype/delivery_note/delivery_note.txt
+++ b/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,
- "report": 1
+ "read": 1
},
{
"doctype": "DocType",
@@ -1123,20 +1121,25 @@
"read_only": 0
},
{
- "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": "Material User",
+ "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",
- "submit": 1,
- "write": 1
- },
- {
- "doctype": "DocPerm",
- "match": "customer_name",
- "role": "Customer"
- },
- {
- "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 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"
}
]
\ No newline at end of file
diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt
index 38b8bcc..3497402 100644
--- a/stock/doctype/item/item.txt
+++ b/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
},
{
@@ -748,16 +748,6 @@
},
{
"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",
"fieldtype": "Data",
"hidden": 1,
@@ -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",
diff --git a/stock/doctype/material_request/material_request.txt b/stock/doctype/material_request/material_request.txt
index f2e6b35..eb788e4 100644
--- a/stock/doctype/material_request/material_request.txt
+++ b/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",
@@ -332,15 +332,6 @@
"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,
"create": 0,
diff --git a/stock/doctype/purchase_receipt/purchase_receipt.txt b/stock/doctype/purchase_receipt/purchase_receipt.txt
index 3ecbb03..350777d 100755
--- a/stock/doctype/purchase_receipt/purchase_receipt.txt
+++ b/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,
- "report": 1
+ "read": 1
},
{
"doctype": "DocType",
@@ -886,44 +884,78 @@
"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 Manager",
+ "submit": 0,
+ "write": 0
},
{
"amend": 1,
"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"
}
]
\ No newline at end of file
diff --git a/stock/doctype/serial_no/serial_no.txt b/stock/doctype/serial_no/serial_no.txt
index 086575f..8e891b8 100644
--- a/stock/doctype/serial_no/serial_no.txt
+++ b/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",
@@ -478,15 +478,6 @@
},
{
"doctype": "DocField",
- "fieldname": "file_list",
- "fieldtype": "Text",
- "hidden": 1,
- "label": "File List",
- "no_copy": 1,
- "print_hide": 1
- },
- {
- "doctype": "DocField",
"fieldname": "sle_exists",
"fieldtype": "Check",
"hidden": 1,
@@ -497,24 +488,81 @@
"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",
- "submit": 0,
+ "role": "System Manager",
"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"
}
]
\ No newline at end of file
diff --git a/stock/doctype/stock_reconciliation/stock_reconciliation.txt b/stock/doctype/stock_reconciliation/stock_reconciliation.txt
index 760620b..9b5b2a1 100644
--- a/stock/doctype/stock_reconciliation/stock_reconciliation.txt
+++ b/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
},
diff --git a/support/doctype/support_ticket/support_ticket.txt b/support/doctype/support_ticket/support_ticket.txt
index f058a9e..769bb9d 100644
--- a/support/doctype/support_ticket/support_ticket.txt
+++ b/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,
- "write": 1
+ "submit": 0
},
{
"doctype": "DocType",
@@ -242,27 +237,51 @@
"label": "Content Type"
},
{
- "doctype": "DocField",
- "fieldname": "file_list",
- "fieldtype": "Text",
- "hidden": 1,
- "label": "File List",
- "no_copy": 1,
- "print_hide": 1
+ "amend": 0,
+ "cancel": 0,
+ "create": 1,
+ "doctype": "DocPerm",
+ "permlevel": 0,
+ "report": 1,
+ "role": "Guest",
+ "write": 1
},
{
- "cancel": 0,
+ "create": 1,
"doctype": "DocPerm",
- "role": "Guest"
- },
- {
- "cancel": 0,
- "doctype": "DocPerm",
- "role": "Customer"
+ "match": "customer",
+ "permlevel": 0,
+ "report": 1,
+ "role": "Customer",
+ "write": 1
},
{
"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"
}
]
\ No newline at end of file
diff --git a/utilities/doctype/question/question.txt b/utilities/doctype/question/question.txt
index b064e33..fbd7b75 100644
--- a/utilities/doctype/question/question.txt
+++ b/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,
- "in_create": 1,
+ "allow_attach": 0,
"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,
- "parentfield": "fields"
+ "permlevel": 0
},
{
- "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",
- "fieldtype": "Text"
+ "oldfieldtype": "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",
- "fieldtype": "Text Editor"
+ "oldfieldtype": "Text Editor"
},
{
"doctype": "DocField",
- "label": "User Tags",
"fieldname": "_user_tags",
"fieldtype": "Data",
- "hidden": 1
+ "hidden": 1,
+ "label": "User Tags"
},
{
"doctype": "DocField",
@@ -78,15 +79,6 @@
"label": "Users Voted"
},
{
- "oldfieldtype": "Text",
- "doctype": "DocField",
- "label": "File List",
- "oldfieldname": "file_list",
- "fieldname": "file_list",
- "fieldtype": "Text",
- "hidden": 1
- },
- {
"doctype": "DocPerm"
}
]
\ No newline at end of file
diff --git a/website/doctype/about_us_settings/about_us_settings.txt b/website/doctype/about_us_settings/about_us_settings.txt
index b846d2b..ef6122e 100644
--- a/website/doctype/about_us_settings/about_us_settings.txt
+++ b/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",
@@ -103,15 +103,6 @@
"label": "Footer"
},
{
- "doctype": "DocField",
- "fieldname": "file_list",
- "fieldtype": "Text",
- "hidden": 1,
- "label": "File List",
- "no_copy": 1,
- "print_hide": 1
- },
- {
"doctype": "DocPerm"
}
]
\ No newline at end of file
diff --git a/website/doctype/blog_post/blog_post.txt b/website/doctype/blog_post/blog_post.txt
index 4144e40..07c5392 100644
--- a/website/doctype/blog_post/blog_post.txt
+++ b/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",
@@ -115,15 +115,6 @@
"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",
"role": "Website Manager",
diff --git a/website/doctype/blogger/blogger.txt b/website/doctype/blogger/blogger.txt
index f56df1f..da065c5 100644
--- a/website/doctype/blogger/blogger.txt
+++ b/website/doctype/blogger/blogger.txt
@@ -83,15 +83,6 @@
"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",
"role": "Website Manager"
diff --git a/website/doctype/style_settings/style_settings.txt b/website/doctype/style_settings/style_settings.txt
index df266a5..e31713a 100644
--- a/website/doctype/style_settings/style_settings.txt
+++ b/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",
@@ -185,15 +185,6 @@
"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",
"permlevel": 0,
diff --git a/website/doctype/web_page/web_page.txt b/website/doctype/web_page/web_page.txt
index eed7d2b..effe064 100644
--- a/website/doctype/web_page/web_page.txt
+++ b/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,
- "write": 0
+ "match": "",
+ "permlevel": 1
}
]
\ No newline at end of file
diff --git a/website/doctype/website_settings/website_settings.txt b/website/doctype/website_settings/website_settings.txt
index 0ebc75b..615c0a5 100644
--- a/website/doctype/website_settings/website_settings.txt
+++ b/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"
},
@@ -228,15 +228,6 @@
"reqd": 0
},
{
- "doctype": "DocField",
- "fieldname": "file_list",
- "fieldtype": "Text",
- "hidden": 1,
- "label": "File List",
- "no_copy": 1,
- "print_hide": 1
- },
- {
"create": 1,
"doctype": "DocPerm",
"permlevel": 0,
diff --git a/website/doctype/website_slideshow/website_slideshow.txt b/website/doctype/website_slideshow/website_slideshow.txt
index 4caa617..2887d4b 100644
--- a/website/doctype/website_slideshow/website_slideshow.txt
+++ b/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__",
- "module": "Website",
+ "description": "Slideshow like display for the 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,
- "parentfield": "fields"
+ "permlevel": 0
},
{
- "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"
- },
- {
- "doctype": "DocField",
- "label": "File List",
- "fieldname": "file_list",
- "fieldtype": "Text",
- "hidden": 1
+ "fieldtype": "Text Editor",
+ "label": "Header"
},
{
"doctype": "DocPerm"
diff --git a/website/doctype/website_slideshow_item/website_slideshow_item.txt b/website/doctype/website_slideshow_item/website_slideshow_item.txt
index aa98745..53aa628 100644
--- a/website/doctype/website_slideshow_item/website_slideshow_item.txt
+++ b/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
}
]
\ No newline at end of file