nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-30 03:58:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'edge' of github.com:webnotes/erpnext into webshop

Browse Source 
Conflicts:
	patches/patch_list.py
This commit is contained in:
Anand Doshi
2013-05-15 21:18:27 +05:30
parent 1dde46aff0 bad148a431
commit 0eef6e9e42
31 changed files with 624 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
setup/page/setup/setup.js
View File

@@ -193,21 +193,8 @@ wn.module_page["Setup"] = [
]
},
{
title: wn._("Backups"),
icon: "icon-cloud-upload",
right: true,
items: [
{
"route":"Form/Backup Manager",
doctype:"Backup Manager",
label: wn._("Backup Manager"),
"description":wn._("Sync backups with remote tools like Dropbox etc.")
},
]
},
{
title: wn._("Update Manager"),
icon: "icon-magnet",
title: wn._("Administration"),
icon: "icon-rocket",
right: true,
items: [
{
@@ -215,6 +202,18 @@ wn.module_page["Setup"] = [
label: wn._("Update This Application"),
"description":wn._("Apply latest updates and patches to this app")
},
{
"route":"Form/Backup Manager",
doctype:"Backup Manager",
label: wn._("Backup Manager"),
"description":wn._("Sync backups with remote tools like Dropbox etc.")
},
{
"route":"List/Scheduler Log",
doctype:"Scheduler Log",
label: wn._("Scheduler Error Log"),
"description":wn._("Get a list of errors encountered by the Scheduler")
},
]
},
]