From 6f89f1eb86ff24134f86aed5f994c683722bde1e Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 16 Apr 2012 14:44:47 +0530 Subject: [PATCH] fixes in sales cycle --- css/all-app.css | 110 +++------ css/all-web.css | 228 ++---------------- erpnext/selling/doctype/lead/lead.js | 2 +- .../doctype/sales_order/sales_order.js | 9 +- .../doctype/delivery_note/delivery_note.js | 7 +- js/all-app.js | 96 +------- js/all-web.js | 69 +----- 7 files changed, 78 insertions(+), 443 deletions(-) diff --git a/css/all-app.css b/css/all-app.css index e60ce809ad..d74e30cead 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -1945,6 +1945,10 @@ div.std-footer-item { padding: 0px; } +.layout-section { + padding: 15px; +} + .layout-main-section { width: 71%; float: left; @@ -2201,6 +2205,29 @@ div.time_field select{ width: 45px; } +/* sidebar */ + +div.sidebar-comment-wrapper input { + width: 50%; +} +div.sidebar-comment-message { + margin-top: 8px; + color: #777; +} + +div.sidebar-comment-text { + font-size: 12px; + font-weight: bold; + margin-top: 8px; + color: #444; +} +div.sidebar-comment-info { + color: #777; +} + +/* + * lib/css/legacy/fields.css + */ /* Documents */ .frm_field_table { @@ -2267,26 +2294,6 @@ div.time_field select{ background-color:#FEE; } -/* sidebar */ - -div.sidebar-comment-wrapper input { - width: 50%; -} -div.sidebar-comment-message { - margin-top: 8px; - color: #777; -} - -div.sidebar-comment-text { - font-size: 12px; - font-weight: bold; - margin-top: 8px; - color: #444; -} -div.sidebar-comment-info { - color: #777; -} - /* * lib/css/legacy/grid.css */ @@ -3494,7 +3501,7 @@ div.appframe-titlebar { background: -ms-linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* IE10+ */ background: linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* W3C */ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#cccccc',GradientType=0 ); /* IE6-9 */ - border-bottom: 1px solid #ccc; + border-bottom: 1px solid #aaa; min-height: 1.2em; } @@ -3558,64 +3565,3 @@ div.appframe-toolbar { } - -/* - * erpnext/startup/startup.css - */ -h1, h2, h3, h4, h5 { - font-family: "Helvetica Neue", "Open Sans", Helvetica, sans-serif; - font-weight: normal; - margin-top: 0.2em; -} - -body { - font-family: "Helvetica Neue", "Open Sans", Helvetica, sans-serif; - font-size: 13px; -} - -span, div, td, input, textarea, button, select { - font-family: inherit; -} - -body { - background: url(../images/redbeech.jpg) repeat; - color: #616161; -} - -.small { - font-size: 11.5px; -} - -.erpnext-footer { - margin: 11px auto; - text-align: center; -} - -.navbar-new-comments { - margin: -3px 0px; - padding: 2px; - 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; -} - -/*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; -} - diff --git a/css/all-web.css b/css/all-web.css index be24b1e967..cc2db5aab8 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -1425,6 +1425,10 @@ div.std-footer-item { padding: 0px; } +.layout-section { + padding: 15px; +} + .layout-main-section { width: 71%; float: left; @@ -1847,214 +1851,34 @@ div.stat-bar { /* - * erpnext/startup/startup.css + * lib/css/ui/views.css */ -h1, h2, h3, h4, h5 { - font-family: "Helvetica Neue", "Open Sans", Helvetica, sans-serif; - font-weight: normal; - margin-top: 0.2em; + +.breadcrumbs { + color: #000000; } -body { - font-family: "Helvetica Neue", "Open Sans", Helvetica, sans-serif; - font-size: 13px; +.breadcrumbs a { + color: #000000; } -span, div, td, input, textarea, button, select { - font-family: inherit; -} - -body { - background: url(../images/redbeech.jpg) repeat; - color: #616161; -} - -.small { - font-size: 11.5px; -} - -.erpnext-footer { - margin: 11px auto; - text-align: center; -} - -.navbar-new-comments { - margin: -3px 0px; - padding: 2px; - 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; -} - -/*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; -} - - -/* - * erpnext/website/css/website.css - */ -div#body_div, header .container, .content, #opened-page-selector, footer { - width: 900px; -} - -.layout_wrapper { - padding: 27px; -} - -p, li { - line-height: 1.6em; -} - -pre { - background-color: #F8F8F8; - border: 1px solid #CCCCCC; - border-radius: 3px 3px 3px 3px; - font-size: 13px; - line-height: 19px; - overflow: auto; - padding: 6px 10px; - margin-bottom: 9px; -} - -.web-content input[type="text"], .web-content input[type="password"], .web-content select { - min-width: 180px; -} - -.web-head-section { - margin-bottom: 20px -} - -.web-main-section { - width: 65%; - float: left; - margin-bottom: 20px; -} - -.web-side-section { - width: 30%; - float: right; - margin-bottom: 20px; - margin-right: 15px; - color: #606060; - overflow-x: hidden; - font-size: 90%; -} - -.web-page-status { - padding: 7px; - color: #777; - clear: both; - text-align: right; -} - -.web-page-status a, -.web-page-status a:hover, -.web-page-status a:visited { - padding: 2px; - background-color: #777; - color: #FFF; - text-decoration: none; -} - -.web-page-status a:hover { - background-color: #444; -} - -footer { - color: #777; -} - -.web-footer { - color: inherit; - text-align: center; - margin: 10px; - line-height: 1.7; -} - -.web-footer div, .web-footer a { - font-size: 11px; -} - -.web-footer-menu { - margin-bottom: 7px; -} -footer a, footer a:visited { - color: #777; -} - -footer a:hover { - background-color: #777; - color: #fff; -} - -.web-footer-menu ul { - list-style: none; - margin: 0px; - padding: 0px; -} - -.web-footer-menu ul li { - display: inline; - padding: 2px 15px; - border-right: 1px solid #999; -} - -.web-footer-menu ul li:last-child { - border-right: 0px solid #777 !important; -} - -/* slide view */ - -.next-slide { - margin: 0px -27px 100px -27px; - background: #ffffff; /* Old browsers */ - background: -moz-linear-gradient(top, #eeeeee 0%, #fff 100%); /* FF3.6+ */ - background: -webkit-linear-gradient(top, #eeeeee 0%, #fff 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #eeeeee 0%, #fff 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #eeeeee 0%, #fff 100%); /* IE10+ */ - background: linear-gradient(top, #eeeeee 0%, #fff 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#fff',GradientType=0 ); /* IE6-9 */ - height: 36px; -} - -.slide-shadow { +div.appframe-titlebar { + padding: 6px; background: #eeeeee; /* Old browsers */ - background: -moz-linear-gradient(top, #bababa 0%,#eeeeee 100%); /* FF3.6+ */ - background: -webkit-linear-gradient(top, #bababa 0%,#eeeeee 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #bababa 0%,#eeeeee 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #bababa 0%,#eeeeee 100%); /* IE10+ */ - background: linear-gradient(top, #bababa 0%,#eeeeee 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#bababa', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */ - height: 3px; - margin: 100px -27px 0px -27px; - border-top: 1px solid #bababa; + background: -moz-linear-gradient(top, #eeeeee 0%, #cccccc 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#eeeeee), color-stop(100%,#cccccc)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* IE10+ */ + background: linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#cccccc',GradientType=0 ); /* IE6-9 */ + border-bottom: 1px solid #aaa; + min-height: 1.2em; } -.two-column { - width: 40%; - float: left; - padding: 5%; +div.appframe-toolbar { + padding: 4px; + background: #eeeeee; + border-top: 1px solid #f8f8f8; + border-bottom: 1px solid #ccc; } - -.clear { - clear: both; -} - -/* */ diff --git a/erpnext/selling/doctype/lead/lead.js b/erpnext/selling/doctype/lead/lead.js index d33478f559..e97aea59f8 100644 --- a/erpnext/selling/doctype/lead/lead.js +++ b/erpnext/selling/doctype/lead/lead.js @@ -47,7 +47,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { //--------------- cur_frm.clear_custom_buttons() if(!doc.__islocal && !in_list(['Converted', 'Lead Lost'], doc.status)) { - cur_frm.add_custom_button('Create Customer', cur_frm.cscript['Create Customer']); + if (doc.source != 'Existing Customer') cur_frm.add_custom_button('Create Customer', cur_frm.cscript['Create Customer']); cur_frm.add_custom_button('Create Opportunity', cur_frm.cscript['Create Opportunity']); cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); } diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index a18f079d88..91d3fd59ad 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -86,15 +86,10 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { // stop if(doc.per_delivered < 100 || doc.per_billed < 100) cur_frm.add_custom_button('Stop!', cur_frm.cscript['Stop Sales Order']); - } else { - + } else { // un-stop cur_frm.add_custom_button('Unstop', cur_frm.cscript['Unstop Sales Order']); - } - - unhide_field(['Send SMS', 'message', 'customer_mobile_no']) - } else { - hide_field(['Send SMS', 'message', 'customer_mobile_no']) + } } } diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js index 99c0a73dbb..e030fc1b00 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.js +++ b/erpnext/stock/doctype/delivery_note/delivery_note.js @@ -63,12 +63,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { if(doc.per_installed < 100 && doc.docstatus==1) cur_frm.add_custom_button('Make Installation Note', cur_frm.cscript['Make Installation Note']); - if (doc.docstatus!=1) { - hide_field(['Send SMS', 'message', 'customer_mobile_no'); - } else { - cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); - unhide_field(['Send SMS', 'message', 'customer_mobile_no'); - } + if (doc.docstatus==1) cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); if(doc.docstatus==0 && !doc.__islocal) { cur_frm.add_custom_button('Make Packing Slip', cur_frm.cscript['Make Packing Slip']); diff --git a/js/all-app.js b/js/all-app.js index e78d0cdd12..c9a727d0b1 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -925,14 +925,15 @@ if(f.init)f.init();f.make_body();return f;} wn.ui.AppFrame=Class.extend({init:function(parent){this.buttons={};this.$w=$('
').appendTo(parent);this.$titlebar=$('
\ \ ×\ -
').appendTo(this.$w);this.$w.find('.close').click(function(){window.history.back();})},add_button:function(label,click,icon){if(!this.$w.find('.appframe-toolbar').length) + ').appendTo(this.$w);this.$w.find('.close').click(function(){window.history.back();})},title:function(txt){this.$titlebar.find('.appframe-title').text(txt);},add_button:function(label,click,icon){if(!this.$w.find('.appframe-toolbar').length) this.$w.append('
');args={label:label,icon:''};if(icon){args.icon='';} this.buttons[label]=$(repl('',args)).click(click).appendTo(this.$w.find('.appframe-toolbar'));return this.buttons[label];},clear_buttons:function(){this.$w.find('.appframe-toolbar').empty();}}) /* * lib/js/wn/ui/dialog.js */ -wn.widgets.FieldGroup=function(){this.first_button=false;this.make_fields=function(body,fl){$y(this.body,{padding:'11px'});this.fields_dict={};for(var i=0;ierpnext\ - ').hover(function(){$(this).find('.icon-home').addClass('navbar-icon-home-hover');},function(){$(this).find('.icon-home').removeClass('navbar-icon-home-hover');});}); -/* - * erpnext/startup/startup.js - */ -var current_module;var is_system_manager=0;wn.provide('erpnext.startup');erpnext.modules={'Selling':'selling-home','Accounts':'accounts-home','Stock':'stock-home','Buying':'buying-home','Support':'support-home','Projects':'projects-home','Production':'production-home','Website':'website-home','HR':'hr-home','Setup':'Setup','Activity':'activity','To Do':'todo','Calendar':'calendar','Messages':'messages','Knowledge Base':'questions','Dashboard':'dashboard'} -erpnext.startup.set_globals=function(){wn.control_panel.sync_with_gateway=wn.boot.sync_with_gateway -pscript.is_erpnext_saas=cint(wn.control_panel.sync_with_gateway) -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.user_background){erpnext.set_user_background(wn.boot.user_background);} -if(user=='Guest'){if(wn.boot.custom_css){set_style(wn.boot.custom_css);} -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']) -if(user_roles.indexOf('Accounts Manager')!=-1){wn.boot.profile.allow_modules.push('Dashboard');} -erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();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') -pscript.make_chart(chart_type);} -loadpage(nm,call_back);} -var update_messages=function(reset){if(inList(['Guest'],user)||!wn.session_alive){return;} -if(!reset){var set_messages=function(r){if(!r.exc){wn.container.wntoolbar.set_new_comments(r.message.unread_messages);var show_in_circle=function(parent_id,msg){var parent=$('#'+parent_id);if(parent){if(msg){parent.find('span:first').text(msg);parent.toggle(true);}else{parent.toggle(false);}}} -show_in_circle('unread_messages',r.message.unread_messages.length);show_in_circle('open_support_tickets',r.message.open_support_tickets);show_in_circle('things_todo',r.message.things_todo);show_in_circle('todays_events',r.message.todays_events);}else{clearInterval(wn.updates.id);}} -wn.call({method:'startup.startup.get_global_status_messages',callback:set_messages});}else{wn.container.wntoolbar.set_new_comments(0);$('#unread_messages').toggle(false);}} -erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);} -wn.updates.id=setInterval(update_messages,60000);} -erpnext.set_user_background=function(src){set_style(repl('body { background: url("files/%(src)s") repeat;}',{src:src}))} -$(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.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.ui.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();} -/* - * erpnext/startup/js/toolbar.js - */ -wn.provide('erpnext.toolbar');erpnext.toolbar.setup=function(){erpnext.toolbar.add_modules();$('#toolbar-user').append('
  • Profile Settings
    • ');$('.navbar .pull-right').append('\ -
    • ');$('.navbar .pull-right').prepend('
  • \ - Help\ -
    • ') -$('#toolbar-help').append('
  • \ - Documentation
    • ') -$('#toolbar-help').append('
  • \ - Forum
    • ') -$('#toolbar-help').append('
  • \ - Live Chat (Office Hours)
    • ') -if(pscript.is_erpnext_saas&&is_system_manager){$('#toolbar-user').append('
  • Billing
    • ')} -$.extend(wn.container.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);}}});wn.container.wntoolbar.set_new_comments();} -erpnext.toolbar.add_modules=function(){$('
  • \ - Modules\ -
      \ -
    \ -
    • ').prependTo('.navbar .nav:first');if(wn.boot.modules_list) -wn.boot.modules_list=JSON.parse(wn.boot.modules_list);else -wn.boot.modules_list=keys(erpnext.modules).sort();for(var i in wn.boot.modules_list){var m=wn.boot.modules_list[i] -if(m!='Setup'&&wn.boot.profile.allow_modules.indexOf(m)!=-1){args={module:m,module_page:erpnext.modules[m],module_label:m=='HR'?'Human Resources':m} -$('.navbar .modules').append(repl('
  • %(module_label)s
    • ',args));}} -if(user_roles.indexOf("Accounts Manager")!=-1){$('.navbar .modules').append('
  • Dashboard
    • ');} -if(user_roles.indexOf("System Manager")!=-1){$('.navbar .modules').append('
  • \ -
  • Setup
    • ');}} -/* - * erpnext/startup/js/feature_setup.js - */ -pscript.feature_dict={'fs_projects':{'BOM':{'fields':['project_name']},'Delivery Note':{'fields':['project_name']},'Purchase Invoice':{'fields':['project_name']},'Production Order':{'fields':['project_name']},'Purchase Order':{'fields':['project_name']},'Purchase Receipt':{'fields':['project_name']},'Sales Invoice':{'fields':['project_name']},'Sales Order':{'fields':['project_name']},'Stock Entry':{'fields':['project_name']},'Timesheet':{'timesheet_details':['project_name']}},'fs_packing_details':{},'fs_discounts':{'Delivery Note':{'delivery_note_details':['adj_rate']},'Quotation':{'quotation_details':['adj_rate']},'Sales Invoice':{'entries':['adj_rate']},'Sales Order':{'sales_order_details':['adj_rate','ref_rate']}},'fs_purchase_discounts':{'Purchase Order':{'po_details':['purchase_ref_rate','discount_rate','import_ref_rate']},'Purchase Receipt':{'purchase_receipt_details':['purchase_ref_rate','discount_rate','import_ref_rate']},'Purchase Invoice':{'entries':['purchase_ref_rate','discount_rate','import_ref_rate']}},'fs_brands':{'Delivery Note':{'delivery_note_details':['brand']},'Purchase Request':{'indent_details':['brand']},'Item':{'fields':['brand']},'Purchase Order':{'po_details':['brand']},'Purchase Invoice':{'entries':['brand']},'Quotation':{'quotation_details':['brand']},'Sales Invoice':{'entries':['brand']},'Sales BOM':{'fields':['new_item_brand']},'Sales Order':{'sales_order_details':['brand']},'Serial No':{'fields':['brand']}},'fs_after_sales_installations':{'Delivery Note':{'fields':['installation_status','per_installed'],'delivery_note_details':['installed_qty']}},'fs_item_batch_nos':{'Delivery Note':{'delivery_note_details':['batch_no']},'Item':{'fields':['has_batch_no']},'Purchase Receipt':{'purchase_receipt_details':['batch_no']},'Quality Inspection':{'fields':['batch_no']},'Sales and Pruchase Return Wizard':{'return_details':['batch_no']},'Sales Invoice':{'entries':['batch_no']},'Stock Entry':{'mtn_details':['batch_no']},'Stock Ledger Entry':{'fields':['batch_no']}},'fs_item_serial_nos':{'Customer Issue':{'fields':['serial_no']},'Delivery Note':{'delivery_note_details':['serial_no'],'packing_details':['serial_no']},'Installation Note':{'installed_item_details':['serial_no']},'Item':{'fields':['has_serial_no']},'Maintenance Schedule':{'item_maintenance_detail':['serial_no'],'maintenance_schedule_detail':['serial_no']},'Maintenance Visit':{'maintenance_visit_details':['serial_no']},'Purchase Receipt':{'purchase_receipt_details':['serial_no']},'Quality Inspection':{'fields':['item_serial_no']},'Sales and Pruchase Return Wizard':{'return_details':['serial_no']},'Sales Invoice':{'entries':['serial_no']},'Stock Entry':{'mtn_details':['serial_no']},'Stock Ledger Entry':{'fields':['serial_no']}},'fs_item_group_in_details':{'Delivery Note':{'delivery_note_details':['item_group']},'Opportunity':{'enquiry_details':['item_group']},'Purchase Request':{'indent_details':['item_group']},'Item':{'fields':['item_group']},'Global Defaults':{'fields':['default_item_group']},'Purchase Order':{'po_details':['item_group']},'Purchase Receipt':{'purchase_receipt_details':['item_group']},'Purchase Voucher':{'entries':['item_group']},'Quotation':{'quotation_details':['item_group']},'Sales Invoice':{'entries':['item_group']},'Sales BOM':{'fields':['serial_no']},'Sales Order':{'sales_order_details':['item_group']},'Serial No':{'fields':['item_group']},'Sales Partner':{'partner_target_details':['item_group']},'Sales Person':{'target_details':['item_group']},'Territory':{'target_details':['item_group']}},'fs_page_break':{'Delivery Note':{'delivery_note_details':['page_break'],'packing_details':['page_break']},'Purchase Request':{'indent_details':['page_break']},'Purchase Order':{'po_details':['page_break']},'Purchase Receipt':{'purchase_receipt_details':['page_break']},'Purchase Voucher':{'entries':['page_break']},'Quotation':{'quotation_details':['page_break']},'Sales Invoice':{'entries':['page_break']},'Sales Order':{'sales_order_details':['page_break']}},'fs_exports':{'Delivery Note':{'fields':['Note','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'delivery_note_details':['base_ref_rate','amount','basic_rate']},'POS Setting':{'fields':['conversion_rate','currency']},'Quotation':{'fields':['Note HTML','OT Notes','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'quotation_details':['base_ref_rate','amount','basic_rate']},'Sales Invoice':{'fields':['conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'entries':['base_ref_rate','amount','basic_rate']},'Item':{'ref_rate_details':['ref_currency']},'Sales BOM':{'fields':['currency']},'Sales Order':{'fields':['Note1','OT Notes','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'sales_order_details':['base_ref_rate','amount','basic_rate']}},'fs_imports':{'Purchase Invoice':{'fields':['conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'entries':['purchase_ref_rate','amount','rate']},'Purchase Order':{'fields':['Note HTML','conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'po_details':['purchase_ref_rate','amount','purchase_rate']},'Purchase Receipt':{'fields':['conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'purchase_receipt_details':['purchase_ref_rate','amount','purchase_rate']},'Supplier Quotation':{'fields':['conversion_rate','currency']}},'fs_item_advanced':{'Item':{'fields':['item_customer_details']}},'fs_sales_extras':{'Address':{'fields':['sales_partner']},'Contact':{'fields':['sales_partner']},'Customer':{'fields':['sales_team']},'Delivery Note':{'fields':['sales_team','Packing List']},'Item':{'fields':['item_customer_details']},'Sales Invoice':{'fields':['sales_team']},'Sales Order':{'fields':['sales_team','Packing List']}},'fs_more_info':{'Delivery Note':{'fields':['More Info']},'Opportunity':{'fields':['More Info']},'Purchase Request':{'fields':['More Info']},'Lead':{'fields':['More Info']},'Purchase Invoice':{'fields':['More Info']},'Purchase Order':{'fields':['More Info']},'Purchase Receipt':{'fields':['More Info']},'Quotation':{'fields':['More Info']},'Sales Invoice':{'fields':['More Info']},'Sales Order':{'fields':['More Info']},},'fs_quality':{'Item':{'fields':['Item Inspection Criteria','inspection_required']},'Purchase Receipt':{'purchase_receipt_details':['qa_no']}},'fs_manufacturing':{'Item':{'fields':['Manufacturing']}},'fs_pos':{'Sales Invoice':{'fields':['is_pos']}},'fs_recurring_invoice':{'Sales Invoice':{'fields':['Recurring Invoice']}}} -$(document).bind('form_refresh',function(){for(sys_feat in sys_defaults) -{if(sys_defaults[sys_feat]=='0'&&(sys_feat in pscript.feature_dict)) -{if(cur_frm.doc.doctype in pscript.feature_dict[sys_feat]) -{for(fort in pscript.feature_dict[sys_feat][cur_frm.doc.doctype]) -{if(fort=='fields') -hide_field(pscript.feature_dict[sys_feat][cur_frm.doc.doctype][fort]);else if(cur_frm.fields_dict[fort]) -{for(grid_field in pscript.feature_dict[sys_feat][cur_frm.doc.doctype][fort]) -cur_frm.fields_dict[fort].grid.set_column_disp(pscript.feature_dict[sys_feat][cur_frm.doc.doctype][fort][grid_field],false);} -else -msgprint('Grid "'+fort+'" does not exists');}}}}}) \ No newline at end of file + ').hover(function(){$(this).find('.icon-home').addClass('navbar-icon-home-hover');},function(){$(this).find('.icon-home').removeClass('navbar-icon-home-hover');});}); \ No newline at end of file diff --git a/js/all-web.js b/js/all-web.js index b755396cbb..0181320068 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -585,14 +585,15 @@ $(wrapper).hide().fadeIn(1000);} wn.ui.AppFrame=Class.extend({init:function(parent){this.buttons={};this.$w=$('
    ').appendTo(parent);this.$titlebar=$('
    \ \ ×\ -
    ').appendTo(this.$w);this.$w.find('.close').click(function(){window.history.back();})},add_button:function(label,click,icon){if(!this.$w.find('.appframe-toolbar').length) + ').appendTo(this.$w);this.$w.find('.close').click(function(){window.history.back();})},title:function(txt){this.$titlebar.find('.appframe-title').text(txt);},add_button:function(label,click,icon){if(!this.$w.find('.appframe-toolbar').length) this.$w.append('
    ');args={label:label,icon:''};if(icon){args.icon='';} this.buttons[label]=$(repl('',args)).click(click).appendTo(this.$w.find('.appframe-toolbar'));return this.buttons[label];},clear_buttons:function(){this.$w.find('.appframe-toolbar').empty();}}) /* * lib/js/wn/ui/dialog.js */ -wn.widgets.FieldGroup=function(){this.first_button=false;this.make_fields=function(body,fl){$y(this.body,{padding:'11px'});this.fields_dict={};for(var i=0;ierpnext\ - ').hover(function(){$(this).find('.icon-home').addClass('navbar-icon-home-hover');},function(){$(this).find('.icon-home').removeClass('navbar-icon-home-hover');});}); -/* - * erpnext/startup/startup.js - */ -var current_module;var is_system_manager=0;wn.provide('erpnext.startup');erpnext.modules={'Selling':'selling-home','Accounts':'accounts-home','Stock':'stock-home','Buying':'buying-home','Support':'support-home','Projects':'projects-home','Production':'production-home','Website':'website-home','HR':'hr-home','Setup':'Setup','Activity':'activity','To Do':'todo','Calendar':'calendar','Messages':'messages','Knowledge Base':'questions','Dashboard':'dashboard'} -erpnext.startup.set_globals=function(){wn.control_panel.sync_with_gateway=wn.boot.sync_with_gateway -pscript.is_erpnext_saas=cint(wn.control_panel.sync_with_gateway) -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.user_background){erpnext.set_user_background(wn.boot.user_background);} -if(user=='Guest'){if(wn.boot.custom_css){set_style(wn.boot.custom_css);} -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']) -if(user_roles.indexOf('Accounts Manager')!=-1){wn.boot.profile.allow_modules.push('Dashboard');} -erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();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') -pscript.make_chart(chart_type);} -loadpage(nm,call_back);} -var update_messages=function(reset){if(inList(['Guest'],user)||!wn.session_alive){return;} -if(!reset){var set_messages=function(r){if(!r.exc){wn.container.wntoolbar.set_new_comments(r.message.unread_messages);var show_in_circle=function(parent_id,msg){var parent=$('#'+parent_id);if(parent){if(msg){parent.find('span:first').text(msg);parent.toggle(true);}else{parent.toggle(false);}}} -show_in_circle('unread_messages',r.message.unread_messages.length);show_in_circle('open_support_tickets',r.message.open_support_tickets);show_in_circle('things_todo',r.message.things_todo);show_in_circle('todays_events',r.message.todays_events);}else{clearInterval(wn.updates.id);}} -wn.call({method:'startup.startup.get_global_status_messages',callback:set_messages});}else{wn.container.wntoolbar.set_new_comments(0);$('#unread_messages').toggle(false);}} -erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);} -wn.updates.id=setInterval(update_messages,60000);} -erpnext.set_user_background=function(src){set_style(repl('body { background: url("files/%(src)s") repeat;}',{src:src}))} -$(document).bind('startup',function(){erpnext.startup.start();}); -/* - * erpnext/website/js/topbar.js - */ -wn.provide('erpnext.navbar');erpnext.navbar.Navbar=Class.extend({init:function(){this.make();$('.brand').html(wn.boot.website_settings.brand_html);this.make_items();$('.dropdown-toggle').dropdown();},make:function(){$('header').append('
    \ -
    \ -
    \ - [brand]\ -
      \ -
    \ - \ - \ -
    \ -
    \ -
    ');$('.brand').attr('href','#!'+(wn.boot.website_settings.home_page||'Login Page'))},make_items:function(){var items=wn.boot.website_menus;for(var i=0;i\ - %(label)s',item))}} -for(var i=0;i').click(function(){return false;});$parent_li.append('
      ');} -item.route=item.url||item.custom_page;$parent_li.find('.dropdown-menu').append(repl('
    • \ - %(label)s
      • ',item))}}}});erpnext.Footer=Class.extend({init:function(){$('footer').html(repl('
      \ -
        \ -
        %(address)s
        \ -
        © %(copyright)s
        \ -
        Powered by \ - erpnext.com
        \ -
        ',wn.boot.website_settings));this.make_items();},make_items:function(){var items=wn.boot.website_menus -for(var i=0;i%(label)s',item))}}}});$(document).bind('startup',function(){erpnext.footer=new erpnext.Footer();erpnext.navbar.navbar=new erpnext.navbar.Navbar();}) \ No newline at end of file + ').hover(function(){$(this).find('.icon-home').addClass('navbar-icon-home-hover');},function(){$(this).find('.icon-home').removeClass('navbar-icon-home-hover');});}); \ No newline at end of file