diff --git a/html/admin/sql/patch/upgrade106.sql b/html/admin/sql/patch/upgrade106.sql index a08f7ce26..bd837e054 100644 --- a/html/admin/sql/patch/upgrade106.sql +++ b/html/admin/sql/patch/upgrade106.sql @@ -4,7 +4,13 @@ ALTER TABLE mod_payment DROP CONSTRAINT mod_payment_mp_fd_id_fkey ; ALTER TABLE mod_payment ADD CONSTRAINT mod_payment_mp_fd_id_fkey FOREIGN KEY (mp_fd_id) REFERENCES fiche_def (fd_id) MATCH SIMPLE ON UPDATE cascade ON DELETE cascade; ALTER TABLE mod_payment DROP CONSTRAINT mod_payment_mp_jrn_def_id_fkey ; ALTER TABLE mod_payment ADD CONSTRAINT mod_payment_mp_jrn_def_id_fkey FOREIGN KEY (mp_jrn_def_id) REFERENCES jrn_def (jrn_def_id) MATCH SIMPLE ON UPDATE CASCADE ON DELETE CASCADE; - +ALTER TABLE fiche_def ADD COLUMN fd_description text; +update fiche_def set fd_description='Achats de marchandises' where fd_id=1; +update fiche_def set fd_description='Liste des clients' where fd_id=2; +update fiche_def set fd_description='Liste des comptes financiers: banque, caisse,...' where fd_id=3; +update fiche_def set fd_description='Liste des fournisseurs' where fd_id=4; +update fiche_def set fd_label='Services & Biens Divers',fd_description='Pour les charges diverses' where fd_id=5; +update fiche_def set fd_description='Vente de prestations, marchandises ' where fd_id=6; update version set val=107; commit; diff --git a/html/js/scripts.js b/html/js/scripts.js index 1829aacd1..24003001f 100644 --- a/html/js/scripts.js +++ b/html/js/scripts.js @@ -678,6 +678,8 @@ function waiting_box() removeDiv('wait_box'); } add_div(obj); + $('info_div').innerHTML="Un instant"; + $('info_div').style.display="block"; } /** @@ -1181,6 +1183,8 @@ function set_reconcile(obj) function remove_waiting_box() { removeDiv('wait_box'); + $('info_div').innerHTML=""; + $('info_div').style.display="none"; } function get_profile_detail(gDossier,profile_id) { @@ -1723,8 +1727,11 @@ function view_action(ag_id,dossier,modify) * @see HtmlInput::filter_table */ function filter_table(phrase, _id, colnr,start_row) { + $('info_div').innerHTML="Un instant"; + $('info_div').style.display="block"; var words = $(phrase).value.toLowerCase(); var table = document.getElementById(_id); + // if colnr contains a comma then check several columns var aCol = new Array(); if (colnr.indexOf(',') >= 0) { @@ -1733,6 +1740,7 @@ function filter_table(phrase, _id, colnr,start_row) { aCol[0] = colnr; } var ele; + for (var r = start_row; r < table.rows.length; r++) { var found=0; for (var col =0;col < aCol.length;col++) @@ -1752,6 +1760,8 @@ function filter_table(phrase, _id, colnr,start_row) { } else { table.rows[r].style.display = 'none'; } + $('info_div').style.display="none"; + $('info_div').innerHTML=""; } } function display_task(p_id) diff --git a/html/style-epad.css b/html/style-epad.css index 611b035bb..7c4b96faf 100644 --- a/html/style-epad.css +++ b/html/style-epad.css @@ -1147,3 +1147,12 @@ div.myfieldset margin-right: 5px; border:lightgrey 2px groove; } +#info_div { + display:none; + background-color: yellow; + color:red; + z-index: 15; + position: absolute; + top:0; + left:0; +} \ No newline at end of file diff --git a/html/style-light.css b/html/style-light.css index 18a08721e..e75720058 100644 --- a/html/style-light.css +++ b/html/style-light.css @@ -1140,4 +1140,13 @@ div.myfieldset margin-left:5px; margin-right: 5px; border:lightgrey 2px groove; +} +#info_div { + display:none; + background-color: yellow; + color:red; + z-index: 15; + position: absolute; + top:0; + left:0; } \ No newline at end of file diff --git a/html/style-print.css b/html/style-print.css index b08b5a060..6d3abaa86 100644 --- a/html/style-print.css +++ b/html/style-print.css @@ -286,4 +286,7 @@ div.myfieldset margin-left:5px; margin-right: 5px; border:lightgrey 2px groove; +} +#info_div { + display:none; } \ No newline at end of file diff --git a/html/style-test.css b/html/style-test.css index 53173620e..fe76636cb 100644 --- a/html/style-test.css +++ b/html/style-test.css @@ -52,7 +52,6 @@ div.content { margin-left:10%; margin-right:10%; padding:2%; -// background-color:white; } H2 { font-size:16pt; @@ -64,3 +63,12 @@ table.sortable td,table.result td padding-left:5px; padding-right:5px; } +#info_div { + display:none; + background-color: yellow; + color:red; + z-index: 15; + position: absolute; + top:0; + left:0; +} \ No newline at end of file diff --git a/html/style.css b/html/style.css index 766730912..8689b1dca 100644 --- a/html/style.css +++ b/html/style.css @@ -1147,3 +1147,12 @@ div.myfieldset margin-right: 5px; border:lightgrey 2px groove; } +#info_div { + display:none; + background-color: yellow; + color:red; + z-index: 15; + position: absolute; + top:0; + left:0; +} \ No newline at end of file diff --git a/include/ac_common.php b/include/ac_common.php index 63ff606b2..37b6bb811 100644 --- a/include/ac_common.php +++ b/include/ac_common.php @@ -310,6 +310,7 @@ function html_page_start($p_theme="", $p_script="", $p_script2="") '; echo ""; + echo '
'; // language if (isset($_SESSION['g_lang'])) {