Tools
diff --git a/erpnext/selling/page/selling_home/selling_home.js b/erpnext/selling/page/selling_home/selling_home.js
index 76fac705eab..46cf4598528 100644
--- a/erpnext/selling/page/selling_home/selling_home.js
+++ b/erpnext/selling/page/selling_home/selling_home.js
@@ -1,40 +1,3 @@
pscript['onload_selling-home'] = function(wrapper) {
- erpnext.module_page.hide_links(wrapper);
- erpnext.module_page.make_list('Selling', wrapper);
-}
-
-wn.provide('erpnext.module_page');
-
-// hide list links where the user does
-// not have read permissions
-
-erpnext.module_page.hide_links = function(wrapper) {
- $(wrapper).find('[href*="List/"]').each(function() {
- var href = $(this).attr('href');
- var dt = href.split('/')[1];
- if(wn.boot.profile.can_read.indexOf(dt)==-1) {
- $(this).toggle(false);
- }
- });
-}
-
-// make list of reports
-
-erpnext.module_page.make_list = function(module, wrapper) {
- // make project listing
- wrapper.list = new wn.widgets.Listing({
- parent: $(wrapper).find('.reports-list').get(0),
- method: 'selling.page.selling_home.get_report_list',
- render_row: function(row, data) {
- if(!data.parent_doc_type) data.parent_doc_type = data.doc_type;
- $(row).html(repl('
\
- %(criteria_name)s', data))
- },
- args: {
- module: module
- },
- no_refresh: true
- });
- wrapper.list.run();
+ erpnext.module_page.setup_page('Selling', wrapper);
}
\ No newline at end of file
diff --git a/erpnext/startup/modules.js b/erpnext/startup/modules.js
index 0280c742651..35de0e8e706 100644
--- a/erpnext/startup/modules.js
+++ b/erpnext/startup/modules.js
@@ -1,3 +1,69 @@
+wn.provide('erpnext.module_page');
+
+erpnext.module_page.setup_page = function(module, wrapper) {
+ erpnext.module_page.hide_links(wrapper);
+ erpnext.module_page.make_list(module, wrapper);
+ $(wrapper).find("a").tooltip({
+ delay: { show: 500, hide: 100 }
+ });
+}
+
+// hide list links where the user does
+// not have read permissions
+
+erpnext.module_page.hide_links = function(wrapper) {
+ // lists
+ $(wrapper).find('[href*="List/"]').each(function() {
+ var href = $(this).attr('href');
+ var dt = href.split('/')[1];
+ if(wn.boot.profile.can_read.indexOf(get_label_doctype(dt))==-1) {
+ var txt = $(this).text();
+ $(this).parent().css('color', '#999').html(txt);
+ }
+ });
+
+ // reports
+ $(wrapper).find('[data-doctype]').each(function() {
+ var dt = $(this).attr('data-doctype');
+ if(wn.boot.profile.can_read.indexOf(dt)==-1) {
+ var txt = $(this).text();
+ $(this).parent().css('color', '#999').html(txt);
+ }
+ });
+
+ // single (forms)
+ $(wrapper).find('[href*="Form/"]').each(function() {
+ var href = $(this).attr('href');
+ var dt = href.split('/')[1];
+ if(wn.boot.profile.can_read.indexOf(get_label_doctype(dt))==-1) {
+ var txt = $(this).text();
+ $(this).parent().css('color', '#999').html(txt);
+ }
+ });}
+
+// make list of reports
+
+erpnext.module_page.make_list = function(module, wrapper) {
+ // make project listing
+ wrapper.list = new wn.widgets.Listing({
+ parent: $(wrapper).find('.reports-list').get(0),
+ method: 'utilities.get_report_list',
+ render_row: function(row, data) {
+ if(!data.parent_doc_type) data.parent_doc_type = data.doc_type;
+ $(row).html(repl('
\
+ %(criteria_name)s', data))
+ },
+ args: {
+ module: module
+ },
+ no_refresh: true
+ });
+ wrapper.list.run();
+}
+
+
+
// ====================================================================
pscript.startup_make_sidebar = function() {
diff --git a/erpnext/startup/modules_new.js b/erpnext/startup/modules_new.js
deleted file mode 100644
index 5f912b01914..00000000000
--- a/erpnext/startup/modules_new.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Tools Page
-erpnext.ListPage = Class.extend({
- init: function(opts) {
- var me = this;
- this.opts = opts;
- this.page = page_body.add_page[opts.title];
- this.page.wrapper = $a(this.page, 'div', 'layout_wrapper');
- this.page.head = new PageHeading(this.wrapper, this.title)
- this.page.list = new wn.widgets.Listing({
- parent: this.page.wrapper,
- query: opts.query,
- render:row: opts.render_row
- });
- },
- show: function() {
- if(this.first) {
- this.page.list.run();
- this.first = false;
- }
- page_body.change_to(this.opts.title);
- }
-});
-
-erpnext.ToolsPage = erpnext.ListPage.extend({
- init: function(opts) {
- this._super({
- title: opts.module + ' Settings',
- query: repl('select name, description from tabDocType where \
- module=%(module)s and ifnull(issingle,0)=1 order by name asc', opts),
- render_row: function(parent, data) {
- parent.innerHTML = repl('
%(name)s\
- ', data)
- }
- })
- }
-});
\ No newline at end of file
diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js
index c68650a800e..a45650005bf 100644
--- a/erpnext/startup/startup.js
+++ b/erpnext/startup/startup.js
@@ -111,5 +111,5 @@ erpnext.startup.set_periodic_updates = function() {
// start
$(document).bind('startup', function() {
- erpnext.startup.start();
+ erpnext.startup.start();
});
diff --git a/erpnext/startup/toolbar.js b/erpnext/startup/toolbar.js
index d5c5d97cdcf..1c8735cdb8a 100644
--- a/erpnext/startup/toolbar.js
+++ b/erpnext/startup/toolbar.js
@@ -2,11 +2,15 @@
wn.provide('erpnext.toolbar');
erpnext.toolbar.setup = function() {
+ // modules
+ erpnext.toolbar.add_modules();
+
// profile
$('#toolbar-user').append('
Profile Settings');
$('#toolbar-user').append('
Team / Messages');
+
$('.navbar .pull-right').prepend('\
');
@@ -52,3 +56,24 @@ erpnext.toolbar.setup = function() {
page_body.wntoolbar.set_new_comments();
}
+erpnext.toolbar.add_modules = function() {
+ $('
\
+ Modules\
+ \
+ ').insertAfter('li[data-name="navbar-home"]');
+ $('.navbar .nav:first')
+}
+
diff --git a/erpnext/stock/page/stock_home/__init__.py b/erpnext/stock/page/stock_home/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/stock/page/stock_home/stock_home.html b/erpnext/stock/page/stock_home/stock_home.html
new file mode 100644
index 00000000000..e1f7817217b
--- /dev/null
+++ b/erpnext/stock/page/stock_home/stock_home.html
@@ -0,0 +1,89 @@
+
+
+
Stock
+
+
+
+
Transfer stock from one warehouse to another
+
+
Delivery (shipment) to customers
+
+
Goods received from Suppliers
+
+
+
+
Item Master
+
+
Single unit of an Item
+
+
Batch of units of an Item
+
+
Warehouse is where items are stored
+
+
+
+
Reports
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/stock/page/stock_home/stock_home.js b/erpnext/stock/page/stock_home/stock_home.js
new file mode 100644
index 00000000000..ead208f93d4
--- /dev/null
+++ b/erpnext/stock/page/stock_home/stock_home.js
@@ -0,0 +1,3 @@
+pscript['onload_stock-home'] = function(wrapper) {
+ erpnext.module_page.setup_page('Stock', wrapper);
+}
\ No newline at end of file
diff --git a/erpnext/stock/page/stock_home/stock_home.txt b/erpnext/stock/page/stock_home/stock_home.txt
new file mode 100644
index 00000000000..f3e7cda6988
--- /dev/null
+++ b/erpnext/stock/page/stock_home/stock_home.txt
@@ -0,0 +1,28 @@
+# Page, stock-home
+[
+
+ # These values are common in all dictionaries
+ {
+ 'creation': '2012-02-21 13:23:22',
+ 'docstatus': 0,
+ 'modified': '2012-02-21 13:23:22',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
+ },
+
+ # These values are common for all Page
+ {
+ 'doctype': 'Page',
+ 'module': u'Stock',
+ 'name': '__common__',
+ 'page_name': u'stock-home',
+ 'standard': u'Yes',
+ 'title': u'Stock Home'
+ },
+
+ # Page, stock-home
+ {
+ 'doctype': 'Page',
+ 'name': u'stock-home'
+ }
+]
\ No newline at end of file
diff --git a/erpnext/support/page/__init__.py b/erpnext/support/page/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/support/page/support_home/__init__.py b/erpnext/support/page/support_home/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/support/page/support_home/support_home.txt b/erpnext/support/page/support_home/support_home.txt
new file mode 100644
index 00000000000..a462abd6fc9
--- /dev/null
+++ b/erpnext/support/page/support_home/support_home.txt
@@ -0,0 +1,28 @@
+# Page, support-home
+[
+
+ # These values are common in all dictionaries
+ {
+ 'creation': '2012-02-21 13:23:35',
+ 'docstatus': 0,
+ 'modified': '2012-02-21 13:23:35',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
+ },
+
+ # These values are common for all Page
+ {
+ 'doctype': 'Page',
+ 'module': u'Support',
+ 'name': '__common__',
+ 'page_name': u'support-home',
+ 'standard': u'Yes',
+ 'title': u'Support Home'
+ },
+
+ # Page, support-home
+ {
+ 'doctype': 'Page',
+ 'name': u'support-home'
+ }
+]
\ No newline at end of file
diff --git a/erpnext/utilities/__init__.py b/erpnext/utilities/__init__.py
index e69de29bb2d..99f3085e2a9 100644
--- a/erpnext/utilities/__init__.py
+++ b/erpnext/utilities/__init__.py
@@ -0,0 +1,12 @@
+import webnotes
+
+@webnotes.whitelist()
+def get_report_list(arg=None):
+ """return list of reports for the given module module"""
+ webnotes.response['values'] = webnotes.conn.sql("""select
+ distinct criteria_name, doc_type, parent_doc_type
+ from `tabSearch Criteria`
+ where module='%(module)s'
+ and docstatus in (0, NULL)
+ order by criteria_name
+ limit %(limit_start)s, %(limit_page_length)s""" % webnotes.form_dict, as_dict=True)
\ No newline at end of file
diff --git a/erpnext/website/js/topbar.js b/erpnext/website/js/topbar.js
index 0db37537918..247614b6f32 100644
--- a/erpnext/website/js/topbar.js
+++ b/erpnext/website/js/topbar.js
@@ -14,7 +14,7 @@ erpnext.navbar.navbar = Class.extend({
$('.brand').html(wn.boot.website_settings.brand_html);
this.make_items();
$('.dropdown-toggle').dropdown();
-pull-right },
+ },
make: function() {
$('header').append('
\
\
@@ -54,7 +54,11 @@ pull-right },
$parent_li.addClass('dropdown');
$parent_li.find('a:first').addClass('dropdown-toggle')
.attr('data-toggle', 'dropdown')
- .append('
');
+ .attr('href', '')
+ .append('
')
+ .click(function() {
+ return false;
+ });
$parent_li.append('');
}
item.route = item.url || item.custom_page;
@@ -79,6 +83,7 @@ erpnext.Footer = Class.extend({
this.make_items();
},
make_items: function() {
+ alert(16);
var items = wn.boot.website_menus
for(var i=0;i
'+t+'');}
+var err_console;var err_list=[];function errprint(t){if(!err_list)err_list=[];err_list.push(''+t+'
');}
function setup_err_console(){err_console=new Dialog(640,480,'Error Console')
err_console.make_body([['HTML','Error List'],['Button','Clear'],['HTML','Error Report']]);var span=$a(err_console.widgets['Error Report'],'span','link_type');span.innerHTML='Send Error Report';span.onclick=function(){msg=prompt('How / where did you get the error [optional]')
var call_back=function(r,rt){err_console.hide();msgprint("Error Report Sent")}
@@ -1334,7 +1335,7 @@ this.make_options();this.make_tools();this.set_user_name();this.make_logout();$(
\
\
\
-
');},make_home:function(){$('.navbar .nav:first').append('