[merge] fix
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..28dba65 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,27 +1284,61 @@
"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": 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": 1,
+ "cancel": 0,
+ "create": 1,
+ "doctype": "DocPerm",
+ "permlevel": 0,
+ "report": 1,
"role": "Accounts User",
"submit": 1,
"write": 1
},
{
+ "amend": 0,
+ "cancel": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "match": "",
+ "permlevel": 1,
+ "report": 0,
+ "role": "Accounts User",
+ "submit": 0,
+ "write": 0
+ },
+ {
"doctype": "DocPerm",
"match": "customer",
+ "permlevel": 0,
+ "report": 1,
"role": "Customer"
+ },
+ {
+ "doctype": "DocPerm",
+ "permlevel": 0,
+ "role": "Retail User"
}
]
\ No newline at end of file
diff --git a/accounts/page/accounts_browser/accounts_browser.html b/accounts/page/accounts_browser/accounts_browser.html
index 91a1e26..0107930 100644
--- a/accounts/page/accounts_browser/accounts_browser.html
+++ b/accounts/page/accounts_browser/accounts_browser.html
@@ -1,4 +1,4 @@
-<div class="layout-wrapper layout-wrapper-background">
+<div class="appframe col-span-12">
<div class="appframe-area"></div>
<div class="layout-main">
<div class="tree-area"></div>
diff --git a/accounts/page/accounts_browser/accounts_browser.js b/accounts/page/accounts_browser/accounts_browser.js
index 2e8cc82..ede10e6 100644
--- a/accounts/page/accounts_browser/accounts_browser.js
+++ b/accounts/page/accounts_browser/accounts_browser.js
@@ -23,7 +23,7 @@
pscript['onload_Accounts Browser'] = function(wrapper){
wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.appframe-area'));
wrapper.appframe.add_home_breadcrumb()
- wrapper.appframe.add_module_breadcrumb("Accounts")
+ wrapper.appframe.add_module_icon("Accounts")
if (wn.boot.profile.can_create.indexOf("Company") !== -1) {
wrapper.appframe.add_button('New Company', function() { newdoc('Company'); },
diff --git a/accounts/page/financial_analytics/financial_analytics.js b/accounts/page/financial_analytics/financial_analytics.js
index f714549..aac7076 100644
--- a/accounts/page/financial_analytics/financial_analytics.js
+++ b/accounts/page/financial_analytics/financial_analytics.js
@@ -25,7 +25,7 @@
erpnext.trial_balance = new erpnext.FinancialAnalytics(wrapper, 'Financial Analytics');
wrapper.appframe.add_home_breadcrumb()
- wrapper.appframe.add_module_breadcrumb("Accounts")
+ wrapper.appframe.add_module_icon("Accounts")
wrapper.appframe.add_breadcrumb("icon-bar-chart")
}
diff --git a/accounts/page/financial_statements/financial_statements.html b/accounts/page/financial_statements/financial_statements.html
index e6735fa..c68ab1a 100644
--- a/accounts/page/financial_statements/financial_statements.html
+++ b/accounts/page/financial_statements/financial_statements.html
@@ -1,28 +1,5 @@
-<div class="layout_wrapper">
+<div class="appframe col-span-12">
<div id="fs_header"></div>
-<!-- table.statement td { vertical-align: middle; } table.statement td select { width: 100px; } table.stmt_table { table-layout: fixed; border-collapse: collapse; } table.stmt_table td { vertical-align: middle; padding: 2px; } td.stmt_level0 { font-weight: bold; font-size: 14px; border-bottom: 1px solid #AAA; } td.stmt_level1 { font-weight: bold; font-size: 12px; } td.stmt_level2 { font-size: 11px; } td.stmt_level3 { font-size: 11px; } td.stmt_level4 { font-size: 12px; font-weight: bold; border-bottom: 1px solid #000; } td.stmt_level5 { color: BLUE; font-size: 11px; } --> <!--
-<div style="border: 1px solid #cccccc; padding: 4px; margin-top: 8px; background-color: #eeeeee; width: 98%;">
-<table class="statement" border="0" cellspacing="2px">
-<tbody>
-<tr>
-<td>Statement:</td>
-<td style="padding-right: 8px;" mce_style="padding-right: 8px;"><select id="stmt_type"></select></td>
-<td>Company:</td>
-<td style="padding-right: 8px;" mce_style="padding-right: 8px;"><select id="stmt_company"></select></td>
-<td>Period Type:</td>
-<td style="padding-right: 8px;" mce_style="padding-right: 8px;"><select id="stmt_period"></select></td>
-<td>Fiscal Year:</td>
-<td style="padding-right: 8px;" mce_style="padding-right: 8px;"><select id="stmt_fiscal_year"></select></td>
-<td style="padding-right: 8px;" mce_style="padding-right: 8px;">
-<div id="stmt_new"></div>
-</td>
-</tr>
-</tbody>
-</table>
-</div>
---> <!--
-<div style="margin:10px 0px 10px 0px" mce_style="margin:10px 0px 10px 0px"><button class="button" onclick="pscript.print_statement();">Print</button></div>
--->
<div id="print_html">
<div id="stmt_title1" style="margin:16px 0px 4px 0px; font-size: 16px; font-weight: bold; color: #888;"></div>
<div id="stmt_title2" style="margin:0px 0px 8px 0px; font-size: 16px; font-weight: bold;"></div>
diff --git a/accounts/page/general_ledger/general_ledger.js b/accounts/page/general_ledger/general_ledger.js
index 21be3a0..137f5e9 100644
--- a/accounts/page/general_ledger/general_ledger.js
+++ b/accounts/page/general_ledger/general_ledger.js
@@ -24,7 +24,7 @@
erpnext.general_ledger = new erpnext.GeneralLedger(wrapper);
wrapper.appframe.add_home_breadcrumb()
- wrapper.appframe.add_module_breadcrumb("Accounts")
+ wrapper.appframe.add_module_icon("Accounts")
wrapper.appframe.add_breadcrumb("icon-bar-chart")
}
diff --git a/accounts/page/trial_balance/trial_balance.js b/accounts/page/trial_balance/trial_balance.js
index c64075f..9c4c50a 100644
--- a/accounts/page/trial_balance/trial_balance.js
+++ b/accounts/page/trial_balance/trial_balance.js
@@ -59,6 +59,6 @@
erpnext.trial_balance = new TrialBalance(wrapper, 'Trial Balance');
wrapper.appframe.add_home_breadcrumb()
- wrapper.appframe.add_module_breadcrumb("Accounts")
+ wrapper.appframe.add_module_icon("Accounts")
wrapper.appframe.add_breadcrumb("icon-bar-chart")
}
\ 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/buying/page/purchase_analytics/purchase_analytics.js b/buying/page/purchase_analytics/purchase_analytics.js
index fc082ea..857a335 100644
--- a/buying/page/purchase_analytics/purchase_analytics.js
+++ b/buying/page/purchase_analytics/purchase_analytics.js
@@ -24,7 +24,7 @@
new erpnext.PurchaseAnalytics(wrapper);
wrapper.appframe.add_home_breadcrumb()
- wrapper.appframe.add_module_breadcrumb("Buying")
+ wrapper.appframe.add_module_icon("Buying")
wrapper.appframe.add_breadcrumb("icon-bar-chart")
}
diff --git a/home/page/activity/activity.html b/home/page/activity/activity.html
index 9fb910c..ac369c3 100644
--- a/home/page/activity/activity.html
+++ b/home/page/activity/activity.html
@@ -1,4 +1,4 @@
-<div class="layout-wrapper layout-wrapper-appframe">
+<div class="appframe col-span-12">
<div class="layout-appframe"></div>
<div class="layout-main">
<div id="activity-list">
diff --git a/home/page/attributions/attributions.html b/home/page/attributions/attributions.html
index 99deea4..3b35283 100644
--- a/home/page/attributions/attributions.html
+++ b/home/page/attributions/attributions.html
@@ -1,4 +1,4 @@
-<div class="layout-wrapper layout-wrapper-appframe layout-attributions">
+<div class="appframe col-span-12 layout-attributions">
<div class="layout-appframe"></div>
<div class="layout-main">
<h3>ERPNext is made using these Awesome Open Source Projects <i class="icon-heart" style="color: red"></i></h3>
diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js
index 949849d..80571c1 100644
--- a/home/page/latest_updates/latest_updates.js
+++ b/home/page/latest_updates/latest_updates.js
@@ -1,5 +1,6 @@
erpnext.updates = [
["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"]],
["27th March", ["Rename multiple items together. Go to Setup > Rename Tool"]],
["26th March", ["Added project to Stock Ledger and Balance",
"Added Default Cash Account in Company."]],
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.js b/hr/doctype/job_applicant/job_applicant.js
index c301250..220ff18 100644
--- a/hr/doctype/job_applicant/job_applicant.js
+++ b/hr/doctype/job_applicant/job_applicant.js
@@ -3,7 +3,7 @@
cur_frm.cscript = {
onload: function(doc, dt, dn) {
if(in_list(user_roles,'System Manager')) {
- cur_frm.page_layout.footer.help_area.innerHTML = '<hr>\
+ cur_frm.footer.help_area.innerHTML = '<hr>\
<p><a href="#Form/Jobs Email Settings">Jobs Email Settings</a><br>\
<span class="help">Automatically extract Job Applicants from a mail box e.g. "jobs@example.com"</span></p>';
}
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/public/js/conf.js b/public/js/conf.js
index 522de0a..de8c7f7 100644
--- a/public/js/conf.js
+++ b/public/js/conf.js
@@ -15,7 +15,7 @@
// add toolbar icon
$(document).bind('toolbar_setup', function() {
- $('.brand').html((wn.boot.website_settings.brand_html || 'erpnext') +
+ $('.navbar-brand').html((wn.boot.website_settings.brand_html || 'erpnext') +
' <i class="icon-home icon-white navbar-icon-home" ></i>')
.css('max-width', '200px').css('overflow', 'hidden')
.hover(function() {
diff --git a/public/js/startup.css b/public/js/startup.css
index 88ebedd..bfcbe84 100644
--- a/public/js/startup.css
+++ b/public/js/startup.css
@@ -4,7 +4,6 @@
body {
font-family: Arial, Helvetica, sans-serif;
- font-size: 13px;
}
span, div, td, input, textarea, button, select {
diff --git a/public/js/toolbar.js b/public/js/toolbar.js
index 03d7d0a..1d3d1e7 100644
--- a/public/js/toolbar.js
+++ b/public/js/toolbar.js
@@ -18,75 +18,26 @@
wn.provide('erpnext.toolbar');
erpnext.toolbar.setup = function() {
- // modules
- erpnext.toolbar.add_modules();
-
// profile
- $('#toolbar-user').append('<li><a href="#Form/Profile/'+user+'">'
+ var $user = $('#toolbar-user');
+ $user.append('<li><a href="#Form/Profile/'+user+'">'
+wn._("My Settings")+'...</a></li>');
+ $user.append('<li class="divider"></li>');
+ $user.append('<li><a href="https://erpnext.com/manual" target="_blank">'
+ +wn._('Documentation')+'</a></li>')
+ $user.append('<li><a href="http://groups.google.com/group/erpnext-user-forum" target="_blank">'
+ +wn._('Forum')+'</a></li>')
+ $user.append('<li><a href="http://www.providesupport.com?messenger=iwebnotes" target="_blank">\
+ '+wn._('Live Chat')+'</a></li>')
+
$('.navbar .pull-right').append('\
<li><a href="#!messages" title="'+wn._('Unread Messages')
+'"><span class="navbar-new-comments"></span></a></li>');
- // help
- $('.navbar .pull-right').prepend('<li class="dropdown">\
- <a class="dropdown-toggle" data-toggle="dropdown" href="#" \
- onclick="return false;">'+wn._('Help')+'<b class="caret"></b></a>\
- <ul class="dropdown-menu" id="toolbar-help">\
- </ul></li>')
-
- $('#toolbar-help').append('<li><a href="https://erpnext.com/manual" target="_blank">'
- +wn._('Documentation')+'</a></li>')
-
- $('#toolbar-help').append('<li><a href="http://groups.google.com/group/erpnext-user-forum" target="_blank">'
- +wn._('Forum')+'</a></li>')
-
- $('#toolbar-help').append('<li><a href="http://www.providesupport.com?messenger=iwebnotes" target="_blank">\
- '+wn._('Live Chat')+'</a></li>')
-
erpnext.toolbar.set_new_comments();
}
-erpnext.toolbar.add_modules = function() {
- $('<li class="dropdown">\
- <a class="dropdown-toggle" data-toggle="dropdown" href="#"\
- title="'+wn._("Modules")+'"\
- onclick="return false;"><i class="icon-th"></i></a>\
- <ul class="dropdown-menu modules">\
- </ul>\
- </li>').prependTo('.navbar .nav:first');
-
- var modules_list = wn.user.get_desktop_items().sort();
-
- var _get_list_item = function(m) {
- args = {
- module: m,
- module_page: wn.modules[m].link,
- module_label: wn._(wn.modules[m].label || m),
- icon: wn.modules[m].icon
- }
-
- return repl('<li><a href="#!%(module_page)s" \
- data-module="%(module)s"><i class="%(icon)s" style="display: inline-block; \
- width: 21px; margin-top: -2px; margin-left: -7px;"></i>\
- %(module_label)s</a></li>', args);
- }
-
- // add to dropdown
- $.each(modules_list,function(i, m) {
- if(m!='Setup') {
- $('.navbar .modules').append(_get_list_item(m));
- }
- })
-
- // setup for system manager
- if(user_roles.indexOf("System Manager")!=-1) {
- $('.navbar .modules').append('<li class="divider">' + _get_list_item("Setup"));
- }
-
-}
-
erpnext.toolbar.set_new_comments = function(new_comments) {
var navbar_nc = $('.navbar-new-comments');
if(cint(new_comments)) {
diff --git a/selling/doctype/lead/lead.js b/selling/doctype/lead/lead.js
index d8d322d..0d30674 100644
--- a/selling/doctype/lead/lead.js
+++ b/selling/doctype/lead/lead.js
@@ -50,7 +50,7 @@
}
if(in_list(user_roles,'System Manager')) {
- cur_frm.page_layout.footer.help_area.innerHTML = '<hr>\
+ cur_frm.footer.help_area.innerHTML = '<hr>\
<p><a href="#Form/Sales Email Settings">Sales Email Settings</a><br>\
<span class="help">Automatically extract Leads from a mail box e.g. "sales@example.com"</span></p>';
}
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/selling/page/sales_analytics/sales_analytics.js b/selling/page/sales_analytics/sales_analytics.js
index 0b35af5..7fdc3ac 100644
--- a/selling/page/sales_analytics/sales_analytics.js
+++ b/selling/page/sales_analytics/sales_analytics.js
@@ -23,7 +23,7 @@
new erpnext.SalesAnalytics(wrapper);
wrapper.appframe.add_home_breadcrumb()
- wrapper.appframe.add_module_breadcrumb("Selling")
+ wrapper.appframe.add_module_icon("Selling")
wrapper.appframe.add_breadcrumb("icon-bar-chart")
}
diff --git a/selling/page/sales_browser/sales_browser.html b/selling/page/sales_browser/sales_browser.html
index 4683a07..ab89816 100644
--- a/selling/page/sales_browser/sales_browser.html
+++ b/selling/page/sales_browser/sales_browser.html
@@ -1,4 +1,4 @@
-<div class="layout-wrapper layout-wrapper-background">
+<div class="appframe col-span-12">
<div class="appframe-area"></div>
<div class="layout-main-section">
<div class="tree-area"></div>
diff --git a/selling/page/sales_browser/sales_browser.js b/selling/page/sales_browser/sales_browser.js
index 4622f24..60bb1fd 100644
--- a/selling/page/sales_browser/sales_browser.js
+++ b/selling/page/sales_browser/sales_browser.js
@@ -17,7 +17,7 @@
pscript['onload_Sales Browser'] = function(wrapper){
wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.appframe-area'));
wrapper.appframe.add_home_breadcrumb()
- wrapper.appframe.add_module_breadcrumb("Selling")
+ wrapper.appframe.add_module_icon("Selling")
wrapper.appframe.add_button('Refresh', function() {
wrapper.make_tree();
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..bd58f71 100644
--- a/stock/doctype/item/item.txt
+++ b/stock/doctype/item/item.txt
@@ -1,6 +1,6 @@
[
{
- "creation": "2013-03-28 15:56:38",
+ "creation": "2013-03-28 10:35:28",
"docstatus": 0,
"modified": "2013-04-23 11:44:39",
"modified_by": "Administrator",
@@ -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,
@@ -888,26 +878,92 @@
"read_only": 0
},
{
+<<<<<<< HEAD
+ "cancel": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "permlevel": 1,
+ "report": 0,
+ "role": "Material Manager",
+ "write": 0
+ },
+ {
+ "cancel": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "permlevel": 0,
+ "report": 1,
+ "role": "Material Manager",
+ "write": 0
+=======
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"role": "Material Master Manager",
"write": 1
+>>>>>>> 59a6cd6c44481b56566131557bdcccaa865527cd
},
{
- "amend": 0,
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
- "role": "Material Manager",
+<<<<<<< HEAD
+ "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 Master Manager",
+ "write": 1
+=======
+ "role": "Material Manager",
+ "write": 0
+>>>>>>> 59a6cd6c44481b56566131557bdcccaa865527cd
+ },
+ {
+ "cancel": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+<<<<<<< HEAD
+ "permlevel": 1,
+ "report": 0,
+ "role": "Material Master Manager",
+ "write": 0
+ },
+ {
+ "cancel": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "permlevel": 0,
+ "report": 1,
+ "role": "System Manager",
+ "write": 1
+ },
+ {
+ "cancel": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "permlevel": 1,
+ "report": 0,
+ "role": "System Manager",
+=======
+ "role": "Material User",
+>>>>>>> 59a6cd6c44481b56566131557bdcccaa865527cd
+ "write": 0
}
]
\ No newline at end of file
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/stock/page/stock_ageing/stock_ageing.js b/stock/page/stock_ageing/stock_ageing.js
index edad9a7..e257bd4 100644
--- a/stock/page/stock_ageing/stock_ageing.js
+++ b/stock/page/stock_ageing/stock_ageing.js
@@ -25,7 +25,7 @@
new erpnext.StockAgeing(wrapper);
wrapper.appframe.add_home_breadcrumb()
- wrapper.appframe.add_module_breadcrumb("Stock")
+ wrapper.appframe.add_module_icon("Stock")
wrapper.appframe.add_breadcrumb("icon-bar-chart")
}
diff --git a/stock/page/stock_analytics/stock_analytics.js b/stock/page/stock_analytics/stock_analytics.js
index a003963..a52cb7d 100644
--- a/stock/page/stock_analytics/stock_analytics.js
+++ b/stock/page/stock_analytics/stock_analytics.js
@@ -25,7 +25,7 @@
new erpnext.StockAnalytics(wrapper);
wrapper.appframe.add_home_breadcrumb()
- wrapper.appframe.add_module_breadcrumb("Stock")
+ wrapper.appframe.add_module_icon("Stock")
wrapper.appframe.add_breadcrumb("icon-bar-chart")
}
diff --git a/stock/page/stock_balance/stock_balance.js b/stock/page/stock_balance/stock_balance.js
index 163b74f..4467b98 100644
--- a/stock/page/stock_balance/stock_balance.js
+++ b/stock/page/stock_balance/stock_balance.js
@@ -26,7 +26,7 @@
new erpnext.StockBalance(wrapper);
wrapper.appframe.add_home_breadcrumb()
- wrapper.appframe.add_module_breadcrumb("Stock")
+ wrapper.appframe.add_module_icon("Stock")
wrapper.appframe.add_breadcrumb("icon-bar-chart")
}
diff --git a/stock/page/stock_ledger/stock_ledger.js b/stock/page/stock_ledger/stock_ledger.js
index a37ea1c..438f132 100644
--- a/stock/page/stock_ledger/stock_ledger.js
+++ b/stock/page/stock_ledger/stock_ledger.js
@@ -24,7 +24,7 @@
new erpnext.StockLedger(wrapper);
wrapper.appframe.add_home_breadcrumb()
- wrapper.appframe.add_module_breadcrumb("Stock")
+ wrapper.appframe.add_module_icon("Stock")
wrapper.appframe.add_breadcrumb("icon-bar-chart")
}
diff --git a/stock/page/stock_level/stock_level.js b/stock/page/stock_level/stock_level.js
index 75819a5..5f129c3 100644
--- a/stock/page/stock_level/stock_level.js
+++ b/stock/page/stock_level/stock_level.js
@@ -24,7 +24,7 @@
new erpnext.StockLevel(wrapper);
wrapper.appframe.add_home_breadcrumb()
- wrapper.appframe.add_module_breadcrumb("Stock")
+ wrapper.appframe.add_module_icon("Stock")
wrapper.appframe.add_breadcrumb("icon-bar-chart");
}
diff --git a/support/doctype/support_ticket/support_ticket.js b/support/doctype/support_ticket/support_ticket.js
index 3da81d9..4d59f42 100644
--- a/support/doctype/support_ticket/support_ticket.js
+++ b/support/doctype/support_ticket/support_ticket.js
@@ -19,7 +19,7 @@
$.extend(cur_frm.cscript, {
onload: function(doc, dt, dn) {
if(in_list(user_roles,'System Manager')) {
- cur_frm.page_layout.footer.help_area.innerHTML = '<hr>\
+ cur_frm.footer.help_area.innerHTML = '<hr>\
<p><a href="#Form/Email Settings/Email Settings">Email Settings</a><br>\
<span class="help">Integrate incoming support emails to Support Ticket</span></p>';
}
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/support/page/support_analytics/support_analytics.js b/support/page/support_analytics/support_analytics.js
index 60384bb..9b46e6d 100644
--- a/support/page/support_analytics/support_analytics.js
+++ b/support/page/support_analytics/support_analytics.js
@@ -8,7 +8,7 @@
new erpnext.SupportAnalytics(wrapper);
wrapper.appframe.add_home_breadcrumb()
- wrapper.appframe.add_module_breadcrumb("Support")
+ wrapper.appframe.add_module_icon("Support")
wrapper.appframe.add_breadcrumb("icon-bar-chart")
}
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/utilities/page/markdown_reference/markdown_reference.html b/utilities/page/markdown_reference/markdown_reference.html
index cdf646c..5ec813b 100644
--- a/utilities/page/markdown_reference/markdown_reference.html
+++ b/utilities/page/markdown_reference/markdown_reference.html
@@ -1,4 +1,4 @@
-<div class="layout-wrapper layout-wrapper-background">
+<div class="appframe col-span-12">
<div class="layout-appframe">
<div class="appframe-titlebar">
<span class="appframe-title">Markdown Reference</span>
diff --git a/utilities/page/question_view/question_view.html b/utilities/page/question_view/question_view.html
index b091d95..13f96a3 100644
--- a/utilities/page/question_view/question_view.html
+++ b/utilities/page/question_view/question_view.html
@@ -1,4 +1,4 @@
-<div class="layout-wrapper layout-wrapper-appframe">
+<div class="appframe col-span-12">
<div class="layout-appframe"></div>
<div class="layout-main" style="min-height: 400px">
<div class="qv-question-wrapper">
diff --git a/utilities/page/question_view/question_view.js b/utilities/page/question_view/question_view.js
index e479e13..8672350 100644
--- a/utilities/page/question_view/question_view.js
+++ b/utilities/page/question_view/question_view.js
@@ -18,7 +18,7 @@
wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.layout-appframe'));
wrapper.appframe.title('Question');
wrapper.appframe.add_home_breadcrumb();
- wrapper.appframe.add_module_breadcrumb("Knowledge Base");
+ wrapper.appframe.add_module_icon("Knowledge Base");
wrapper.appframe.add_breadcrumb("icon-file");
wrapper.add_answer_area = $('.add-answer-area').get(0);
diff --git a/utilities/page/questions/questions.html b/utilities/page/questions/questions.html
index bec483e..bd003ce 100644
--- a/utilities/page/questions/questions.html
+++ b/utilities/page/questions/questions.html
@@ -1,4 +1,4 @@
-<div class="layout-wrapper layout-wrapper-background">
+<div class="appframe col-span-12">
<div class="layout-appframe"></div>
<div class="layout-main-section">
<div class="kb-search-wrapper">
diff --git a/utilities/page/trash/__init__.py b/utilities/page/trash/__init__.py
deleted file mode 100644
index baffc48..0000000
--- a/utilities/page/trash/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/utilities/page/trash/trash.html b/utilities/page/trash/trash.html
deleted file mode 100644
index b17e475..0000000
--- a/utilities/page/trash/trash.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="layout_wrapper">
-<div id="trash_header"></div>
-<div id="trash_div" style="margin: 0px;"></div>
-</div>
\ No newline at end of file
diff --git a/utilities/page/trash/trash.js b/utilities/page/trash/trash.js
deleted file mode 100644
index b30626d..0000000
--- a/utilities/page/trash/trash.js
+++ /dev/null
@@ -1,144 +0,0 @@
-// ERPNext - web based ERP (http://erpnext.com)
-// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-pscript['onload_Trash'] = function() {
-
- // header and toolbar
- var h = new PageHeader('trash_header','Trash Bin','Restore the documents that you have trashed')
-
- if(!pscript.trash_bin) pscript.trash_bin = new pscript.Trash();
-}
-
-pscript.Trash = function() {
- // create UI elements
- this.wrapper = $i('trash_div');
-
- this.head = $a(this.wrapper, 'div');
- this.body = $a(this.wrapper, 'div');
- $y(this.body, {margin:'8px'})
-
- this.make_head();
- this.load_masters();
-}
-
-// Make Button
-// ------------
-pscript.Trash.prototype.make_button = function(label, area){
- var me = this;
- var w = $a(area, 'div', '', {margin:'8px'});
- var t = make_table(w,1,1,'400px',['50%','50%']);
- var s = $a($td(t,0,0),'button');
- s.innerHTML = label;
- s.wrapper = w;
- return s;
-}
-
-
-// Make Head
-// -------------
-pscript.Trash.prototype.make_head = function() {
- var me = this;
-
- var make_select = function(label) {
- var w = $a(me.head, 'div', '', {margin:'8px'});
- var t = make_table(w,1,2,'400px',['50%','50%']);
- $td(t,0,0).innerHTML = label;
- var s = $a($td(t,0,1),'select','',{width:'140px'});
- s.wrapper = w;
- return s;
- }
-
- // Select Master Name
- this.master_select = make_select('Select Master');
-
- var me = this;
- // Get Records
- this.get_records_button = me.make_button('Get Records', me.head);
- this.get_records_button.onclick = function() {
- me.get_records();
- }
-}
-
-
-// Load Masters
-// -------------
-pscript.Trash.prototype.load_masters = function(){
- var me = this;
- var callback = function(r, rt){
- // Masters
- empty_select(me.master_select);
- add_sel_options(me.master_select,add_lists(['All'], r.message), 'All');
- }
- $c_obj('Trash Control','get_masters','',callback);
-}
-
-
-// Get Records
-// -----------
-pscript.Trash.prototype.get_records = function(){
- var me = this;
- me.body.innerHTML = '';
- var callback = function(r, rt){
- if(r.message) me.generate_trash_records(r.message);
- else msgprint("No Records Found");
- }
- $c_obj('Trash Control','get_trash_records',sel_val(me.master_select),callback);
-}
-
-
-// Generate Trash Records
-// -----------------------
-pscript.Trash.prototype.generate_trash_records = function(rec_dict){
- var me = this;
- pscript.all_checkboxes = [];
- mnames = keys(rec_dict).sort();
- for(var i = 0; i < mnames.length; i ++){
- var head = $a(me.body, 'h3'); head.innerHTML = mnames[i];
- var rec_table = make_table(me.body,rec_dict[mnames[i]].length,2,'375px',['350px','25px'],{border:'1px solid #AAA',padding:'2px'});
- for(var j = 0; j < rec_dict[mnames[i]].length; j++){
- $a_input($td(rec_table,j,0), 'data');
- $td(rec_table,j,0).innerHTML = rec_dict[mnames[i]][j];
- var chk = $a_input($td(rec_table,j,1), 'checkbox');
- chk.master = mnames[i];
- chk.record = rec_dict[mnames[i]][j];
- pscript.all_checkboxes.push(chk);
- }
- }
- this.restore_button = me.make_button('Restore Selected', me.body);
- this.restore_button.onclick = function() {
- me.restore_records(0);
- }
- this.restore_all_button = me.make_button('Restore All', me.body);
- this.restore_all_button.onclick = function() {
- me.restore_records(1);
- }
-}
-
-
-// Restore Records
-// ---------------
-pscript.Trash.prototype.restore_records = function(restore_all){
- var me = this;
- var out = {};
- for(i in pscript.all_checkboxes) {
- c = pscript.all_checkboxes[i];
- if (restore_all || (!restore_all && c.checked)) {
- if(!out[c.master]) out[c.master] = [c.record];
- else {out[c.master].push(c.record);}
- }
- }
- $c_obj('Trash Control','restore_records',JSON.stringify(out),function(r, rt){me.get_records();})
-}
\ No newline at end of file
diff --git a/utilities/page/trash/trash.txt b/utilities/page/trash/trash.txt
deleted file mode 100644
index a13e1b6..0000000
--- a/utilities/page/trash/trash.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-[
- {
- "owner": "Administrator",
- "docstatus": 0,
- "creation": "2010-10-12 15:19:32",
- "modified_by": "Administrator",
- "modified": "2010-12-30 11:44:36"
- },
- {
- "name": "__common__",
- "module": "Utilities",
- "page_name": "Trash",
- "doctype": "Page",
- "standard": "Yes"
- },
- {
- "name": "__common__",
- "parent": "Trash",
- "doctype": "Page Role",
- "parenttype": "Page",
- "parentfield": "roles"
- },
- {
- "name": "Trash",
- "doctype": "Page"
- },
- {
- "role": "Administrator",
- "doctype": "Page Role"
- },
- {
- "role": "Sales Master Manager",
- "doctype": "Page Role"
- },
- {
- "role": "Material Master Manager",
- "doctype": "Page Role"
- },
- {
- "role": "Purchase Master Manager",
- "doctype": "Page Role"
- },
- {
- "role": "Accounts Manager",
- "doctype": "Page Role"
- }
-]
\ 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..7eaa50e 100644
--- a/website/doctype/website_settings/website_settings.txt
+++ b/website/doctype/website_settings/website_settings.txt
@@ -1,5 +1,4 @@
[
- {
"creation": "2013-03-26 06:51:18",
"docstatus": 0,
"modified": "2013-04-17 11:51:24",
@@ -228,15 +227,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
diff --git a/website/templates/html/blog_footer.html b/website/templates/html/blog_footer.html
index e439d14..ecb463c 100644
--- a/website/templates/html/blog_footer.html
+++ b/website/templates/html/blog_footer.html
@@ -1,4 +1,4 @@
-<div class="span12">
+<div class="col-span-12">
<hr />
{% if categories %}
<h5>Explore posts by categories</h5>
diff --git a/website/templates/html/blog_page.html b/website/templates/html/blog_page.html
index cf1f00e..0cabe6d 100644
--- a/website/templates/html/blog_page.html
+++ b/website/templates/html/blog_page.html
@@ -9,7 +9,7 @@
{% endblock %}
{% block content %}
-<div class="span12" itemscope itemtype="http://schema.org/BlogPost">
+<div class="col-span-12" itemscope itemtype="http://schema.org/BlogPost">
<h2 itemprop="name headline">{{ title }}</h2>
<!-- begin blog content -->
diff --git a/website/templates/html/blogger.html b/website/templates/html/blogger.html
index e18f86a..878caad 100644
--- a/website/templates/html/blogger.html
+++ b/website/templates/html/blogger.html
@@ -1,10 +1,10 @@
<div class="row">
- <div class="span2">
+ <div class="col-span-2">
<div class="avatar avatar-large">
<img itemprop="thumbnailUrl" src="{{ blogger_info.avatar }}" />
</div>
</div>
- <div class="span10">
+ <div class="col-span-10">
<h4>{{ blogger_info.full_name }}</h4>
<p style="color: #999">{{ blogger_info.bio }}</p>
<p><a href="blog?by={{ blogger_info.name }}&by_name={{ blogger_info.full_name }}">
diff --git a/website/templates/html/footer.html b/website/templates/html/footer.html
index 2f1c7fe..7260fa5 100644
--- a/website/templates/html/footer.html
+++ b/website/templates/html/footer.html
@@ -38,7 +38,7 @@
{{ address }}
{% endif %}
<p><div class="input-append" style="text-align: center; margin:30px 0px;">
- <input class="span3" id="footer-subscribe-email" type="text" placeholder="Your email address...">
+ <input class="col-span-3" id="footer-subscribe-email" type="text" placeholder="Your email address...">
<button class="btn" type="button" id="footer-subscribe-button">Stay Updated</button>
</div></p>
<script>
diff --git a/website/templates/html/outer.html b/website/templates/html/outer.html
index 570c769..1eaa2ab 100644
--- a/website/templates/html/outer.html
+++ b/website/templates/html/outer.html
@@ -7,7 +7,7 @@
</div>
<div class="clearfix"></div>
{% if banner_html %}<div class="row" style="margin-top: 30px;">
- <div class="span12">{{ banner_html }}</div>
+ <div class="col-span-12">{{ banner_html }}</div>
</div>{% endif %}
<div class="outer">
{% include "app/website/templates/html/navbar.html" %}
diff --git a/website/templates/html/product_breadcrumbs.html b/website/templates/html/product_breadcrumbs.html
index 0b026e7..f3661ce 100644
--- a/website/templates/html/product_breadcrumbs.html
+++ b/website/templates/html/product_breadcrumbs.html
@@ -1,5 +1,5 @@
{% if obj.parent_groups and len(obj.parent_groups) > 1 %}
-<div class="span12">
+<div class="col-span-12">
<div class="clearfix">
<ul class="breadcrumb">
{% for ig in obj.parent_groups[:-1] %}
diff --git a/website/templates/html/product_group.html b/website/templates/html/product_group.html
index b3c8511..23ecbc8 100644
--- a/website/templates/html/product_group.html
+++ b/website/templates/html/product_group.html
@@ -3,7 +3,7 @@
{% block content %}
{% include 'app/website/templates/html/product_search_box.html' %}
{% include 'app/website/templates/html/product_breadcrumbs.html' %}
-<div class="span12">
+<div class="col-span-12">
{% if slideshow %}<!-- slideshow -->
{% include "app/website/templates/html/slideshow.html" %}
{% endif %}
@@ -16,7 +16,7 @@
<hr />
<div class="row">
{% for d in sub_groups %}
- <div class="span4">
+ <div class="col-span-4">
<a href="{{ d.page_name }}">{{ d.name }} ({{ d.count }})</a>
</div>
{% endfor %}
diff --git a/website/templates/html/product_in_list.html b/website/templates/html/product_in_list.html
index 5cd9eac..7a47006 100644
--- a/website/templates/html/product_in_list.html
+++ b/website/templates/html/product_in_list.html
@@ -1,4 +1,4 @@
-<div class="span3">
+<div class="col-span-3">
<div style="height: 120px; overflow: hidden;">
<a href="{{ page_name }}">
{%- if website_image -%}
diff --git a/website/templates/html/product_page.html b/website/templates/html/product_page.html
index 23091ad..9353ce8 100644
--- a/website/templates/html/product_page.html
+++ b/website/templates/html/product_page.html
@@ -11,9 +11,9 @@
{% block content %}
{% include 'app/website/templates/html/product_search_box.html' %}
{% include 'app/website/templates/html/product_breadcrumbs.html' %}
- <div class="span12 product-page-content" itemscope itemtype="http://schema.org/Product">
+ <div class="col-span-12 product-page-content" itemscope itemtype="http://schema.org/Product">
<div class="row">
- <div class="span6">
+ <div class="col-span-6">
{% if slideshow %}
{% include "app/website/templates/html/slideshow.html" %}
{% else %}
@@ -27,7 +27,7 @@
{% endif %}
{% endif %}
</div>
- <div class="span6">
+ <div class="col-span-6">
<h3 itemprop="name" style="margin-top: 0px;">{{ item_name }}</h3>
<p class="help">Item Code: {{ name }}</p>
<h4>Product Description</h4>
diff --git a/website/templates/html/product_search_box.html b/website/templates/html/product_search_box.html
index 3b3a95a..db1b1d0 100644
--- a/website/templates/html/product_search_box.html
+++ b/website/templates/html/product_search_box.html
@@ -1,8 +1,8 @@
-<div class="span12 clearfix">
+<div class="col-span-12 clearfix">
<div class="pull-right" style="margin-top: 15px;">
<form class="form-search">
<div class="input-append">
- <input type="text" class="span2 search-query"
+ <input type="text" class="col-span-2 search-query"
id="product-search" placeholder="Product Search..." />
<button class="btn" id="btn-product-search">
<i class="icon-search"></i></button>
diff --git a/website/templates/html/web_page.html b/website/templates/html/web_page.html
index 6b8c914..884e7cb 100644
--- a/website/templates/html/web_page.html
+++ b/website/templates/html/web_page.html
@@ -7,7 +7,7 @@
{% endblock %}
{% block content %}
-<div class="span12" style="margin-top: 15px;">
+<div class="col-span-12" style="margin-top: 15px;">
{% include "app/website/templates/html/slideshow.html" %}
{{ main_section }}
</div>
diff --git a/website/templates/js/blog.js b/website/templates/js/blog.js
index fd5a156..053eae0 100644
--- a/website/templates/js/blog.js
+++ b/website/templates/js/blog.js
@@ -69,12 +69,12 @@
b.page_name = encodeURIComponent(b.page_name);
$(repl('<div class="row">\
- <div class="span1">\
+ <div class="col-span-1">\
<div class="avatar avatar-medium" style="margin-top: 6px;">\
<img src="%(avatar)s" />\
</div>\
</div>\
- <div class="span11">\
+ <div class="col-span-11">\
<h4><a href="%(page_name)s">%(title)s</a></h4>\
<p>%(content)s</p>\
<p style="color: #aaa; font-size: 90%">\
diff --git a/website/templates/pages/about.html b/website/templates/pages/about.html
index 0cbd562..71ffd33 100644
--- a/website/templates/pages/about.html
+++ b/website/templates/pages/about.html
@@ -3,14 +3,14 @@
{% set title="About Us" %}
{% block content %}
-<div class="span12">
+<div class="col-span-12">
{{ obj.doc.company_introduction or "<h2>About Us</h2><p>Some Introduction about your company that you would like your website visitor to know. More people than you think will read your About page. People always like to know who the are doing business with. Be authentic and avoid using jargon like 'value added services' etc. Be sure to update your company history and list of key team members in Website > About Us Settings</p>" }}
{% if obj.doclist.get({"doctype":"Company History"}) %}
<h3>{{ obj.doc.company_history_heading or "Company History" }}</h3>
{% for d in obj.doclist.get({"doctype":"Company History"}) %}
<div class="row">
- <span class="span2"><h4 style="margin:0px;">{{ d.year }}</h4></span>
- <span class="span10"><p>{{ d.highlight }}</p></span>
+ <span class="col-span-2"><h4 style="margin:0px;">{{ d.year }}</h4></span>
+ <span class="col-span-10"><p>{{ d.highlight }}</p></span>
</div>
{% endfor %}
{% endif %}
@@ -18,12 +18,12 @@
<h3>{{ obj.doc.team_members_heading or "Team Members" }}</h3>
{% for d in obj.doclist.get({"doctype":"About Us Team Member"}) %}
<div class="row" itemscope itemtype="http://schema.org/Person">
- <span class="span2">
+ <span class="col-span-2">
<div class="avatar avatar-large">
<img class="avatar" src="{{ d.image_link }}" style="" itemprop="image">
</div>
</span>
- <span class="span10"><h4 itemprop="name">{{ d.full_name }}</h4>
+ <span class="col-span-10"><h4 itemprop="name">{{ d.full_name }}</h4>
<p itemprop="description">{{ d.bio }}</p>
</span>
</div>
diff --git a/website/templates/pages/account.html b/website/templates/pages/account.html
index fe2b858..b9f2f4a 100644
--- a/website/templates/pages/account.html
+++ b/website/templates/pages/account.html
@@ -3,7 +3,7 @@
{% set title="My Account" %}
{% block content %}
-<div class="span12">
+<div class="col-span-12">
<ul class="breadcrumb">
<li><a href="index">Home</a> <span class="divider">/</span></li>
<li class="active">My Account</li>
diff --git a/website/templates/pages/attributions.html b/website/templates/pages/attributions.html
index 05e8e88..d07cf52 100644
--- a/website/templates/pages/attributions.html
+++ b/website/templates/pages/attributions.html
@@ -11,7 +11,7 @@
{% set title="ERPNext - Web Based, Open Source ERP" %}
{% block content %}
-<div class="layout-attributions span12">
+<div class="layout-attributions col-span-12">
<h3>This website is made using these awesome Open Source projects <i class="icon-heart" style="color: red"></i></h3>
<hr>
<table class="table table-bordered table-striped">
diff --git a/website/templates/pages/blog.html b/website/templates/pages/blog.html
index 7483c7c..c9879fe 100644
--- a/website/templates/pages/blog.html
+++ b/website/templates/pages/blog.html
@@ -11,7 +11,7 @@
{% set title="Blog" %}
{% block content %}
-<div class="span12">
+<div class="col-span-12">
<h2 id="blog-title">{{ blog_title }}</h2>
{% if blog_introduction %}
<p>{{ blog_introduction }}</p>
diff --git a/website/templates/pages/contact.html b/website/templates/pages/contact.html
index b9b3cd7..f2eca0a 100644
--- a/website/templates/pages/contact.html
+++ b/website/templates/pages/contact.html
@@ -7,28 +7,28 @@
{% set title="Contact Us" %}
{% block content %}
-<div class="span12">
+<div class="col-span-12">
<h3>{{ obj.doc.heading or "Contact Us"}}</h3>
<div class="row">
- <div class="web-form span8">
+ <div class="web-form col-span-8">
<div class="row">
- <div class="span6">
+ <div class="col-span-6">
<p id="contact-alert" class="alert"
style="display: none;"> </p>
</div>
</div>
<div class="clearfix"></div>
- <p><select class="span6" name="subject">
+ <p><select class="col-span-6" name="subject">
{% for option in obj.query_options %}
<option value="{{ option }}">{{ option }}</option>
{% endfor %}
</select></p>
- <p><input class="span6" name="email" type="text" placeholder="Your Email Address" /></p>
- <p><textarea class="span6" rows="10" name="message"></textarea></p>
+ <p><input class="col-span-6" name="email" type="text" placeholder="Your Email Address" /></p>
+ <p><textarea class="col-span-6" rows="10" name="message"></textarea></p>
<p><button class="btn btn-primary btn-send">Send</button></p>
</div>
{% if obj.doc.address %}
- <div class="span3 alert" style="margin-top: 20px;" itemscope itemtype="http://schema.org/PostalAddress">
+ <div class="col-span-3 alert" style="margin-top: 20px;" itemscope itemtype="http://schema.org/PostalAddress">
<h4><i class="icon-map-marker"></i> {{ obj.address.address_title }}</h4>
{% if obj.address.address_line1 %}
<span itemprop="streetAddress">{{ obj.address.address_line1 }}</span><br>
diff --git a/website/templates/pages/order.html b/website/templates/pages/order.html
index 8e7bfe7..8a5db32 100644
--- a/website/templates/pages/order.html
+++ b/website/templates/pages/order.html
@@ -3,7 +3,7 @@
{% set title=doc.name %}
{% block content %}
-<div class="span12">
+<div class="col-span-12">
<ul class="breadcrumb">
<li><a href="index">Home</a> <span class="divider">/</span></li>
<li><a href="account">My Account</a> <span class="divider">/</span></li>
@@ -15,16 +15,16 @@
{%- if doc.status -%}
<div style="font-size: 13px;">
<div class="row">
- <div class="span2">
+ <div class="col-span-2">
<div class="label">{{ doc.status }}</div>
</div>
- <div class="span4">
+ <div class="col-span-4">
{{ utils.formatdate(doc.transaction_date) }}
</div>
</div>
<br>
<div class="row">
- <div class="span12">
+ <div class="col-span-12">
<table class="table table-bordered">
<tbody>
<tr>
@@ -52,8 +52,8 @@
</div>
</div>
<div class="row">
- <div class="span6"></div>
- <div class="span6">
+ <div class="col-span-6"></div>
+ <div class="col-span-6">
<table cellspacing=0 width=100%>
<tbody>
<tr>
diff --git a/website/templates/pages/orders.html b/website/templates/pages/orders.html
index 0c93a68..d52087f 100644
--- a/website/templates/pages/orders.html
+++ b/website/templates/pages/orders.html
@@ -8,7 +8,7 @@
currency = "{{ currency }}";
wn.currency_symbols = {{ currency_symbols }};
</script>
-<div class="span12">
+<div class="col-span-12">
<ul class="breadcrumb">
<li><a href="index">Home</a> <span class="divider">/</span></li>
<li><a href="account">My Account</a> <span class="divider">/</span></li>
@@ -44,8 +44,8 @@
// parent
var $order = $(repl('<div class="row">\
- <div class="span3"><a href="order?name=%(name)s">%(name)s</a></div>\
- <div class="span9"></div>\
+ <div class="col-span-3"><a href="order?name=%(name)s">%(name)s</a></div>\
+ <div class="col-span-9"></div>\
</div>', order)).appendTo($list);
// items
@@ -53,12 +53,12 @@
item.export_rate = format_currency(item.export_rate, order.currency);
item.export_amount = format_currency(item.export_amount, order.currency);
var $item = $(repl('<div class="row">\
- <div class="span3">%(item_name)s</div>\
- <div class="span2" style="text-align: right;">%(export_rate)s</div>\
- <div class="span2" style="text-align: right;">%(qty)s %(stock_uom)s</div>\
- <div class="span2" style="text-align: right;">%(export_amount)s</div>\
+ <div class="col-span-3">%(item_name)s</div>\
+ <div class="col-span-2" style="text-align: right;">%(export_rate)s</div>\
+ <div class="col-span-2" style="text-align: right;">%(qty)s %(stock_uom)s</div>\
+ <div class="col-span-2" style="text-align: right;">%(export_amount)s</div>\
</div>\
- </div>', item)).appendTo($order.find(".span9"));
+ </div>', item)).appendTo($order.find(".col-span-9"));
});
$("<hr>").appendTo($list);
diff --git a/website/templates/pages/product_search.html b/website/templates/pages/product_search.html
index 2dab6ff..ce5cd39 100644
--- a/website/templates/pages/product_search.html
+++ b/website/templates/pages/product_search.html
@@ -18,7 +18,7 @@
</script>
{% include 'app/website/templates/html/product_search_box.html' %}
-<div class="span12">
+<div class="col-span-12">
<h3 class="search-results">Search Results</h3>
<div id="search-list" class="row">
diff --git a/website/templates/pages/profile.html b/website/templates/pages/profile.html
index d689cfb..1b7729f 100644
--- a/website/templates/pages/profile.html
+++ b/website/templates/pages/profile.html
@@ -3,7 +3,7 @@
{% set title="My Profile" %}
{% block content %}
-<div class="span12">
+<div class="col-span-12">
<ul class="breadcrumb">
<li><a href="index">Home</a> <span class="divider">/</span></li>
<li><a href="account">My Account</a> <span class="divider">/</span></li>
diff --git a/website/templates/pages/ticket.html b/website/templates/pages/ticket.html
index 858dd3b..d154d16 100644
--- a/website/templates/pages/ticket.html
+++ b/website/templates/pages/ticket.html
@@ -3,7 +3,7 @@
{% set title=doc.name %}
{% block content %}
-<div class="span12">
+<div class="col-span-12">
<ul class="breadcrumb">
<li><a href="index">Home</a> <span class="divider">/</span></li>
<li><a href="account">My Account</a> <span class="divider">/</span></li>
@@ -14,13 +14,13 @@
<hr>
{%- if doc.status -%}
<div class="row">
- <div class="span2">
+ <div class="col-span-2">
<div class="label">{{ doc.status }}</div>
</div>
- <div class="span7">
+ <div class="col-span-7">
{{ doc.subject }}
</div>
- <div class="span3">
+ <div class="col-span-3">
{{ utils.formatdate(doc.transaction_date) }}
</div>
</div>
diff --git a/website/templates/pages/tickets.html b/website/templates/pages/tickets.html
index 843d10e..0ea534b 100644
--- a/website/templates/pages/tickets.html
+++ b/website/templates/pages/tickets.html
@@ -3,7 +3,7 @@
{% set title="My Tickets" %}
{% block content %}
-<div class="span12">
+<div class="col-span-12">
<ul class="breadcrumb">
<li><a href="index">Home</a> <span class="divider">/</span></li>
<li><a href="account">My Account</a> <span class="divider">/</span></li>
@@ -39,9 +39,9 @@
// parent
var $ticket = $(repl('<div class="row">\
- <div class="span2"><span class="label">%(status)s</span></div>\
- <div class="span3"><a href="ticket?name=%(name)s">%(name)s</a></div>\
- <div class="span7">%(subject)s</div>\
+ <div class="col-span-2"><span class="label">%(status)s</span></div>\
+ <div class="col-span-3"><a href="ticket?name=%(name)s">%(name)s</a></div>\
+ <div class="col-span-7">%(subject)s</div>\
</div>', ticket)).appendTo($list);
$("<hr>").appendTo($list);
diff --git a/website/templates/pages/writers.html b/website/templates/pages/writers.html
index 67c0b7e..5f0836d 100644
--- a/website/templates/pages/writers.html
+++ b/website/templates/pages/writers.html
@@ -3,7 +3,7 @@
{% set title="Blog Writers" %}
{% block content %}
-<div class="span12">
+<div class="col-span-12">
<h2 id="blog-title">Blog Writers</h2>
{% if writers_introduction %}
<p>{{ writers_introduction }}</p>