diff --git a/html/admin/setup.js b/html/admin/setup.js index 6595f6f0a..3e0d95cc6 100644 --- a/html/admin/setup.js +++ b/html/admin/setup.js @@ -25,6 +25,6 @@ function show_dbname(obj) { this.document.getElementById('div_db').style.visibility= 'hidden'; } } catch (e) { - alert(e.getMessage); + alert_box(e.getMessage); } } diff --git a/html/js/acc_ledger.js b/html/js/acc_ledger.js index df53133dc..e071c8c73 100644 --- a/html/js/acc_ledger.js +++ b/html/js/acc_ledger.js @@ -49,7 +49,7 @@ function update_predef(p_type, p_direct, p_ac) if (a.length == 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var code_html = getNodeText(html[0]); code_html = unescape_xml(code_html); @@ -113,7 +113,7 @@ function update_name() */ function error_get_predef(request, json) { - alert("Erreur mise à jour champs non possible"); + alert_box("Erreur mise à jour champs non possible"); } /** @@ -201,13 +201,13 @@ function update_row(ctl) } } } catch (e) { - alert(e.getMessage); + alert_box(e.getMessage); } } } ); } catch (e) { - alert(e.getMessage); + alert_box(e.getMessage); } } /** @@ -224,7 +224,7 @@ function success_update_bank(req) if (a.length == 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var name_ctl = a[0].firstChild.nodeValue; var code_html = getNodeText(html[0]); @@ -233,7 +233,7 @@ function success_update_bank(req) } catch (e) { - alert("success_update_bank" + e.message); + alert_box("success_update_bank" + e.message); } } /** @@ -267,7 +267,7 @@ function success_get_last_date(req) if (a.length == 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var name_ctl = a[0].firstChild.nodeValue; var code_html = getNodeText(html[0]); @@ -276,7 +276,7 @@ function success_get_last_date(req) } catch (e) { - alert(e.message); + alert_box(e.message); } } /** @@ -298,7 +298,7 @@ function success_get_pj(request, json) */ function error_get_pj(request, json) { - alert("Ajax a echoue"); + alert_box("Ajax a echoue"); } /** @@ -383,7 +383,7 @@ function ledger_add_row() new_tt.evalScripts(); } catch (e) { - alert(e.message); + alert_box(e.message); } } /** @@ -518,7 +518,7 @@ function success_compute_ledger(request, json) */ function error_compute_ledger(request, json) { - alert('Ajax does not work'); + alert_box('Ajax does not work'); } function compute_all_ledger() { @@ -691,7 +691,7 @@ function update_history_account(obj) }); } catch (e) { - alert("update_history_account error " + e.message); + alert_box("update_history_account error " + e.message); } return false; @@ -744,7 +744,7 @@ function update_history_card(obj) }); } catch (e) { - alert("update_history_account error " + e.message); + alert_box("update_history_account error " + e.message); } return false; @@ -894,7 +894,7 @@ function dsp_letter(obj) } catch (e) { - alert('dsp_letter failed ' + e.message); + alert_box('dsp_letter failed ' + e.message); } } @@ -908,7 +908,7 @@ function success_dsp_letter(req) if (a.length == 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var name_ctl = a[0].firstChild.nodeValue; var code_html = getNodeText(html[0]); @@ -917,7 +917,7 @@ function success_dsp_letter(req) } catch (e) { - alert(e.message); + alert_box(e.message); } try { @@ -925,13 +925,13 @@ function success_dsp_letter(req) } catch (e) { - alert("Impossible executer script de la reponse\n" + e.message); + alert_box("Impossible executer script de la reponse\n" + e.message); } } function error_dsp_letter(req) { - alert('Erreur AJAX DSP_LETTER'); + alert_box('Erreur AJAX DSP_LETTER'); } function search_letter(obj) @@ -975,7 +975,7 @@ function search_letter(obj) } catch (e) { - alert('search_letter ' + e.message); + alert_box('search_letter ' + e.message); } } /** @@ -1021,7 +1021,7 @@ function op_save(obj) return false; } catch (e) { - alert(e.message); + alert_box(e.message); } } function get_history_account(ctl, dossier) { @@ -1059,7 +1059,7 @@ function show_reconcile(p_div, p_let) } catch (e) { - alert(e.message); + alert_box(e.message); } @@ -1108,7 +1108,7 @@ function gestion_add_row() new_tt.evalScripts(); } catch (e) { - alert(e.message); + alert_box(e.message); } } \ No newline at end of file diff --git a/html/js/accounting_item.js b/html/js/accounting_item.js index d27eac95c..acbe0ef7f 100644 --- a/html/js/accounting_item.js +++ b/html/js/accounting_item.js @@ -66,7 +66,7 @@ function pcmn_update(p_dossier, p_val) if (a.length == 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var name_ctl = getNodeText(a[0]); @@ -86,7 +86,7 @@ function pcmn_update(p_dossier, p_val) } catch (e) { - alert("Impossible executer script de la reponse\n" + e.message); + alert_box("Impossible executer script de la reponse\n" + e.message); } } @@ -185,7 +185,7 @@ function search_poste(obj) } catch (e) { - alert(e.getMessage); + alert_box(e.getMessage); } } /** @@ -258,7 +258,7 @@ function result_poste_search(req) if ( a.length == 0 ) { var rec=req.responseText; - alert ('erreur :'+rec); + alert_box ('erreur :'+rec); } var html=answer.getElementsByTagName('code'); @@ -270,7 +270,7 @@ function result_poste_search(req) } catch (e) { - alert(e.message); + alert_box(e.message); } try { @@ -278,7 +278,7 @@ function result_poste_search(req) } catch(e) { - alert("Impossible executer script de la reponse\n"+e.message); + alert_box("Impossible executer script de la reponse\n"+e.message); } } @@ -287,7 +287,7 @@ function result_poste_search(req) */ function errorPoste() { - alert('Ajax failed'); + alert_box('Ajax failed'); } function pausecomp(millis) { @@ -350,7 +350,7 @@ function pcmn_save() var ctl = answer.getElementsByTagName('ctl')[0].textContent; if (html.length == 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var code_html = getNodeText(html[0]); // Firefox ne prend que les 4096 car. code_html = unescape_xml(code_html); diff --git a/html/js/admin.js b/html/js/admin.js index f4b766756..d700aae5e 100644 --- a/html/js/admin.js +++ b/html/js/admin.js @@ -55,7 +55,7 @@ function folder_display(p_user) var html = answer.getElementsByTagName('content'); if (a.length == 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var content = getNodeText(html[0]); @@ -110,7 +110,7 @@ function folder_add(p_user, p_dossier) var html = answer.getElementsByTagName('content'); if (a.length == 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var content = getNodeText(html[0]); @@ -143,7 +143,7 @@ function display_admin_answer(p_dossier,p_action) var html = answer.getElementsByTagName('content'); if (a.length == 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var folder; diff --git a/html/js/ajax_fiche.js b/html/js/ajax_fiche.js index 4375951a3..88503ed4b 100644 --- a/html/js/ajax_fiche.js +++ b/html/js/ajax_fiche.js @@ -53,7 +53,7 @@ function clean_Fid(p_ctl) } function errorFid(request,json) { - alert('erreur : ajax fiche'); + alert_box('erreur : ajax fiche'); } /*!\brief this function fills the data from fid.php, * \param p_ctl object : field of the input, @@ -128,8 +128,8 @@ function ajaxFid(p_ctl) ); }catch (e) { - alert(e.message); - alert(p_ctl); + alert_box(e.message); + alert_box(p_ctl); } } @@ -183,7 +183,7 @@ function successFid(request,json) } function ajax_error_saldo(request,json) { - alert('erreur : ajax solde '); + alert_box('erreur : ajax solde '); } /*!\brief this function get the saldo * \param p_ctl the ctrl where we take the quick_code @@ -196,7 +196,7 @@ function ajax_saldo(p_ctl) queryString="FID="+ctl_value+"&op=saldo"; queryString=queryString+'&gDossier='+gDossier+'&j='+jrn; queryString=queryString+'&ctl='+ctl_value; - /* alert(queryString); */ + /* alert_box(queryString); */ var action=new Ajax.Request ( "ajax_misc.php", { @@ -245,7 +245,7 @@ function ajax_get_success(request,json) */ function ajax_get_failure(request,json) { - alert("Ajax do not work for ajax_get"); + alert_box("Ajax do not work for ajax_get"); } diff --git a/html/js/anc_script.js b/html/js/anc_script.js index 84e90c947..0b1ed5e3c 100644 --- a/html/js/anc_script.js +++ b/html/js/anc_script.js @@ -41,13 +41,13 @@ function add_row(p_table, p_seq) if (mytable.rows.length > 15) { - alert("Maximum 15 lignes "); + alert_box("Maximum 15 lignes "); return; } var amount = compute_total_table(p_table, p_seq); if (max < amount) { - alert('Montant incorrect : max = ' + max + " calculé=" + amount); + alert_box('Montant incorrect : max = ' + max + " calculé=" + amount); return; } // For the detail view (modify_op) there is several form and then several time the @@ -89,7 +89,7 @@ function compute_total_table(p_table, seq) } catch (e) { - alert(e.message); + alert_box(e.message); } } /** @@ -119,7 +119,7 @@ function anc_refresh_remain(p_table, p_seq) } } catch (a) { - alert(a.message); + alert_box(a.message); } } /*! @@ -175,14 +175,14 @@ function verify_ca(div) } if (amount_error != 0) { - alert('Désolé, les montants pour la comptabilité analytique sont incorrects'); + alert_box('Désolé, les montants pour la comptabilité analytique sont incorrects'); return false; } return true; } catch (e) { - alert(e.message); + alert_box(e.message); return false; } } @@ -221,7 +221,7 @@ function search_ca(p_dossier, p_target, p_source) $('searchanc').innerHTML = req.responseText; } catch (e) { - alert(e.message); + alert_box(e.message); } } } @@ -246,7 +246,7 @@ function search_anc_form(obj) req.responseText.evalScripts(); } catch (e) { - alert(e.message); + alert_box(e.message); } } } @@ -403,7 +403,7 @@ function anc_key_compute(p_dossier, p_table, p_amount, p_key_id) var html = answer.getElementsByTagName('code'); if (html.length == 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var code_html = getNodeText(html[0]); // Firefox ne prend que les 4096 car. @@ -453,7 +453,7 @@ function anc_key_choice(p_dossier, p_table, p_amount,p_ledger) var html = answer.getElementsByTagName('code'); if (html.length == 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var code_html = getNodeText(html[0]); // Firefox ne prend que les 4096 car. @@ -489,7 +489,7 @@ function add_row_key(p_table) var table_length=mytable.rows.length ; if ( table_length > 15) { - alert("Maximum 15 lignes "); + alert_box("Maximum 15 lignes "); return; } var rowToCopy = mytable.rows[1]; diff --git a/html/js/calc.js b/html/js/calc.js index ed8be5788..37477c5cb 100644 --- a/html/js/calc.js +++ b/html/js/calc.js @@ -49,7 +49,7 @@ function cal() } catch(exception) { - alert("Mauvaise formule\n"+p_variable); + alert_box("Mauvaise formule\n"+p_variable); return false; } p_history=p_history+'
'+p_variable; diff --git a/html/js/card.js b/html/js/card.js index db483feb8..14b59a548 100644 --- a/html/js/card.js +++ b/html/js/card.js @@ -51,7 +51,7 @@ function boxsearch_card(p_dossier) ); }catch( e) { - alert(e.getMessage); + alert_box(e.getMessage); } } /** @@ -110,7 +110,7 @@ function search_card(obj) } catch(e) { - alert('search_card failed'+e.message); + alert_box('search_card failed'+e.message); } } /** @@ -177,7 +177,7 @@ function action_add_concerned_card(obj) if (a.length == 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var html = answer.getElementsByTagName('code'); var namectl = a[0].firstChild.nodeValue; @@ -199,7 +199,7 @@ function action_add_concerned_card(obj) $('search_card').innerHTML = code_html; $('query').focus(); }catch (e) { - alert(e.message); + alert_box(e.message); } } } @@ -207,7 +207,7 @@ function action_add_concerned_card(obj) } catch (e) { - alert('search_card failed' + e.message); + alert_box('search_card failed' + e.message); return false; } return false; @@ -283,7 +283,7 @@ function result_card_search(req) if ( a.length == 0 ) { var rec=req.responseText; - alert ('erreur :'+rec); + alert_box ('erreur :'+rec); } var html=answer.getElementsByTagName('code'); @@ -309,7 +309,7 @@ function result_card_search(req) } catch (e) { - alert(e.message); + alert_box(e.message); } try { @@ -317,7 +317,7 @@ function result_card_search(req) } catch(e) { - alert("Impossible executer script de la reponse\n"+e.message); + alert_box("Impossible executer script de la reponse\n"+e.message); } } @@ -374,7 +374,7 @@ function clean_Fid(p_ctl) } function errorFid(request,json) { - alert('erreur : ajax fiche'); + alert_box('erreur : ajax fiche'); } function update_value(text,li) { @@ -496,7 +496,7 @@ function successFill_ipopcard(req,json) if ( a.length == 0 ) { var rec=req.responseText; - alert ('erreur :'+rec); + alert_box ('erreur :'+rec); } var name_ctl=a[0].firstChild.nodeValue; var code_html=getNodeText(html[0]); @@ -506,7 +506,7 @@ function successFill_ipopcard(req,json) } catch (e) { - alert(e.message); + alert_box(e.message); } try { @@ -514,7 +514,7 @@ function successFill_ipopcard(req,json) } catch(e) { - alert("Impossible executer script de la reponse\n"+e.message); + alert_box("Impossible executer script de la reponse\n"+e.message); } } /** @@ -758,7 +758,7 @@ function save_card_category(obj) { if ( ! $(obj).ipopup) { - alert('Erreur pas d\' attribut ipopup '+obj.id); + alert_box('Erreur pas d\' attribut ipopup '+obj.id); return; }; try { @@ -780,7 +780,7 @@ function save_card_category(obj) ); } catch(e) { - alert(e.message); + alert_box(e.message); return false; } return false; @@ -828,7 +828,7 @@ try { } ); } catch (e) { - alert(e.message); + alert_box(e.message); return false; } } @@ -856,7 +856,7 @@ function action_save_concerned(p_dossier, p_fiche_id, p_action_id) { if (a.length == 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var html = answer.getElementsByTagName('code'); var namectl = a[0].firstChild.nodeValue; @@ -889,7 +889,7 @@ function action_remove_concerned(p_dossier,p_fiche_id,p_action_id) if (a.length == 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var html = answer.getElementsByTagName('code'); var namectl = a[0].firstChild.nodeValue; diff --git a/html/js/compute.js b/html/js/compute.js index c35bfa549..430d252cb 100644 --- a/html/js/compute.js +++ b/html/js/compute.js @@ -58,7 +58,7 @@ function checkTotal() { if ( side[e].checked == true) { - // alert('checked !!! '+side[e].value); + // alert_box('checked !!! '+side[e].value); deb=side[e].value; } } @@ -71,7 +71,7 @@ function checkTotal() total_deb+=amount; } - // alert("amount ="+i+"="+amount+" cred/deb = "+deb+"total d/b"+total_deb+"/"+total_cred); + // alert_box("amount ="+i+"="+amount+" cred/deb = "+deb+"total d/b"+total_deb+"/"+total_cred); } diff --git a/html/js/compute_direct.js b/html/js/compute_direct.js index a3ccc2b0b..04a534d85 100644 --- a/html/js/compute_direct.js +++ b/html/js/compute_direct.js @@ -59,7 +59,7 @@ function checkTotalDirect() { if ( side[e].checked == true) { - // alert('checked !!! '+side[e].value); + // alert_box('checked !!! '+side[e].value); total_deb+=amount; } else @@ -68,7 +68,7 @@ function checkTotalDirect() } } - // alert("amount ="+i+"="+amount+" cred/deb = "+deb+"total d/b"+total_deb+"/"+total_cred); + // alert_box("amount ="+i+"="+amount+" cred/deb = "+deb+"total d/b"+total_deb+"/"+total_cred); } diff --git a/html/js/confirm.js b/html/js/confirm.js deleted file mode 100644 index 5bcc6f765..000000000 --- a/html/js/confirm.js +++ /dev/null @@ -1,33 +0,0 @@ -/* - * This file is part of NOALYSS. - * - * NOALYSS 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 2 of the License, or - * (at your option) any later version. - * - * NOALYSS 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. - * - * You should have received a copy of the GNU General Public License - * along with NOALYSS; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ -/* $Revision$ */ - -// Copyright Author Dany De Bontridder danydb@aevalys.eu - -/*!\file - * \brief Manage the confirmation process for deleting a template - * - */ - -// \brief Confirm the removal of a template -function confirm_remove(p_obj_id,p_type) -{ - var - a=open('confirm_remove.php?ob_id='+p_obj_id+'&p_type='+p_type,'Confirmez effacement','toolbar=no,width=500,height=400,scrollbars=yes,resizable=yes'); - -} diff --git a/html/js/gestion.js b/html/js/gestion.js index 4cc9760b1..231a2e895 100644 --- a/html/js/gestion.js +++ b/html/js/gestion.js @@ -96,16 +96,16 @@ function successRemoveOp(request,json) { try{ var answer=request.responseText.evalJSON(true); - if ( answer.ago_id == -1 ) { alert ('Effacement non autorisé');return;} + if ( answer.ago_id == -1 ) { alert_box ('Effacement non autorisé');return;} var action="acop"+answer.ago_id; $(action).innerHTML=""; var doc="op"+answer.ago_id; $(doc).style.color="red"; - $(doc).href="javascript:alert('Commentaire Effacé')"; + $(doc).href="javascript:alert_box('Commentaire Effacé')"; $(doc).style.textDecoration="line-through"; }catch(e){ - alert(e.message); + alert_box(e.message); } } /** @@ -125,14 +125,14 @@ function remove_action(p_dossier,p_id,ag_id) onSuccess:function(request,json) { try{ var answer=request.responseText.evalJSON(true); - if ( answer.act_id == -1 ) { alert ('Effacement non autorisé');return;} + if ( answer.act_id == -1 ) { alert_box ('Effacement non autorisé');return;} var action="acact"+answer.act_id; $(action).innerHTML=""; var doc="act"+answer.act_id; $(doc).style.color="red"; - $(doc).href="javascript:alert('Action Effacée')"; + $(doc).href="javascript:alert_box('Action Effacée')"; $(doc).style.textDecoration="line-through"; - } catch (e){ alert(e.message);} + } catch (e){ alert_box(e.message);} } } @@ -162,12 +162,12 @@ function remove_comment(p_dossier,p_id) function successRemoveComment(request,json) { var answer=request.responseText.evalJSON(true); - if ( answer.agc_id == -1 ) { alert ('Effacement non autorisé');return;} + if ( answer.agc_id == -1 ) { alert_box ('Effacement non autorisé');return;} var action="accom"+answer.agc_id; $(action).innerHTML=""; var doc="com"+answer.agc_id; $(doc).style.color="red"; - $(doc).href="javascript:alert('Commentaire Effacé')"; + $(doc).href="javascript:alert_box('Commentaire Effacé')"; $(doc).style.textDecoration="line-through"; } @@ -176,7 +176,7 @@ function successRemoveComment(request,json) */ function errorRemoveDoc() { - alert('Impossible d\'effacer ce document'); + alert_box('Impossible d\'effacer ce document'); } /** *@brief success when removing a document @@ -184,12 +184,12 @@ function errorRemoveDoc() function successRemoveDoc(request,json) { var answer=request.responseText.evalJSON(true); - if ( answer.d_id == -1 ) { alert ('Effacement non autorisé');return;} + if ( answer.d_id == -1 ) { alert_box ('Effacement non autorisé');return;} var action="ac"+answer.d_id; $(action).innerHTML=""; var doc="doc"+answer.d_id; $(doc).style.color="red"; - $(doc).href="javascript:alert('Document Effacé')"; + $(doc).href="javascript:alert_box('Document Effacé')"; $(doc).style.textDecoration="line-through"; $('desc'+answer.d_id).innerHTML=""; @@ -205,11 +205,11 @@ function check_hour(p_ctl) var h=document.getElementById(p_ctl); var re = /^\d{1,2}:\d{2}$/; if ( trim(h.value) !='' && ! h.value.match(re)) - alert("Format de l'heure est HH:MM ") + alert_box("Format de l'heure est HH:MM ") } catch (erreur) { - alert('fct : check_hour '+erreur); + alert_box('fct : check_hour '+erreur); } } @@ -243,7 +243,7 @@ function removeStock(s_id,p_dossier) */ function errorRemoveStock() { - alert('Impossible d\'effacer '); + alert_box('Impossible d\'effacer '); } /** *@brief success when removing a document @@ -258,11 +258,11 @@ function successRemoveStock(request,json) $(href).innerHTML=''; $(doc).style.color="red"; - // $(doc).href="javascript:alert('Stock Effacé')"; + // $(doc).href="javascript:alert_box('Stock Effacé')"; $(doc).style.textDecoration="line-through"; } catch (e) { - alert("success_box"+e.message); + alert_box("success_box"+e.message); } } /** @@ -286,7 +286,7 @@ function action_show(p_dossier) }); } catch (e) { - alert('action_show '+e.message); + alert_box('action_show '+e.message); } } /** @@ -297,7 +297,7 @@ function action_show(p_dossier) function action_add(p_dossier) { try { if ( $('action_add_div')) { - alert('Désolé, événement en cours de création à sauver'); + alert_box('Désolé, événement en cours de création à sauver'); return; } waiting_box(); @@ -316,7 +316,7 @@ function action_add(p_dossier) { }); } catch (e) { - alert('action_add '+e.message); + alert_box('action_add '+e.message); } } /** @@ -379,7 +379,7 @@ function action_save_short() }); } catch (e) { - alert('action_add ' + e.message); + alert_box('action_add ' + e.message); } return false; } \ No newline at end of file diff --git a/html/js/modele_document.js b/html/js/modele_document.js index 0df0a5c64..31b9b2855 100644 --- a/html/js/modele_document.js +++ b/html/js/modele_document.js @@ -65,7 +65,7 @@ function modify_document_success_box(req,json) if ( a.length == 0 ) { var rec=req.responseText; - alert ('erreur :'+rec); + alert_box ('erreur :'+rec); } var name_ctl=a[0].firstChild.nodeValue; var code_html=getNodeText(html[0]); @@ -76,7 +76,7 @@ function modify_document_success_box(req,json) } catch (e) { - alert("success_box"+e.message); + alert_box("success_box"+e.message); } try { @@ -84,6 +84,6 @@ function modify_document_success_box(req,json) } catch(e) { - alert("answer_box Impossible executer script de la reponse\n"+e.message); + alert_box("answer_box Impossible executer script de la reponse\n"+e.message); } } diff --git a/html/js/scripts.js b/html/js/scripts.js index b5faf7a99..d2e9c8bbf 100644 --- a/html/js/scripts.js +++ b/html/js/scripts.js @@ -41,7 +41,7 @@ function infodiv(req, json) if (a.length === 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var name_ctl = a[0].firstChild.nodeValue; var code_html = getNodeText(html[0]); @@ -51,7 +51,7 @@ function infodiv(req, json) } catch (e) { - alert("success_box" + e.message); + alert_box("success_box" + e.message); } try { @@ -59,7 +59,7 @@ function infodiv(req, json) } catch (e) { - alert("answer_box Impossible executer script de la reponse\n" + e.message); + alert_box("answer_box Impossible executer script de la reponse\n" + e.message); } } @@ -154,7 +154,7 @@ function encodeJSON(obj) { if (typeof obj != 'object') { - alert('encodeParameter obj n\'est pas un objet'); + alert_box('encodeParameter obj n\'est pas un objet'); } try { @@ -177,7 +177,7 @@ function encodeJSON(obj) } catch (e) { - alert('encodeParameter ' + e.message); + alert_box('encodeParameter ' + e.message); return ""; } } @@ -372,7 +372,7 @@ function success_misc(req) if (html.length === 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var nodeXml = html[0]; var code_html = getNodeText(nodeXml); @@ -381,7 +381,7 @@ function success_misc(req) } catch (e) { - alert(e.message); + alert_box(e.message); } try { @@ -389,7 +389,7 @@ function success_misc(req) } catch (e) { - alert("Impossible executer script de la reponse\n" + e.message); + alert_box("Impossible executer script de la reponse\n" + e.message); } @@ -403,7 +403,7 @@ function loading() function ajax_misc_failure() { - alert('Ajax Misc failed'); + alert_box('Ajax Misc failed'); } /** *@brief remove a document_modele @@ -451,13 +451,13 @@ function success_cat_doc_remove(req) if (html.length === 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } nodeXML = html[0]; row_id = getNodeText(nodeXML); if (row_id === 'nok') { - alert('Error'); + alert_box('Error'); return; } $('row' + row_id).style.textDecoration = "line-through"; @@ -465,7 +465,7 @@ function success_cat_doc_remove(req) } catch (e) { - alert(e.message); + alert_box(e.message); } } /** @@ -500,7 +500,7 @@ function popup_select_tva(obj) if (popup.length === 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var html = answer.getElementsByTagName('code'); @@ -519,7 +519,7 @@ function popup_select_tva(obj) } catch (e) { - alert("success_popup_select_tva " + e.message); + alert_box("success_popup_select_tva " + e.message); } } } @@ -527,7 +527,7 @@ function popup_select_tva(obj) } catch (e) { - alert("popup_select_tva " + e.message); + alert_box("popup_select_tva " + e.message); } } /** @@ -562,7 +562,7 @@ function set_tva_label(obj) } catch (e) { - alert("set_tva_label " + e.message); + alert_box("set_tva_label " + e.message); } } /** @@ -579,7 +579,7 @@ function success_set_tva_label(req) if (code.length === 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var label_code = code[0].firstChild.nodeValue; @@ -588,7 +588,7 @@ function success_set_tva_label(req) } catch (e) { - alert("success_set_tva_label " + e.message); + alert_box("success_set_tva_label " + e.message); } } @@ -693,7 +693,7 @@ function add_div(obj) } catch (e) { - alert("add_div " + e.message); + alert_box("add_div " + e.message); } } /** @@ -798,7 +798,7 @@ function success_box(req, json) if (a.length === 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var name_ctl = a[0].firstChild.nodeValue; var code_html = getNodeText(html[0]); @@ -812,7 +812,7 @@ function success_box(req, json) } catch (e) { - alert("success_box" + e.message); + alert_box("success_box" + e.message); } try { @@ -820,13 +820,13 @@ function success_box(req, json) } catch (e) { - alert("answer_box Impossible executer script de la reponse\n" + e.message); + alert_box("answer_box Impossible executer script de la reponse\n" + e.message); } } function error_box() { - alert('[error_box] ajax not implemented'); + alert_box('[error_box] ajax not implemented'); } /** * show the ledger choice @@ -873,7 +873,7 @@ function show_ledger_choice(json_obj) var html = answer.getElementsByTagName('code'); if (a.length === 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var name_ctl = a[0].firstChild.nodeValue; var code_html = getNodeText(html[0]); @@ -884,13 +884,13 @@ function show_ledger_choice(json_obj) } catch (e) { - alert("show_ledger_callback" + e.message); + alert_box("show_ledger_callback" + e.message); } try { code_html.evalScripts(); } catch (e) { - alert("answer_box Impossible executer script de la reponse\n" + e.message); + alert_box("answer_box Impossible executer script de la reponse\n" + e.message); } } @@ -898,7 +898,7 @@ function show_ledger_choice(json_obj) } ); } catch (e) { - alert('show_ledger_choice' + e.message); + alert_box('show_ledger_choice' + e.message); } } /** @@ -928,7 +928,7 @@ function hide_ledger_choice(p_frm_search) removeDiv(div + 'jrn_search'); return false; } catch (e) { - alert('hide_ledger_choice' + e.message); + alert_box('hide_ledger_choice' + e.message); return false; } @@ -1082,7 +1082,7 @@ function display_periode(p_dossier, p_id) } catch (e) { - alert("display_periode " + e.message); + alert_box("display_periode " + e.message); } } @@ -1097,7 +1097,7 @@ function success_display_periode(req) if (html.length === 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var code_html = getNodeText(html[0]); @@ -1107,7 +1107,7 @@ function success_display_periode(req) } catch (e) { - alert("success_display_periode".e.message); + alert_box("success_display_periode".e.message); } try { @@ -1115,7 +1115,7 @@ function success_display_periode(req) } catch (e) { - alert("success_display_periode Impossible executer script de la reponse\n" + e.message); + alert_box("success_display_periode Impossible executer script de la reponse\n" + e.message); } } @@ -1137,7 +1137,7 @@ function save_periode(obj) } catch (e) { - alert("display_periode " + e.message); + alert_box("display_periode " + e.message); } return false; @@ -1161,7 +1161,7 @@ function fill_box(req) var html = answer.getElementsByTagName('code'); if (a.length === 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var name_ctl = a[0].firstChild.nodeValue; var code_html = getNodeText(html[0]); // Firefox ne prend que les 4096 car. @@ -1169,13 +1169,13 @@ function fill_box(req) $(name_ctl).innerHTML = code_html; } catch (e) { - alert(e.message); + alert_box(e.message); } try { code_html.evalScripts(); } catch (e) { - alert("Impossible executer script de la reponse\n" + e.message); + alert_box("Impossible executer script de la reponse\n" + e.message); } @@ -1314,7 +1314,7 @@ function search_operation(obj) } catch (e) { remove_waiting_box(); - alert(e.message); + alert_box(e.message); } } /** @@ -1357,7 +1357,7 @@ function set_reconcile(obj) } catch (e) { - alert(e.message) + alert_box(e.message) } } function remove_waiting_node() @@ -1458,7 +1458,7 @@ function mod_menu(gdossier, pm_id) add_div({id: "divdm" + pm_id, drag: 1, cssclass: "inner_box", style: pos}); $('divdm' + pm_id).innerHTML = req.responseText; } catch (e) { - alert(e.message); + alert_box(e.message); } } } @@ -1494,7 +1494,7 @@ function display_sub_menu(p_dossier,p_profile,p_dep,p_level) new_row.innerHTML = req.responseText; $('menu_table').appendChild(new_row); } catch (e) { - alert(e.message); + alert_box(e.message); } } }) @@ -1523,7 +1523,7 @@ function remove_sub_menu(p_dossier,profile_menu_id) $('sub'+profile_menu_id).remove(); } catch(e) { - alert(e.message); + alert_box(e.message); } } } @@ -1566,7 +1566,7 @@ function add_menu(obj) add_div({id: "divdm" + p_id, drag: 1, "cssclass": "inner_box", "style": pos}); $('divdm' + p_id).innerHTML = req.responseText; } catch (e) { - alert(e.message); + alert_box(e.message); } } } @@ -1596,7 +1596,7 @@ function add_plugin(p_dossier) add_div({id: "divplugin", drag: 1, cssclass: "inner_box", style: pos}); $('divplugin').innerHTML = req.responseText; } catch (e) { - alert(e.message); + alert_box(e.message); } } } @@ -1627,7 +1627,7 @@ function mod_plugin(p_dossier, me_code) $('divplugin').innerHTML = req.responseText; } catch (e) { - alert(e.message); + alert_box(e.message); } } } @@ -1656,7 +1656,7 @@ function create_menu(p_dossier) }); $('divmenu').innerHTML = req.responseText; } catch (e) { - alert(e.message); + alert_box(e.message); } } } @@ -1686,7 +1686,7 @@ function modify_menu(p_dossier, me_code) $('divmenu').innerHTML = req.responseText; } catch (e) { - alert(e.message); + alert_box(e.message); } } } @@ -1700,7 +1700,7 @@ function get_properties(obj) { a_array.push(m); } - alert(s_type + a_array.join(",")); + alert_box(s_type + a_array.join(",")); } /** * @brief add a line in the form for the report @@ -1765,13 +1765,13 @@ function search_action(dossier, ctl_concern) $('search_action_div').innerHTML = req.responseText; req.responseText.evalScripts(); } catch (e) { - alert(e.message); + alert_box(e.message); } } } ); } catch (e) { - alert(e.message); + alert_box(e.message); } } @@ -1791,7 +1791,7 @@ function result_search_action(obj) $('search_action_div').innerHTML = req.responseText; req.responseText.evalScripts(); } catch (e) { - alert(e.message); + alert_box(e.message); } } } @@ -1800,7 +1800,7 @@ function result_search_action(obj) } catch (e) { - alert("display_periode " + e.message); + alert_box("display_periode " + e.message); } return false; @@ -1836,7 +1836,7 @@ function set_action_related(p_obj) } catch (e) { - alert(e.message); + alert_box(e.message); return false; } } @@ -1915,7 +1915,7 @@ function show_fin_chdate(obj_id) } } } catch (e) { - alert(e.message); + alert_box(e.message); } } /** @@ -1931,7 +1931,7 @@ function profile_show(p_div) $(p_div).show(); } catch (e) { - alert(e.message) + alert_box(e.message) } } function detail_category_show(p_div, p_dossier, p_id) @@ -2017,7 +2017,7 @@ function view_action(ag_id, dossier, modify) if (html.length === 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var code_html = getNodeText(html[0]); code_html = unescape_xml(code_html); @@ -2031,7 +2031,7 @@ function view_action(ag_id, dossier, modify) $(id).innerHTML = code_html; compute_all_ledger(); } catch (e) { - alert('view_action' + e.message); + alert_box('view_action' + e.message); } } } @@ -2154,7 +2154,7 @@ function ask_navigator(p_dossier) { } catch (e) { - alert("answer_box Impossible executer script de la reponse\n" + e.message); + alert_box("answer_box Impossible executer script de la reponse\n" + e.message); } } @@ -2189,7 +2189,7 @@ function set_preference(p_dossier) { } catch (e) { - alert("answer_box Impossible executer script de la reponse\n" + e.message); + alert_box("answer_box Impossible executer script de la reponse\n" + e.message); } } @@ -2226,7 +2226,7 @@ function show_bookmark(p_dossier) { } catch (e) { - alert("answer_box Impossible executer script de la reponse\n" + e.message); + alert_box("answer_box Impossible executer script de la reponse\n" + e.message); } } @@ -2260,7 +2260,7 @@ function save_bookmark() { } catch (e) { - alert("answer_box Impossible executer script de la reponse\n" + e.message); + alert_box("answer_box Impossible executer script de la reponse\n" + e.message); } } @@ -2292,7 +2292,7 @@ function remove_bookmark() { } catch (e) { - alert("answer_box Impossible executer script de la reponse\n" + e.message); + alert_box("answer_box Impossible executer script de la reponse\n" + e.message); } } @@ -2332,7 +2332,7 @@ function show_tag(p_dossier, p_ac, p_tag_id, p_post) if (html.length === 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var code_html = getNodeText(html[0]); code_html = unescape_xml(code_html); @@ -2345,7 +2345,7 @@ function show_tag(p_dossier, p_ac, p_tag_id, p_post) } catch (e) { - alert("answer_box Impossible executer script de la reponse\n" + e.message); + alert_box("answer_box Impossible executer script de la reponse\n" + e.message); } } @@ -2721,7 +2721,7 @@ function stock_add_row() new_tt.evalScripts(); } catch (e) { - alert(e.message); + alert_box(e.message); } } @@ -2768,7 +2768,7 @@ function show_tabs(a_tabs, p_display_tab) } $(p_display_tab).show(); } catch (e) { - alert(e.message); + alert_box(e.message); } } @@ -2844,6 +2844,54 @@ function init_scroll() } } } +/** + * Confirm a form thanks a modal dialog Box, it returns true if we agree otherwise + * false + * @code +
+
+ * @endcode + * @param p_obj form element id + * @param p_message message to display + * @returns true or false + */ +function confirm_form(p_obj, p_message) +{ + try { + var name=""; + if ( typeof (p_obj) == "object") { + name=p_obj.id; + } else { + name=p_obj; + } + var background_block = document.createElement('DIV'); + background_block.id = 'background_block'; + background_block.addClassName('popup_back'); + document.body.appendChild(background_block); + + var newdiv = document.createElement('DIV'); + newdiv.id = 'confirm_12'; + newdiv.addClassName("inner_box"); + newdiv.setStyle('z-index:101;width:50%;left:25%;'); + //newdiv.innerHTML="

"; + newdiv.innerHTML += '

'; + newdiv.innerHTML += p_message; + newdiv.innerHTML += '

'; + newdiv.innerHTML += '

'; + newdiv.innerHTML += ''; + newdiv.innerHTML += ''; + newdiv.innerHTML += '

'; + document.body.appendChild(newdiv); + + } catch (e) { + console.debug(e); + } + return false; +} +function alert_box(p_message) +{ + smoke.alert(p_message,false , {ok:'ok',classname:"inner_box"}); +} /** * All the onload must be here otherwise the other will overwritten * @returns {undefined} @@ -2853,4 +2901,4 @@ window.onload=function () create_anchor_up(); init_scroll(); sorttable.init -} \ No newline at end of file +} diff --git a/html/js/todo_list.js b/html/js/todo_list.js index 80e11e61f..f2a94c94c 100644 --- a/html/js/todo_list.js +++ b/html/js/todo_list.js @@ -65,7 +65,7 @@ function todo_list_show(p_id) if (tl_id.length == 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var content = unescape_xml(getNodeText(tl_content[0])); todo_div.innerHTML=content; @@ -76,7 +76,7 @@ function todo_list_show(p_id) } catch (e) { - alert(e.message); + alert_box(e.message); } } } @@ -84,13 +84,13 @@ function todo_list_show(p_id) } catch (e) { - alert(" Envoi ajax non possible" + e.message); + alert_box(" Envoi ajax non possible" + e.message); } return false; } function todo_list_show_error(request_json) { - alert('failure'); + alert_box('failure'); } function add_todo() { @@ -140,7 +140,7 @@ function todo_list_save(p_form) if (tl_id.length == 0) { var rec = req.responseText; - alert('erreur :' + rec); + alert_box('erreur :' + rec); } var tr = $('tr'+p_form); if ( p_form == 0) @@ -232,7 +232,7 @@ function todo_list_share(p_note, p_dossier) $(shared_note).show(); } catch (e) { - alert(e.message); + alert_box(e.message); } } } @@ -268,7 +268,7 @@ function todo_list_remove_share(note_id,p_login,p_dossier) var answer=p_xml.responseXML; var status=answer.getElementsByTagName('status'); if ( status.length == 0) { - alert ('erreur reponse '); + alert_box ('erreur reponse '); } var status_code=getNodeText(status[0]); if ( status_code == 'ok') { diff --git a/html/style-classic.css b/html/style-classic.css index 949d61cc5..11d0716d2 100644 --- a/html/style-classic.css +++ b/html/style-classic.css @@ -677,11 +677,12 @@ div.popup_back{ position:absolute; top:0px; left:0px; - opacity:0.6; + opacity:0.30; width:100%; height:100%; z-index:1; - display:none; + display:block; + background: #3f4c6b; } div.popup_border_title { diff --git a/html/style-light.css b/html/style-light.css index 6c79df312..8e9efac31 100644 --- a/html/style-light.css +++ b/html/style-light.css @@ -703,11 +703,12 @@ div.popup_back{ position:absolute; top:0px; left:0px; - opacity:0.6; + opacity:0.3; width:100%; height:100%; - z-index:1; - display:none; + z-index:100; + display:block; + background: #909BA7; } div.popup_border_title { diff --git a/include/ac_common.php b/include/ac_common.php index 57f686e2d..07c25bb3f 100644 --- a/include/ac_common.php +++ b/include/ac_common.php @@ -293,7 +293,10 @@ function html_page_start($p_theme="", $p_script="", $p_script2="") $is_msie=is_msie(); if ($is_msie == 0 ) + { echo ''; + echo ''; + } else echo ''; @@ -315,7 +318,8 @@ function html_page_start($p_theme="", $p_script="", $p_script2="") echo ' - '; + + '; echo ' '; diff --git a/include/ajax_add_menu.php b/include/ajax_add_menu.php index 72086a9fa..8ef003fad 100644 --- a/include/ajax_add_menu.php +++ b/include/ajax_add_menu.php @@ -133,7 +133,7 @@ select me_code,me_code||' '||coalesce(me_menu,'')||' '||coalesce(me_description, $pm_default=new ICheckBox('pm_default'); echo HtmlInput::title_box(_("Nouveau"), $ctl); ?> -
+ @@ -187,7 +187,7 @@ select me_code,me_code||' '||coalesce(me_menu,'')||' '||coalesce(me_description, return; } ?> - + diff --git a/include/ajax_create_menu.php b/include/ajax_create_menu.php index 347b4aa46..73e8aa504 100644 --- a/include/ajax_create_menu.php +++ b/include/ajax_create_menu.php @@ -6,7 +6,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); require_once NOALYSS_INCLUDE.'/class_menu_ref.php'; $msg="Création"; $m=new Menu_Ref($cn); -echo ''; +echo ''; require_once 'template/menu_detail.php'; echo HtmlInput::submit('create_menu','Sauver'); diff --git a/include/ajax_get_menu_detail.php b/include/ajax_get_menu_detail.php index 1af6e3026..be0a88632 100644 --- a/include/ajax_get_menu_detail.php +++ b/include/ajax_get_menu_detail.php @@ -50,7 +50,7 @@ $pm_default=new ICheckBox('pm_default','1'); $pm_default->set_check($array[0]['pm_default']); ?> - ?')"> + ?')"> diff --git a/include/ajax_get_profile.php b/include/ajax_get_profile.php index d4c461b66..ccc31c26e 100644 --- a/include/ajax_get_profile.php +++ b/include/ajax_get_profile.php @@ -76,7 +76,7 @@ else { echo '
'; } -echo ''; +echo ''; echo HtmlInput::hidden('tab','profile_gen_div'); echo HtmlInput::hidden('p_id',$profile->p_id); require_once("template/profile.php"); @@ -84,7 +84,7 @@ echo HtmlInput::submit("save_name",_("Modifier")); echo ''; if ($profile->p_id > 0) { - echo '
'; + echo ''; echo _('Vous pouvez aussi copier ce profil et puis le corriger'); @@ -92,7 +92,7 @@ if ($profile->p_id > 0) echo HtmlInput::submit("clone", "Copier"); echo '
'; - echo '
'; + echo ''; echo _('Effacer ce profil'); diff --git a/include/ajax_mod_menu.php b/include/ajax_mod_menu.php index dae0f4d0b..12e19ccba 100644 --- a/include/ajax_mod_menu.php +++ b/include/ajax_mod_menu.php @@ -6,7 +6,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); require_once NOALYSS_INCLUDE.'/class_menu_ref.php'; $m=new Menu_Ref($cn,$me_code); $msg="Modification ".$m->me_code.' '.h($m->me_menu); -echo ''; +echo ''; require_once NOALYSS_INCLUDE.'/template/menu_detail.php'; diff --git a/include/class_extension.php b/include/class_extension.php index 48c369c34..7ca07c3b2 100644 --- a/include/class_extension.php +++ b/include/class_extension.php @@ -105,7 +105,7 @@ class Extension extends Menu_Ref_sql * @global type $cn * @param type $p_id profile.p_id * @param type $p_module menu_ref.me_code - * @throws Exception 10 : profile absent 20 module absent + * @throws Exception 10 : profile absent , 20 module absent , 30 No parent menu */ function insert_profile_menu($p_id=1,$p_module='EXT') { @@ -120,12 +120,23 @@ class Extension extends Menu_Ref_sql if ($module->me_code==null) { throw new Exception(_('Module inexistant'),20); } + // Dependency + $dep_id=$cn->get_value('select pm_id from profile_menu + where + p_id=$1 + and me_code = $2 ',array($p_id,$p_module)); + // throw an exception if there is no dependency + if ($dep_id=="") { + throw new Exception(_('Pas de menu ').$p_module,30); + } $profil_menu=new Profile_Menu($cn); $profil_menu->me_code=$this->me_code; $profil_menu->me_code_dep=$p_module; $profil_menu->p_type_display='S'; $profil_menu->p_id=$p_id; + $profil_menu->pm_id_dep=$dep_id; + $cnt=$profil_menu->count(' where p_id=$1 and me_code = $2',array($p_id,$this->me_code)); if ( $cnt==0) { $profil_menu->insert(); diff --git a/include/class_periode.php b/include/class_periode.php index 49c4cecc1..fe0ff88b8 100644 --- a/include/class_periode.php +++ b/include/class_periode.php @@ -201,7 +201,7 @@ class Periode from parm_periode order by p_start,p_end"); $Max=Database::num_row($Res); - echo ''; + echo ''; echo HtmlInput::array_to_hidden(array('ac','gDossier','jrn_def_id','choose'), $_REQUEST); echo ''; echo ""; @@ -262,7 +262,7 @@ class Periode if ($l_line['count_op'] == 0 ) { $remove.=' Efface"; + $l_line['p_id']."&$str_dossier\" onclick=\"return confirm_form(this,'"._('Confirmez effacement ?')."')\" > Efface"; } else { @@ -326,7 +326,7 @@ class Periode $this->jrn_def_id); $jrn_name=Database::fetch_result($r,0,0); echo '

Journal '.$jrn_name.'

'; - echo ''; + echo ''; echo HtmlInput::array_to_hidden(array('ac','gDossier','jrn_def_id','choose'), $_REQUEST); echo '
'; diff --git a/include/class_profile_menu_sql.php b/include/class_profile_menu_sql.php index b9579c67e..846ff1396 100644 --- a/include/class_profile_menu_sql.php +++ b/include/class_profile_menu_sql.php @@ -50,6 +50,7 @@ class Profile_Menu_sql extends Noalyss_SQL , "p_order"=>"p_order" , "p_type_display"=>"p_type_display" , "pm_default"=>"pm_default" + ,"pm_id_dep"=>"pm_id_dep" ); $this->type=array( @@ -60,6 +61,7 @@ class Profile_Menu_sql extends Noalyss_SQL , "p_order"=>"number" , "p_type_display"=>"text" , "pm_default"=>"text" + , "pm_id_dep"=>"number" ); $this->default=array( diff --git a/include/doc_state.inc.php b/include/doc_state.inc.php index 7e031f2be..79844665d 100644 --- a/include/doc_state.inc.php +++ b/include/doc_state.inc.php @@ -60,7 +60,7 @@ $a_stat=$cn->get_array("select s_value,s_status from document_state order by 1")

Ajout d'un état

- +

Nom de l'état input()?>

diff --git a/include/function_javascript.php b/include/function_javascript.php index 684702d90..ad7764120 100644 --- a/include/function_javascript.php +++ b/include/function_javascript.php @@ -2756,6 +2756,7 @@ function load_all_script() $already_call=1; echo JS_INFOBULLE; + echo js_include('smoke.js'); echo js_include('prototype.js'); echo js_include('scriptaculous.js'); echo js_include('scripts.js'); @@ -2772,7 +2773,6 @@ function load_all_script() echo js_include('card.js'); echo js_include('compute_direct.js'); echo js_include('compute.js'); - echo js_include('confirm.js'); echo js_include('forecast.js'); echo js_include('gestion.js'); echo js_include('todo_list.js'); diff --git a/include/payment_middle.inc.php b/include/payment_middle.inc.php index 4362c588d..c398c548c 100644 --- a/include/payment_middle.inc.php +++ b/include/payment_middle.inc.php @@ -43,19 +43,18 @@ if ( $sb=='change') if ( !isset($_GET['id'])) exit; $row=new Acc_Payment($cn,$_GET['id']); $row->load(); - $javascript="return confirm('"._('Vous confirmez')."')"; - echo ''; + echo ''; echo dossier::hidden(); echo HtmlInput::hidden('sa','mp'); echo HtmlInput::hidden('sb','save'); echo HtmlInput::hidden('id',$row->get_parameter("id")); - + echo HtmlInput::hidden('delete_ck',0); echo $row->form(); - echo HtmlInput::submit('save',_('Sauve')); - echo HtmlInput::submit('delete',_('Efface')); + echo HtmlInput::submit('save',_('Sauve'), ' onclick="$(\'delete_ck\').value=0"'); + echo HtmlInput::submit('delete',_('Efface'),' onclick="$(\'delete_ck\').value=1"'); echo HtmlInput::button_anchor(_('Retour sans sauver'), - '?p_action=divers&sa=mp&'.dossier::get()."&ac=".$_REQUEST['ac'] - ); + '?p_action=divers&sa=mp&'.dossier::get()."&ac=".$_REQUEST['ac'], + "","","smallbutton"); echo '
'; return; } @@ -64,19 +63,21 @@ if ( $sb=='change') // if ( $sb=='save') { - $row=new Acc_Payment($cn,$_POST ['id']); - $row->from_array($_POST); - $row->update(); - -} + $delete=HtmlInput::default_value_post("delete_ck", 0); + if ( $delete == 0 ) + { + $row=new Acc_Payment($cn,$_POST ['id']); + $row->from_array($_POST); + $row->update(); + } else { //--------------------------------------------------------------------------- // Delete a card //--------------------------------------------------------------------------- -if (isset($_POST['delete'])) -{ $row=new Acc_Payment($cn,$_POST['id']); $row->from_array($_POST); $row->delete(); + + } } //--------------------------------------------------------------------------- // Insert a new mod of payment @@ -96,14 +97,14 @@ if ($sb=='ins') { $mp=new Acc_Payment($cn); $r=$mp->blank(); - echo '
'; + echo ''; echo dossier::hidden(); - HtmlInput::hidden('ac',$_REQUEST['ac']).HtmlInput::hidden('sb','insert'); + echo HtmlInput::hidden('ac',$_REQUEST['ac']),HtmlInput::hidden('insert',0); echo $r; - echo HtmlInput::submit('insert',_('Enregistre')); + echo HtmlInput::submit('insertsub',_('Enregistre')); echo HtmlInput::button_anchor(_('Retour sans sauver'), - '?p_action=divers&sa=mp&'.dossier::get()."&ac=".$_REQUEST['ac'] - ); + '?p_action=divers&sa=mp&'.dossier::get()."&ac=".$_REQUEST['ac'], + "","","smallbutton"); echo '
'; return; @@ -115,11 +116,11 @@ if ($sb=='ins') $header=new Sort_Table(); $base_url=$_SERVER['PHP_SELF']."?".Dossier::get()."&ac=".$_REQUEST['ac']; -$header->add("Libelle",$base_url,"order by mp_lib asc","order by mp_lib desc",'la','ld'); -$header->add("Pour le journal",$base_url,"order by jrn_def_name asc","order by jrn_def_name desc",'ja','jd'); -$header->add("Type de fiche",$base_url,"order by fd_label asc","order by fd_label desc",'tc','td'); -$header->add("Enregistré dans le journal",$base_url,"order by jrn_target asc","order by jrn_target desc",'jta','jtd'); -$header->add("Avec la fiche",$base_url,"order by vw_name asc","order by vw_name desc",'na','nd'); +$header->add(_("Libelle"),$base_url,"order by mp_lib asc","order by mp_lib desc",'la','ld'); +$header->add(_("Pour le journal"),$base_url,"order by jrn_def_name asc","order by jrn_def_name desc",'ja','jd'); +$header->add(_("Type de fiche"),$base_url,"order by fd_label asc","order by fd_label desc",'tc','td'); +$header->add(_("Enregistré dans le journal"),$base_url,"order by jrn_target asc","order by jrn_target desc",'jta','jtd'); +$header->add(_("Avec la fiche"),$base_url,"order by vw_name asc","order by vw_name desc",'na','nd'); $order=(isset($_REQUEST['ord']))?$_REQUEST['ord']:'la'; diff --git a/include/template/fiche_list.php b/include/template/fiche_list.php index 957189341..43b201a55 100644 --- a/include/template/fiche_list.php +++ b/include/template/fiche_list.php @@ -27,7 +27,7 @@ */ ?> -
')"> +')">
diff --git a/include/template/periode_add_exercice.php b/include/template/periode_add_exercice.php index 219bd4715..620a54685 100644 --- a/include/template/periode_add_exercice.php +++ b/include/template/periode_add_exercice.php @@ -12,7 +12,7 @@ pour faire toutes les écritures de fin d'exercice: amortissements, régulations -')"> +')"> input(); diff --git a/include/template/stock_inv.php b/include/template/stock_inv.php index 2886d70ec..5d12bd8a4 100644 --- a/include/template/stock_inv.php +++ b/include/template/stock_inv.php @@ -28,7 +28,7 @@ */ ?>
" class="content"> - ')"> + ')">