From 4c1e9e7db4d8a6e0bb04553870df0e9a6993f6a2 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 1 Mar 2012 13:30:34 +0530 Subject: [PATCH 1/8] added attributions pages --- css/all-app.css | 4 +- css/all-web.css | 4 +- erpnext/home/page/activity/activity.js | 3 +- erpnext/home/page/attributions/__init__.py | 0 .../home/page/attributions/attributions.css | 0 .../home/page/attributions/attributions.html | 91 +++++++++++++++++++ .../home/page/attributions/attributions.js | 1 + .../home/page/attributions/attributions.py | 1 + .../home/page/attributions/attributions.txt | 28 ++++++ erpnext/startup/startup.css | 2 +- erpnext/startup/startup.js | 2 +- js/all-app.js | 2 +- js/all-web.js | 2 +- version.num | 2 +- 14 files changed, 132 insertions(+), 10 deletions(-) create mode 100644 erpnext/home/page/attributions/__init__.py create mode 100644 erpnext/home/page/attributions/attributions.css create mode 100644 erpnext/home/page/attributions/attributions.html create mode 100644 erpnext/home/page/attributions/attributions.js create mode 100644 erpnext/home/page/attributions/attributions.py create mode 100644 erpnext/home/page/attributions/attributions.txt diff --git a/css/all-app.css b/css/all-app.css index b2fd2e5732..97dc509fb9 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -1043,7 +1043,7 @@ div.dialog_head { } div.dialog_body { - padding: 8px 4px 16px 4px; + padding: 8px 8px 16px; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; @@ -2812,7 +2812,7 @@ body { } .erpnext-footer { - margin: 3px auto; + margin: 11px auto; text-align: center; } diff --git a/css/all-web.css b/css/all-web.css index 9359de898e..c8eb20fd76 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -362,7 +362,7 @@ div.dialog_head { } div.dialog_body { - padding: 8px 4px 16px 4px; + padding: 8px 8px 16px; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; @@ -1620,7 +1620,7 @@ body { } .erpnext-footer { - margin: 3px auto; + margin: 11px auto; text-align: center; } diff --git a/erpnext/home/page/activity/activity.js b/erpnext/home/page/activity/activity.js index d8e22ce809..feea380e62 100644 --- a/erpnext/home/page/activity/activity.js +++ b/erpnext/home/page/activity/activity.js @@ -15,8 +15,9 @@ erpnext.ActivityFeed = Class.extend({ this.scrub_data(data); this.add_date_separator(row, data); $(row).append(sprintf('
\ + \ + max-width: 24px;"> \ %(feed_type)s\ %(link)s %(subject)s
', data)); }, diff --git a/erpnext/home/page/attributions/__init__.py b/erpnext/home/page/attributions/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/home/page/attributions/attributions.css b/erpnext/home/page/attributions/attributions.css new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/home/page/attributions/attributions.html b/erpnext/home/page/attributions/attributions.html new file mode 100644 index 0000000000..72703c85e6 --- /dev/null +++ b/erpnext/home/page/attributions/attributions.html @@ -0,0 +1,91 @@ +
+ × +

Attributions

+
+

Source Code: + https://github.com/webnotes/erpnext

+

Website: + https://erpnext.com

+
+

ERPNext is an Open Source project and is possible because of the work of + thousands of software developers, companies and designers who have contributed their + work to the community. We have tried to list as many projects as possible that are + used by ERPNext, but this list may not be exhaustive.

+ + +

Server

+ + +

Programming Languages & Libraries

+ + +

CSS Frameworks

+ + +

Icons

+ + +

Web Frameworks

+ + +

Web Browsers

+ +
+

ERPNext License

+

ERPNext - Open Source, web based ERP

+

Copyright © 2008 onwards, Web Notes Technologies Pvt Ltd, India

+ +

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.

+ +

For complete license see http://www.gnu.org/licenses/

+
+

For more information please write to us at support@erpnext.com

+
\ No newline at end of file diff --git a/erpnext/home/page/attributions/attributions.js b/erpnext/home/page/attributions/attributions.js new file mode 100644 index 0000000000..fc56784431 --- /dev/null +++ b/erpnext/home/page/attributions/attributions.js @@ -0,0 +1 @@ +wn.pages['attributions'].onload = function(wrapper) { } \ No newline at end of file diff --git a/erpnext/home/page/attributions/attributions.py b/erpnext/home/page/attributions/attributions.py new file mode 100644 index 0000000000..f807eb0a4d --- /dev/null +++ b/erpnext/home/page/attributions/attributions.py @@ -0,0 +1 @@ +import webnotes \ No newline at end of file diff --git a/erpnext/home/page/attributions/attributions.txt b/erpnext/home/page/attributions/attributions.txt new file mode 100644 index 0000000000..a15adb97b7 --- /dev/null +++ b/erpnext/home/page/attributions/attributions.txt @@ -0,0 +1,28 @@ +# Page, attributions +[ + + # These values are common in all dictionaries + { + 'creation': '2012-03-01 12:30:42', + 'docstatus': 0, + 'modified': '2012-03-01 12:30:42', + 'modified_by': u'Administrator', + 'owner': u'Administrator' + }, + + # These values are common for all Page + { + 'doctype': 'Page', + 'module': u'Home', + 'name': '__common__', + 'page_name': u'attributions', + 'standard': u'Yes', + 'title': u'Attributions' + }, + + # Page, attributions + { + 'doctype': 'Page', + 'name': u'attributions' + } +] \ No newline at end of file diff --git a/erpnext/startup/startup.css b/erpnext/startup/startup.css index ae0ef606f1..1ce026449b 100644 --- a/erpnext/startup/startup.css +++ b/erpnext/startup/startup.css @@ -16,7 +16,7 @@ body { } .erpnext-footer { - margin: 3px auto; + margin: 11px auto; text-align: center; } diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js index 9a281e25e8..0de1704df8 100644 --- a/erpnext/startup/startup.js +++ b/erpnext/startup/startup.js @@ -73,7 +73,7 @@ erpnext.startup.start = function() { // border to the body // ------------------ $('footer').html('
\ - Powered by ERPNext
'); + ERPNext | Attributions and License'); // complete registration if(in_list(user_roles,'System Manager') && (wn.boot.setup_complete=='No')) { diff --git a/js/all-app.js b/js/all-app.js index 3c65618e1a..5d37f478a8 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -2236,7 +2236,7 @@ erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);} if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity']) erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('
\ - Powered by ERPNext
');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}} + ERPNext | Attributions and License');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}} $('#startup_div').toggle(false);} show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sales Browser'){var sb_obj=new SalesBrowser();sb_obj.set_val(chart_type);} else if(nm=='Accounts Browser') diff --git a/js/all-web.js b/js/all-web.js index e802a17e9d..b7c9f358b6 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -1084,7 +1084,7 @@ erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);} if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity']) erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('
\ - Powered by ERPNext
');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}} + ERPNext | Attributions and License');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}} $('#startup_div').toggle(false);} show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sales Browser'){var sb_obj=new SalesBrowser();sb_obj.set_val(chart_type);} else if(nm=='Accounts Browser') diff --git a/version.num b/version.num index 19e03cffa3..eb90589d8d 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -776 \ No newline at end of file +780 \ No newline at end of file From cc131af77a63e1c42881086738b7f454a68edda9 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 1 Mar 2012 13:35:07 +0530 Subject: [PATCH 2/8] add messages to always show --- erpnext/startup/startup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js index 0de1704df8..568714561d 100644 --- a/erpnext/startup/startup.js +++ b/erpnext/startup/startup.js @@ -62,7 +62,7 @@ erpnext.startup.start = function() { } else { // always allow apps wn.boot.profile.allow_modules = wn.boot.profile.allow_modules.concat( - ['To Do', 'Knowledge Base', 'Calendar', 'Activity']) + ['To Do', 'Knowledge Base', 'Calendar', 'Activity', 'Messages']) // setup toolbar erpnext.toolbar.setup(); From fe521fdbc2b18c301bc5b37a103e9dc2d646f728 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 1 Mar 2012 13:39:09 +0530 Subject: [PATCH 3/8] add messages to always show and add attribution to patch --- erpnext/patches/jan_mar_2012/navupdate.py | 1 + js/all-app.js | 2 +- js/all-web.js | 2 +- version.num | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/erpnext/patches/jan_mar_2012/navupdate.py b/erpnext/patches/jan_mar_2012/navupdate.py index 8f5250ef9e..1cfa879ad3 100644 --- a/erpnext/patches/jan_mar_2012/navupdate.py +++ b/erpnext/patches/jan_mar_2012/navupdate.py @@ -35,6 +35,7 @@ def execute(): reload_doc('setup', 'page', 'modules_setup') reload_doc('utilities', 'page', 'users') reload_doc('home', 'page', 'activity') + reload_doc('home', 'page', 'attributions') reload_doc('core', 'doctype', 'profile') # update user_image in profile diff --git a/js/all-app.js b/js/all-app.js index 5d37f478a8..fc177258b8 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -2234,7 +2234,7 @@ erpnext.startup.set_globals=function(){pscript.is_erpnext_saas=cint(wn.control_p if(inList(user_roles,'System Manager'))is_system_manager=1;} erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);} if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);} -if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity']) +if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages']) erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('
\ ERPNext | Attributions and License
');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}} $('#startup_div').toggle(false);} diff --git a/js/all-web.js b/js/all-web.js index b7c9f358b6..b98ae580f6 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -1082,7 +1082,7 @@ erpnext.startup.set_globals=function(){pscript.is_erpnext_saas=cint(wn.control_p if(inList(user_roles,'System Manager'))is_system_manager=1;} erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);} if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);} -if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity']) +if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages']) erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('
\ ERPNext | Attributions and License
');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}} $('#startup_div').toggle(false);} diff --git a/version.num b/version.num index 699ec1b9ee..17863f9c51 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -781 \ No newline at end of file +782 \ No newline at end of file From df33cb3a39b6cdfd905e964398dee06cc81cf733 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 1 Mar 2012 13:44:09 +0530 Subject: [PATCH 4/8] added activity avatar and removed menus.css --- build.json | 2 - css/all-app.css | 59 ++++---------------------- css/all-web.css | 59 ++++---------------------- erpnext/home/page/activity/activity.js | 4 +- version.num | 2 +- 5 files changed, 18 insertions(+), 108 deletions(-) diff --git a/build.json b/build.json index 17d38b3141..635e73d9dc 100644 --- a/build.json +++ b/build.json @@ -37,7 +37,6 @@ { "css/all-web.css": [ "lib/css/legacy/body.css", - "lib/css/legacy/menus.css", "lib/css/legacy/messages.css", "lib/css/legacy/dialog.css", "lib/css/bootstrap/headings.css", @@ -53,7 +52,6 @@ { "css/all-app.css": [ "lib/css/legacy/body.css", - "lib/css/legacy/menus.css", "lib/css/legacy/messages.css", "lib/css/legacy/forms.css", "lib/css/legacy/grid.css", diff --git a/css/all-app.css b/css/all-app.css index 97dc509fb9..f3a07ec9da 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -230,59 +230,16 @@ div.std-footer-item { box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); } -/* - * lib/css/legacy/menus.css - */ -/******** Menus - menu.js ************/ - -ul.menu_toolbar { - z-index: 30; - padding: 0px; - margin: 0px; - margin-top: 1px; +.avatar-small { + display: inline-block; + min-width: 29px; +} +.avatar-small img { + height: 24px; + margin-bottom: -7px; + max-width: 24px; } -ul.menu_toolbar li { - list-style: none; - margin: 0px; - float: left; -} - -.top_menu { - margin: 0px; - padding: 4px; - cursor: pointer; - color: #FFF; - margin-right: 8px; -} - -.top_menu_mo { - background-color: #000; - - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} - -div.menu_toolbar_dropdown { - position: absolute; - margin-top: 4px; - margin-left: 8px; - width: 140px; - background-color: #FFF; - color: #000; - display: none; - border: 2px solid #333; - z-index: 31; - overflow-y: auto; - overflow-x: hidden; -} - -div.dd_item { - cursor: pointer; - padding: 4px; - background-color: #FFF; -} -div.dd_item_mo { background-color: #FE8; } /* * lib/css/legacy/messages.css */ diff --git a/css/all-web.css b/css/all-web.css index c8eb20fd76..967c32b65c 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -230,59 +230,16 @@ div.std-footer-item { box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); } -/* - * lib/css/legacy/menus.css - */ -/******** Menus - menu.js ************/ - -ul.menu_toolbar { - z-index: 30; - padding: 0px; - margin: 0px; - margin-top: 1px; +.avatar-small { + display: inline-block; + min-width: 29px; +} +.avatar-small img { + height: 24px; + margin-bottom: -7px; + max-width: 24px; } -ul.menu_toolbar li { - list-style: none; - margin: 0px; - float: left; -} - -.top_menu { - margin: 0px; - padding: 4px; - cursor: pointer; - color: #FFF; - margin-right: 8px; -} - -.top_menu_mo { - background-color: #000; - - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} - -div.menu_toolbar_dropdown { - position: absolute; - margin-top: 4px; - margin-left: 8px; - width: 140px; - background-color: #FFF; - color: #000; - display: none; - border: 2px solid #333; - z-index: 31; - overflow-y: auto; - overflow-x: hidden; -} - -div.dd_item { - cursor: pointer; - padding: 4px; - background-color: #FFF; -} -div.dd_item_mo { background-color: #FE8; } /* * lib/css/legacy/messages.css */ diff --git a/erpnext/home/page/activity/activity.js b/erpnext/home/page/activity/activity.js index feea380e62..9a323d3ec1 100644 --- a/erpnext/home/page/activity/activity.js +++ b/erpnext/home/page/activity/activity.js @@ -15,9 +15,7 @@ erpnext.ActivityFeed = Class.extend({ this.scrub_data(data); this.add_date_separator(row, data); $(row).append(sprintf('
\ - - \ + \ %(feed_type)s\ %(link)s %(subject)s
', data)); }, diff --git a/version.num b/version.num index 17863f9c51..d0af645045 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -782 \ No newline at end of file +783 \ No newline at end of file From b6023a4d3428c66b937d78323d97958ea29bc5cc Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 1 Mar 2012 13:47:51 +0530 Subject: [PATCH 5/8] users - list condition --- erpnext/utilities/page/messages/messages.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/utilities/page/messages/messages.py b/erpnext/utilities/page/messages/messages.py index 8e92ff9ec9..b28299164c 100644 --- a/erpnext/utilities/page/messages/messages.py +++ b/erpnext/utilities/page/messages/messages.py @@ -48,7 +48,8 @@ def get_list(arg=None): @webnotes.whitelist() def get_active_users(arg=None): return webnotes.conn.sql("""select name from tabProfile - where enabled=1 and + where ifnull(enabled,0)=1 and + docstatus < 2 and name not in ('Administrator', 'Guest') order by first_name""", as_dict=1) From 1f4efc77ac46c1663015c07b211e83b0315c87bf Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 1 Mar 2012 13:50:33 +0530 Subject: [PATCH 6/8] fix in print formats and file rename --- .../Sales Invoice Classic.txt | 18 +++++++++--------- .../Sales Invoice Modern.txt | 18 +++++++++--------- .../Sales Invoice Spartan.txt | 18 +++++++++--------- .../jan_mar_2012/website/file_data_rename.py | 9 +++++++++ .../print_formats/SalesInvoiceClassic.html | 2 +- .../print_formats/SalesInvoiceModern.html | 2 +- .../print_formats/SalesInvoiceSpartan.html | 2 +- js/all-app.js | 2 +- version.num | 2 +- 9 files changed, 41 insertions(+), 32 deletions(-) diff --git a/erpnext/accounts/Print Format/Sales Invoice Classic/Sales Invoice Classic.txt b/erpnext/accounts/Print Format/Sales Invoice Classic/Sales Invoice Classic.txt index c628e83013..510e92206f 100644 --- a/erpnext/accounts/Print Format/Sales Invoice Classic/Sales Invoice Classic.txt +++ b/erpnext/accounts/Print Format/Sales Invoice Classic/Sales Invoice Classic.txt @@ -3,26 +3,26 @@ # These values are common in all dictionaries { - 'creation': '2011-12-21 11:02:04', + 'creation': '2012-01-13 11:41:18', 'docstatus': 0, - 'modified': '2012-01-06 14:17:57', - 'modified_by': 'Administrator', - 'owner': 'Administrator' + 'modified': '2012-03-01 13:36:06', + 'modified_by': u'Administrator', + 'owner': u'Administrator' }, # These values are common for all Print Format { - 'doc_type': 'Receivable Voucher', + 'doc_type': u'Receivable Voucher', 'doctype': 'Print Format', - 'html': '\n\n\n\n\n\n\n\n\n\n\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t

\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Invoice Date
Due Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
\n', - 'module': 'Accounts', + 'html': u'\n\n\n\n\n\n\n\n\n\n\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t

\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Invoice Date
Due Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
\n', + 'module': u'Accounts', 'name': '__common__', - 'standard': 'Yes' + 'standard': u'Yes' }, # Print Format, Sales Invoice Classic { 'doctype': 'Print Format', - 'name': 'Sales Invoice Classic' + 'name': u'Sales Invoice Classic' } ] \ No newline at end of file diff --git a/erpnext/accounts/Print Format/Sales Invoice Modern/Sales Invoice Modern.txt b/erpnext/accounts/Print Format/Sales Invoice Modern/Sales Invoice Modern.txt index 0b4c15c747..3c44fc7eca 100644 --- a/erpnext/accounts/Print Format/Sales Invoice Modern/Sales Invoice Modern.txt +++ b/erpnext/accounts/Print Format/Sales Invoice Modern/Sales Invoice Modern.txt @@ -3,26 +3,26 @@ # These values are common in all dictionaries { - 'creation': '2011-12-21 11:02:04', + 'creation': '2012-01-13 11:41:18', 'docstatus': 0, - 'modified': '2012-01-06 14:18:11', - 'modified_by': 'Administrator', - 'owner': 'Administrator' + 'modified': '2012-03-01 13:36:24', + 'modified_by': u'Administrator', + 'owner': u'Administrator' }, # These values are common for all Print Format { - 'doc_type': 'Receivable Voucher', + 'doc_type': u'Receivable Voucher', 'doctype': 'Print Format', - 'html': '\n\n\n\n\n\n\n\n\n\n\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Invoice No.
Invoice Date
Due Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
\n', - 'module': 'Accounts', + 'html': u'\n\n\n\n\n\n\n\n\n\n\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Invoice No.
Invoice Date
Due Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
\n', + 'module': u'Accounts', 'name': '__common__', - 'standard': 'Yes' + 'standard': u'Yes' }, # Print Format, Sales Invoice Modern { 'doctype': 'Print Format', - 'name': 'Sales Invoice Modern' + 'name': u'Sales Invoice Modern' } ] \ No newline at end of file diff --git a/erpnext/accounts/Print Format/Sales Invoice Spartan/Sales Invoice Spartan.txt b/erpnext/accounts/Print Format/Sales Invoice Spartan/Sales Invoice Spartan.txt index dc85a5f078..b91f5cd9a6 100644 --- a/erpnext/accounts/Print Format/Sales Invoice Spartan/Sales Invoice Spartan.txt +++ b/erpnext/accounts/Print Format/Sales Invoice Spartan/Sales Invoice Spartan.txt @@ -3,26 +3,26 @@ # These values are common in all dictionaries { - 'creation': '2011-12-21 11:02:04', + 'creation': '2012-01-13 11:41:18', 'docstatus': 0, - 'modified': '2012-01-06 14:18:25', - 'modified_by': 'Administrator', - 'owner': 'Administrator' + 'modified': '2012-03-01 13:36:52', + 'modified_by': u'Administrator', + 'owner': u'Administrator' }, # These values are common for all Print Format { - 'doc_type': 'Receivable Voucher', + 'doc_type': u'Receivable Voucher', 'doctype': 'Print Format', - 'html': '\n\n\n\n\n\n\n\n\n\n\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t

\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Invoice Date
Due Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
\n', - 'module': 'Accounts', + 'html': u'\n\n\n\n\n\n\n\n\n\n\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t

\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Invoice Date
Due Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
\n', + 'module': u'Accounts', 'name': '__common__', - 'standard': 'Yes' + 'standard': u'Yes' }, # Print Format, Sales Invoice Spartan { 'doctype': 'Print Format', - 'name': 'Sales Invoice Spartan' + 'name': u'Sales Invoice Spartan' } ] \ No newline at end of file diff --git a/erpnext/patches/jan_mar_2012/website/file_data_rename.py b/erpnext/patches/jan_mar_2012/website/file_data_rename.py index 481a530aeb..dc4110bbc5 100644 --- a/erpnext/patches/jan_mar_2012/website/file_data_rename.py +++ b/erpnext/patches/jan_mar_2012/website/file_data_rename.py @@ -69,3 +69,12 @@ def replace_file_list_column_entries(): if file_list and "/" in file_list: webnotes.conn.sql("UPDATE `%s` SET file_list='%s' WHERE name='%s'" \ % (tab, file_list.replace('/', '-'), name)) + + singles = webnotes.conn.sql("""SELECT doctype, value FROM `tabSingles` + WHERE field='file_list'""") + for doctype, file_list in singles: + if file_list and "/" in file_list: + webnotes.conn.sql("""UPDATE `tabSingles` SET value='%s' + WHERE doctype='%s' AND field='file_list'""" + % (file_list.replace('/', '-'), doctype)) + diff --git a/erpnext/patches/print_formats/SalesInvoiceClassic.html b/erpnext/patches/print_formats/SalesInvoiceClassic.html index 78cb8155ff..d40f80152b 100644 --- a/erpnext/patches/print_formats/SalesInvoiceClassic.html +++ b/erpnext/patches/print_formats/SalesInvoiceClassic.html @@ -200,7 +200,7 @@ - + diff --git a/erpnext/patches/print_formats/SalesInvoiceModern.html b/erpnext/patches/print_formats/SalesInvoiceModern.html index cef84ac6a2..ac66423495 100644 --- a/erpnext/patches/print_formats/SalesInvoiceModern.html +++ b/erpnext/patches/print_formats/SalesInvoiceModern.html @@ -227,7 +227,7 @@ - + diff --git a/erpnext/patches/print_formats/SalesInvoiceSpartan.html b/erpnext/patches/print_formats/SalesInvoiceSpartan.html index 7d13674f9a..81e1c380fe 100644 --- a/erpnext/patches/print_formats/SalesInvoiceSpartan.html +++ b/erpnext/patches/print_formats/SalesInvoiceSpartan.html @@ -222,7 +222,7 @@
Invoice Date
Due Date
Invoice Date
Due Date - + diff --git a/js/all-app.js b/js/all-app.js index 3c65618e1a..f1a661fed8 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -1717,7 +1717,7 @@ f.hide_save=function(){$dh(me.page_layout.footer.save_area);}} _f.Frm.prototype.setup_fields_std=function(){var fl=fields_list[this.doctype];fl.sort(function(a,b){return a.idx-b.idx});if(fl[0]&&fl[0].fieldtype!="Section Break"||get_url_arg('embed')){this.layout.addrow();if(fl[0].fieldtype!="Column Break"){var c=this.layout.addcell();$y(c.wrapper,{padding:'8px'});}} var sec;for(var i=0;i Date: Thu, 1 Mar 2012 13:58:13 +0530 Subject: [PATCH 7/8] update in patches --- erpnext/patches/jan_mar_2012/add_roles_to_admin.py | 10 ++++++++++ erpnext/patches/jan_mar_2012/label_cleanup.py | 5 +++++ erpnext/patches/patch_list.py | 10 ++++++++++ 3 files changed, 25 insertions(+) create mode 100644 erpnext/patches/jan_mar_2012/add_roles_to_admin.py diff --git a/erpnext/patches/jan_mar_2012/add_roles_to_admin.py b/erpnext/patches/jan_mar_2012/add_roles_to_admin.py new file mode 100644 index 0000000000..402675ae2c --- /dev/null +++ b/erpnext/patches/jan_mar_2012/add_roles_to_admin.py @@ -0,0 +1,10 @@ +def execute(): + """ + Adds various roles to Administrator. This patch is for making master db + ready for on premise installation + """ + import webnotes + from webnotes.model.code import get_obj + from webnotes.model.doc import Document + sc = get_obj('Setup Control', 'Setup Control') + sc.add_roles(Document('Profile', 'Administrator')) diff --git a/erpnext/patches/jan_mar_2012/label_cleanup.py b/erpnext/patches/jan_mar_2012/label_cleanup.py index a6aae9ad55..93536fa2b9 100644 --- a/erpnext/patches/jan_mar_2012/label_cleanup.py +++ b/erpnext/patches/jan_mar_2012/label_cleanup.py @@ -40,3 +40,8 @@ def execute(): delete_doc('DocType', 'Update Delivery Date Detail') + # Reload print formats + reload_doc('accounts', 'Print Format', 'Sales Invoice Classic') + reload_doc('accounts', 'Print Format', 'Sales Invoice Modern') + reload_doc('accounts', 'Print Format', 'Sales Invoice Spartan') + diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py index 6c66f75c52..021cf0042b 100644 --- a/erpnext/patches/patch_list.py +++ b/erpnext/patches/patch_list.py @@ -157,4 +157,14 @@ patch_list = [ 'patch_file': 'navupdate', 'description': 'New Navigation Pages' }, + { + 'patch_module': 'patches.jan_mar_2012', + 'patch_file': 'label_cleanup', + 'description': 'Remove extra fields and new dynamic labels' + }, + { + 'patch_module': 'patches.jan_mar_2012', + 'patch_file': 'add_roles_to_admin', + 'description': 'Add Roles to Administrator' + }, ] From b473a4d4896229c97c371b27d58d2d8ea20d6f05 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 1 Mar 2012 13:58:17 +0530 Subject: [PATCH 8/8] added all_read condition to check if user can read --- erpnext/startup/js/modules.js | 6 +++--- js/all-app.js | 2 +- version.num | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/erpnext/startup/js/modules.js b/erpnext/startup/js/modules.js index add068c75f..d43b0210b3 100644 --- a/erpnext/startup/js/modules.js +++ b/erpnext/startup/js/modules.js @@ -32,7 +32,7 @@ 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(get_label_doctype(dt))==-1) { + if(wn.boot.profile.all_read.indexOf(get_label_doctype(dt))==-1) { var txt = $(this).text(); $(this).parent().css('color', '#999').html(txt); } @@ -41,7 +41,7 @@ erpnext.module_page.hide_links = function(wrapper) { // reports $(wrapper).find('[data-doctype]').each(function() { var dt = $(this).attr('data-doctype'); - if(wn.boot.profile.can_read.indexOf(dt)==-1) { + if(wn.boot.profile.all_read.indexOf(dt)==-1) { var txt = $(this).text(); $(this).parent().css('color', '#999').html(txt); } @@ -51,7 +51,7 @@ erpnext.module_page.hide_links = function(wrapper) { $(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) { + if(wn.boot.profile.all_read.indexOf(get_label_doctype(dt))==-1) { var txt = $(this).text(); $(this).parent().css('color', '#999').html(txt); } diff --git a/js/all-app.js b/js/all-app.js index fc177258b8..4fdd6e6b7a 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -2253,7 +2253,7 @@ $(document).bind('startup',function(){erpnext.startup.start();}); * erpnext/startup/js/modules.js */ 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[title]").tooltip({delay:{show:500,hide:100}});} -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(get_label_doctype(dt))==-1){var txt=$(this).text();$(this).parent().css('color','#999').html(txt);}});$(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);}});$(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);}});} +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.all_read.indexOf(get_label_doctype(dt))==-1){var txt=$(this).text();$(this).parent().css('color','#999').html(txt);}});$(wrapper).find('[data-doctype]').each(function(){var dt=$(this).attr('data-doctype');if(wn.boot.profile.all_read.indexOf(dt)==-1){var txt=$(this).text();$(this).parent().css('color','#999').html(txt);}});$(wrapper).find('[href*="Form/"]').each(function(){var href=$(this).attr('href');var dt=href.split('/')[1];if(wn.boot.profile.all_read.indexOf(get_label_doctype(dt))==-1){var txt=$(this).text();$(this).parent().css('color','#999').html(txt);}});} erpnext.module_page.make_list=function(module,wrapper){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,callback:function(r){erpnext.module_page.hide_links(wrapper)}});wrapper.list.run();} diff --git a/version.num b/version.num index d0af645045..83249da5a1 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -783 \ No newline at end of file +784 \ No newline at end of file
Invoice Date
Due Date