Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Rushabh Mehta 2012-02-27 18:08:27 +05:30
commit 05c339cea7
13 changed files with 538 additions and 445 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
css/all-app.css
View File

@ -1186,7 +1186,6 @@ div.psidebar div.section-item, div.psidebar .section-link {
font-size: 11px;
color: #666;
}
/*
* lib/css/bootstrap/headings.css
*//* heading from bootstrap */
@ -2089,12 +2088,6 @@ button.btn.small, input[type="submit"].btn.small {
right: 13px;
}
/*extra size menus for recent*/
.dropdown-menu#toolbar-recent, .dropdown-menu#toolbar-options, .dropdown-menu#toolbar-help{
width: 260px !important;
max-width: 260px !important;
}
/* ajax spinner */
.navbar #spinner {
display: block;
@ -2108,6 +2101,7 @@ button.btn.small, input[type="submit"].btn.small {
.navbar-inner {
padding: 0px 20px;
}
/*
* lib/css/bootstrap/dropdown.css
*/.dropdown {
@ -2844,11 +2838,41 @@ body {
.navbar-new-comments {
margin: -3px 0px;
padding: 2px;
font-size: 14px;
color: #fff;
background-color: #B00D07;
min-width: 20px;
text-align: center;
display: inline-block;
border-radius: 2px;
color: #999999;
background-color: #333131;
}
.navbar-new-comments:hover,
.navbar-new-comments:active,
.navbar-new-comments:focus {
color: #fff;
}
.navbar-new-comments-true {
color: #fff;
background-color: #B00D07;
}
.navbar-icon-home {
vertical-align: middle;
opacity:0.4;
Filter:alpha(opacity=40); /* For IE8 and earlier */
}
.navbar-icon-home:hover,
.navbar-icon-home:focus,
.navbar-icon-home:active {
opacity:1;
Filter:alpha(opacity=100); /* For IE8 and earlier */
}
/*extra size menus for recent*/
.dropdown-menu#toolbar-recent, .dropdown-menu#toolbar-options, .dropdown-menu#toolbar-help{
min-width: 160px !important;
max-width: 260px !important;
}

43
css/all-web.css
View File

@ -1316,12 +1316,6 @@ button.btn.small, input[type="submit"].btn.small {
right: 13px;
}
/*extra size menus for recent*/
.dropdown-menu#toolbar-recent, .dropdown-menu#toolbar-options, .dropdown-menu#toolbar-help{
width: 260px !important;
max-width: 260px !important;
}
/* ajax spinner */
.navbar #spinner {
display: block;
@ -1335,6 +1329,7 @@ button.btn.small, input[type="submit"].btn.small {
.navbar-inner {
padding: 0px 20px;
}
/*
* lib/css/bootstrap/dropdown.css
*/.dropdown {
@ -1651,13 +1646,43 @@ body {
.navbar-new-comments {
margin: -3px 0px;
padding: 2px;
font-size: 14px;
color: #fff;
background-color: #B00D07;
min-width: 20px;
text-align: center;
display: inline-block;
border-radius: 2px;
color: #999999;
background-color: #333131;
}
.navbar-new-comments:hover,
.navbar-new-comments:active,
.navbar-new-comments:focus {
color: #fff;
}
.navbar-new-comments-true {
color: #fff;
background-color: #B00D07;
}
.navbar-icon-home {
vertical-align: middle;
opacity:0.4;
Filter:alpha(opacity=40); /* For IE8 and earlier */
}
.navbar-icon-home:hover,
.navbar-icon-home:focus,
.navbar-icon-home:active {
opacity:1;
Filter:alpha(opacity=100); /* For IE8 and earlier */
}
/*extra size menus for recent*/
.dropdown-menu#toolbar-recent, .dropdown-menu#toolbar-options, .dropdown-menu#toolbar-help{
min-width: 160px !important;
max-width: 260px !important;
}
/*

2
erpnext/home/page/desktop/desktop.js
View File

@ -78,7 +78,7 @@ erpnext.desktop.render = function() {
}
erpnext.desktop.show_pending_notifications = function() {
$('#messages a:first').prepend('<div id="msg_count" class="circle">\
$('#messages a:first').prepend('<div id="msg_count" class="circle" title="Unread Messages">\
<span class="circle-text"></span></div>');
$('#msg_count').toggle(false);
update_messages();

4
erpnext/setup/page/permission_engine/permission_engine.html
View File

@ -1,4 +1,8 @@
<div class="layout_wrapper">
<div id="pe_header"></div>
<div id="perm_engine_div" style="margin: 16px;"></div>
<div id="submittable_warning" class='help-box' style='display: None'>
One of the Roles has <b>Submit</b> permission.
You will have to <b>Cancel</b> and then <b>Amend</b> a submitted Document for making changes.
</div>
</div>

26
erpnext/setup/page/permission_engine/permission_engine.js
View File

@ -146,8 +146,11 @@ pscript.PermEngine.prototype.get_permissions = function() {
$c_obj('Permission Control','get_permissions',sel_val(me.type_select), function(r,rt) {
// Get permissions
if(r.message.perms.length)me.get_results(r.message);
if(r.message.perms.length) {
me.get_results(r.message);
}
else me.body.innerHTML = '<div style = "color : red; margin:8px 0px;">No Records Found</div>'
pscript.show_submittable();
});
}
@ -200,6 +203,9 @@ pscript.PermEngine.prototype.get_results = function(r){
var val = perms[l][$td(permt,0,m+2).fieldname];
if(val == 1) chk.checked = 1;
else chk.checked = 0;
if(m==3) { chk.onclick = pscript.show_submittable }
chk.doctype = doctype;
chk.permlevel = perms[l].permlevel; chk.perm_type = col_labels[m+2].toLowerCase(); chk.role = perms[l].role;
pscript.all_checkboxes.push(chk);
@ -210,6 +216,24 @@ pscript.PermEngine.prototype.get_results = function(r){
me.add_match_select(r, perms, permt, doctype);
}
// Show submittable warning
pscript.show_submittable = function() {
var submittable = 0;
for(i in pscript.all_checkboxes) {
c = pscript.all_checkboxes[i];
if(c.perm_type=='submit' && c.checked) {
submittable = 1;
break;
}
}
if(submittable) {
$('#submittable_warning').toggle(true);
} else {
$('#submittable_warning').toggle(false);
}
}
// render selects for match
// --------------------------------------------

13
erpnext/startup/event_handlers.py
View File

@ -84,7 +84,6 @@ def boot_session(bootinfo):
else:
bootinfo['letter_heads'] = get_letter_heads()
bootinfo['user_fullnames'] = get_fullnames()
import webnotes.model.doctype
bootinfo['docs'] += webnotes.model.doctype.get('Event')
@ -96,18 +95,6 @@ def get_letter_heads():
where ifnull(disabled,0)=0""")
return dict(ret)
def get_fullnames():
"""map of user fullnames"""
ret = dict(webnotes.conn.sql("""select name,
concat(ifnull(first_name, ''),
if(ifnull(first_name, '')!='', ' ', ''), ifnull(last_name, ''))
from tabProfile where ifnull(enabled, 0)=1"""))
for key in ret:
if not ret[key]:
ret[key] = key
return ret
def login_as(login_manager):
"""
Login as functionality -- allows signin from signin.erpnext.com

36
erpnext/startup/startup.css
View File

@ -42,11 +42,41 @@ body {
.navbar-new-comments {
margin: -3px 0px;
padding: 2px;
font-size: 14px;
color: #fff;
background-color: #B00D07;
min-width: 20px;
text-align: center;
display: inline-block;
border-radius: 2px;
color: #999999;
background-color: #333131;
}
.navbar-new-comments:hover,
.navbar-new-comments:active,
.navbar-new-comments:focus {
color: #fff;
}
.navbar-new-comments-true {
color: #fff;
background-color: #B00D07;
}
.navbar-icon-home {
vertical-align: middle;
opacity:0.4;
Filter:alpha(opacity=40); /* For IE8 and earlier */
}
.navbar-icon-home:hover,
.navbar-icon-home:focus,
.navbar-icon-home:active {
opacity:1;
Filter:alpha(opacity=100); /* For IE8 and earlier */
}
/*extra size menus for recent*/
.dropdown-menu#toolbar-recent, .dropdown-menu#toolbar-options, .dropdown-menu#toolbar-help{
min-width: 160px !important;
max-width: 260px !important;
}

18
erpnext/startup/toolbar.js
View File

@ -27,11 +27,11 @@ erpnext.toolbar.setup = function() {
$('#toolbar-user').append('<li><a href="#My Company">Team / Messages</a></li>');
$('.navbar .pull-right').prepend('\
<li><a href="#" id="toolbar-new-comments"></a></li>');
$('.navbar .pull-right').append('\
<li><a href="#!My%20Company" title="Unread Messages"><span class="navbar-new-comments"></span></a></li>');
// help
$('.navbar .pull-right').append('<li class="dropdown">\
$('.navbar .pull-right').prepend('<li class="dropdown">\
<a class="dropdown-toggle" data-toggle="dropdown" href="#" \
onclick="return false;">Help<b class="caret"></b></a>\
<ul class="dropdown-menu" id="toolbar-help">\
@ -53,18 +53,18 @@ erpnext.toolbar.setup = function() {
$.extend(page_body.wntoolbar, {
set_new_comments: function(new_comments) {
var navbar_nc = $('#toolbar-new-comments');
var navbar_nc = $('.navbar-new-comments');
if(new_comments && new_comments.length>0) {
navbar_nc.html('<span class="navbar-new-comments">' + new_comments.length + '</span>');
navbar_nc.click(function() { loadpage('My Company'); });
navbar_nc.text(new_comments.length);
navbar_nc.addClass('navbar-new-comments-true')
$.each(new_comments, function(i, v) {
var msg = 'New Message: ' + (v[1].length<=100 ? v[1] : (v[1].substr(0, 100) + "..."));
var id = v[0].replace('/', '-');
if(!$('#' + id)[0]) { show_alert(msg, id); }
})
} else {
navbar_nc.html('');
navbar_nc.click(function() { return false; });
navbar_nc.removeClass('navbar-new-comments-true');
navbar_nc.text(0);
}
}
});
@ -89,7 +89,7 @@ erpnext.toolbar.add_modules = function() {
<li class="divider"></li>\
<li><a href="#!Setup" data-module="Setup">Setup</a></li>\
</ul>\
</li>').insertAfter('li[data-name="navbar-home"]');
</li>').prependTo('.navbar .nav:first');
$('.navbar .nav:first')
}

8
erpnext/support/doctype/support_ticket/support_ticket.css Normal file
View File

@ -0,0 +1,8 @@
.support-ticket-wrapper {
margin-top: 10px;
}
.support-ticket-title {
padding: 5px;
border-bottom: 1px solid black;
}

29
js/all-app.js
View File

@ -353,7 +353,7 @@ function add_sel_options(s,list,sel_val,o_style){if(s.custom_select){s.set_optio
if(sel_val)s.inp.value=sel_val;return;}
if(s.inp)s=s.inp;for(var i=0,len=list.length;i<len;i++){var o=new Option(list[i],list[i],false,(list[i]==sel_val?true:false));if(o_style)$y(o,o_style);s.options[s.options.length]=o;}}
function cint(v,def){v=v+'';v=lstrip(v,['0']);v=parseInt(v);if(isNaN(v))v=def?def:0;return v;}
function validate_email(id){if(strip(id).search("[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?")==-1)return 0;else return 1;}
function validate_email(id){if(strip(id.toLowerCase()).search("[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?")==-1)return 0;else return 1;}
function validate_spl_chars(txt){if(txt.search(/^[a-zA-Z0-9_\- ]*$/)==-1)return 1;else return 0;}
function d2h(d){return cint(d).toString(16);}
function h2d(h){return parseInt(h,16);}
@ -1319,7 +1319,7 @@ if(rd[1]){var dt=rd[0];var dn=rd[1];this.add(dt,dn,0);}}}});
/*
* lib/js/wn/ui/toolbar/toolbar.js
*/
wn.ui.toolbar.Toolbar=Class.extend({init:function(){this.make();this.make_home();this.make_document();this.make_apps();wn.ui.toolbar.recent=new wn.ui.toolbar.RecentDocs();this.make_tools();this.set_user_name();this.make_logout();$('.dropdown-toggle').dropdown();$(document).trigger('toolbar_setup');},make:function(){$('header').append('<div class="navbar navbar-fixed-top">\
wn.ui.toolbar.Toolbar=Class.extend({init:function(){this.make();this.make_home();this.make_document();wn.ui.toolbar.recent=new wn.ui.toolbar.RecentDocs();this.make_tools();this.set_user_name();this.make_logout();$('.dropdown-toggle').dropdown();$(document).trigger('toolbar_setup');},make:function(){$('header').append('<div class="navbar navbar-fixed-top">\
<div class="navbar-inner">\
<div class="container">\
<a class="brand"></a>\
@ -1336,8 +1336,7 @@ wn.ui.toolbar.Toolbar=Class.extend({init:function(){this.make();this.make_home()
</ul>\
</div>\
</div>\
</div>');},make_home:function(){$('.navbar .nav:first').append('<li data-name="navbar-home">\
<a href="#!'+home_page+'">Home</a></li>');$('.navbar .brand').attr('href',"#!"+home_page);},make_document:function(){wn.ui.toolbar.new_dialog=new wn.ui.toolbar.NewDialog();wn.ui.toolbar.search=new wn.ui.toolbar.Search();wn.ui.toolbar.report=new wn.ui.toolbar.Report();$('.navbar .nav:first').append('<li class="dropdown">\
</div>');},make_home:function(){$('.navbar .brand').attr('href',"#!"+home_page);},make_document:function(){wn.ui.toolbar.new_dialog=new wn.ui.toolbar.NewDialog();wn.ui.toolbar.search=new wn.ui.toolbar.Search();wn.ui.toolbar.report=new wn.ui.toolbar.Report();$('.navbar .nav:first').append('<li class="dropdown">\
<a class="dropdown-toggle" href="#" data-toggle="dropdown"\
onclick="return false;">Document<b class="caret"></b></a>\
<ul class="dropdown-menu" id="toolbar-document">\
@ -1358,16 +1357,7 @@ wn.ui.toolbar.Toolbar=Class.extend({init:function(){this.make();this.make_home()
</ul>\
</li>');if(has_common(user_roles,['Administrator','System Manager'])){$('#toolbar-tools').append('<li><a href="#" \
onclick="return wn.ui.toolbar.download_backup();">\
Download Backup</a></li>');}},make_apps:function(){$('.navbar .nav:first').append('<li class="dropdown">\
<a class="dropdown-toggle" data-toggle="dropdown" \
href="#" onclick="return false;">Apps<b class="caret"></b></a>\
<ul class="dropdown-menu">\
<li><a href="#!messages">Messages</a></li>\
<li><a href="#!todo">To Do</a></li>\
<li><a href="#!calendar">Calendar</a></li>\
<li><a href="#!questions">Knowledge Base</a></li>\
</ul>\
</li>');},set_user_name:function(){var fn=user_fullname;if(fn.length>15)fn=fn.substr(0,12)+'...';$('#toolbar-user-link').html(fn+'<b class="caret"></b>');},make_logout:function(){$('#toolbar-user').append('<li><a href="#" onclick="return logout();">Logout</a></li>');}});wn.ui.toolbar.clear_cache=function(){localStorage&&localStorage.clear();$c('webnotes.session_cache.clear',{},function(r,rt){show_alert(r.message);});return false;}
Download Backup</a></li>');}},set_user_name:function(){var fn=user_fullname;if(fn.length>15)fn=fn.substr(0,12)+'...';$('#toolbar-user-link').html(fn+'<b class="caret"></b>');},make_logout:function(){$('#toolbar-user').append('<li><a href="#" onclick="return logout();">Logout</a></li>');}});wn.ui.toolbar.clear_cache=function(){localStorage&&localStorage.clear();$c('webnotes.session_cache.clear',{},function(r,rt){show_alert(r.message);});return false;}
wn.ui.toolbar.download_backup=function(){$c('webnotes.utils.backups.get_backup',{},function(r,rt){});return false;}
wn.ui.toolbar.show_about=function(){try{wn.require('lib/js/wn/misc/about.js');wn.ui.misc.about();}catch(e){console.log(e);}
return false;}
@ -2197,7 +2187,7 @@ get_window_height=function(){var ht=window.innerHeight?window.innerHeight:docume
* js/app.js
*/
wn.app={name:'ERPNext',license:'GNU/GPL - Usage Condition: All "erpnext" branding must be kept as it is',source:'https://github.com/webnotes/erpnext',publisher:'Web Notes Technologies Pvt Ltd, Mumbai',copyright:'&copy; Web Notes Technologies Pvt Ltd',version:'2.'+window._version_number}
wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',function(){startup();});$(document).bind('toolbar_setup',function(){$('.brand').html('<b>erp</b>next');})
wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',function(){startup();});$(document).bind('toolbar_setup',function(){$('.brand').html('<b>erp</b>next&nbsp;<i class="icon-home icon-white navbar-icon-home" ></i>');})
/*
* erpnext/startup/startup.js
*/
@ -2231,8 +2221,8 @@ erpnext.module_page.make_list=function(module,wrapper){wrapper.list=new wn.widge
/*
* erpnext/startup/toolbar.js
*/
wn.provide('erpnext.toolbar');erpnext.toolbar.setup=function(){erpnext.toolbar.add_modules();$('#toolbar-user').append('<li><a href="#profile-settings">Profile Settings</a></li>');$('#toolbar-user').append('<li><a href="#My Company">Team / Messages</a></li>');$('.navbar .pull-right').prepend('\
<li><a href="#" id="toolbar-new-comments"></a></li>');$('.navbar .pull-right').append('<li class="dropdown">\
wn.provide('erpnext.toolbar');erpnext.toolbar.setup=function(){erpnext.toolbar.add_modules();$('#toolbar-user').append('<li><a href="#profile-settings">Profile Settings</a></li>');$('#toolbar-user').append('<li><a href="#My Company">Team / Messages</a></li>');$('.navbar .pull-right').append('\
<li><a href="#!My%20Company" title="Unread Messages"><span class="navbar-new-comments"></span></a></li>');$('.navbar .pull-right').prepend('<li class="dropdown">\
<a class="dropdown-toggle" data-toggle="dropdown" href="#" \
onclick="return false;">Help<b class="caret"></b></a>\
<ul class="dropdown-menu" id="toolbar-help">\
@ -2244,7 +2234,8 @@ $('#toolbar-help').append('<li><a href="http://groups.google.com/group/erpnext-u
$('#toolbar-help').append('<li><a href="http://www.providesupport.com?messenger=iwebnotes" target="_blank">\
Live Chat (Office Hours)</a></li>')
if(pscript.is_erpnext_saas&&is_system_manager){$('#toolbar-user').append('<li><a href="#billing">Billing</a></li>')}
$.extend(page_body.wntoolbar,{set_new_comments:function(new_comments){var navbar_nc=$('#toolbar-new-comments');if(new_comments&&new_comments.length>0){navbar_nc.html('<span class="navbar-new-comments">'+new_comments.length+'</span>');navbar_nc.click(function(){loadpage('My Company');});$.each(new_comments,function(i,v){var msg='New Message: '+(v[1].length<=100?v[1]:(v[1].substr(0,100)+"..."));var id=v[0].replace('/','-');if(!$('#'+id)[0]){show_alert(msg,id);}})}else{navbar_nc.html('');navbar_nc.click(function(){return false;});}}});page_body.wntoolbar.set_new_comments();}
$.extend(page_body.wntoolbar,{set_new_comments:function(new_comments){var navbar_nc=$('.navbar-new-comments');if(new_comments&&new_comments.length>0){navbar_nc.text(new_comments.length);navbar_nc.addClass('navbar-new-comments-true')
$.each(new_comments,function(i,v){var msg='New Message: '+(v[1].length<=100?v[1]:(v[1].substr(0,100)+"..."));var id=v[0].replace('/','-');if(!$('#'+id)[0]){show_alert(msg,id);}})}else{navbar_nc.removeClass('navbar-new-comments-true');navbar_nc.text(0);}}});page_body.wntoolbar.set_new_comments();}
erpnext.toolbar.add_modules=function(){$('<li class="dropdown">\
<a class="dropdown-toggle" data-toggle="dropdown" href="#"\
onclick="return false;">Modules<b class="caret"></b></a>\
@ -2261,7 +2252,7 @@ erpnext.toolbar.add_modules=function(){$('<li class="dropdown">\
<li class="divider"></li>\
<li><a href="#!Setup" data-module="Setup">Setup</a></li>\
</ul>\
</li>').insertAfter('li[data-name="navbar-home"]');$('.navbar .nav:first')}
</li>').prependTo('.navbar .nav:first');$('.navbar .nav:first')}
/*
* erpnext/startup/feature_setup.js
*/

4
js/all-web.js
View File

@ -279,7 +279,7 @@ function add_sel_options(s,list,sel_val,o_style){if(s.custom_select){s.set_optio
if(sel_val)s.inp.value=sel_val;return;}
if(s.inp)s=s.inp;for(var i=0,len=list.length;i<len;i++){var o=new Option(list[i],list[i],false,(list[i]==sel_val?true:false));if(o_style)$y(o,o_style);s.options[s.options.length]=o;}}
function cint(v,def){v=v+'';v=lstrip(v,['0']);v=parseInt(v);if(isNaN(v))v=def?def:0;return v;}
function validate_email(id){if(strip(id).search("[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?")==-1)return 0;else return 1;}
function validate_email(id){if(strip(id.toLowerCase()).search("[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?")==-1)return 0;else return 1;}
function validate_spl_chars(txt){if(txt.search(/^[a-zA-Z0-9_\- ]*$/)==-1)return 1;else return 0;}
function d2h(d){return cint(d).toString(16);}
function h2d(h){return parseInt(h,16);}
@ -1035,7 +1035,7 @@ get_window_height=function(){var ht=window.innerHeight?window.innerHeight:docume
* js/app.js
*/
wn.app={name:'ERPNext',license:'GNU/GPL - Usage Condition: All "erpnext" branding must be kept as it is',source:'https://github.com/webnotes/erpnext',publisher:'Web Notes Technologies Pvt Ltd, Mumbai',copyright:'&copy; Web Notes Technologies Pvt Ltd',version:'2.'+window._version_number}
wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',function(){startup();});$(document).bind('toolbar_setup',function(){$('.brand').html('<b>erp</b>next');})
wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',function(){startup();});$(document).bind('toolbar_setup',function(){$('.brand').html('<b>erp</b>next&nbsp;<i class="icon-home icon-white navbar-icon-home" ></i>');})
/*
* erpnext/startup/startup.js
*/

2
js/app.js
View File

@ -31,5 +31,5 @@ $(document).bind('ready', function() {
});
$(document).bind('toolbar_setup', function() {
$('.brand').html('<b>erp</b>next');
$('.brand').html('<b>erp</b>next&nbsp;<i class="icon-home icon-white navbar-icon-home" ></i>');
})

2
version.num
View File

@ -1 +1 @@
719
739