diff --git a/erpnext/selling/doctype/lead/lead.js b/erpnext/selling/doctype/lead/lead.js index d33478f559e..e97aea59f84 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 a18f079d88e..91d3fd59add 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 99c0a73dbbe..e030fc1b000 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/erpnext/website/doctype/style_settings/style_settings.txt b/erpnext/website/doctype/style_settings/style_settings.txt index 18a4d1a6085..b87a02c15f6 100644 --- a/erpnext/website/doctype/style_settings/style_settings.txt +++ b/erpnext/website/doctype/style_settings/style_settings.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-27 14:36:48', + 'creation': '2012-04-02 16:02:43', 'docstatus': 0, - 'modified': '2012-03-27 14:36:48', + 'modified': '2012-04-16 13:36:48', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -23,7 +23,7 @@ 'name': '__common__', 'section_style': u'Simple', 'show_in_menu': 0, - 'version': 18 + 'version': 19 }, # These values are common for all DocField @@ -95,7 +95,7 @@ 'fieldname': u'font', 'fieldtype': u'Select', 'label': u'Font', - 'options': u'\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma\nLato\nOpen Sans', + 'options': u'\nHelvetica Neue\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma\nLato\nOpen Sans', 'permlevel': 0 }, @@ -115,7 +115,7 @@ 'fieldname': u'heading_font', 'fieldtype': u'Select', 'label': u'Heading Font', - 'options': u'\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma\nLato\nOpen Sans', + 'options': u'\nHelvetica Neue\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma\nLato\nOpen Sans', 'permlevel': 0 }, @@ -153,4 +153,4 @@ 'permlevel': 0, 'print_hide': 1 } -] +] \ No newline at end of file diff --git a/js/all-app.js b/js/all-app.js index b4363d64514..b5942dd0903 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -1287,8 +1287,10 @@ function expand_doclist(docs){var l=[];for(var i=0;i