From 7b42961e7ba195613d39706465cee978e17e908c Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Fri, 22 Jan 2021 15:03:41 +0100
Subject: [PATCH 01/39] DEBUG : show file name

---
 include/lib/ac_common.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/lib/ac_common.php b/include/lib/ac_common.php
index 635bb4501..e4a09c26e 100644
--- a/include/lib/ac_common.php
+++ b/include/lib/ac_common.php
@@ -1152,6 +1152,7 @@ function display_menu($p_menuid)
             }
             tracedebug("'menu", $file[0]['me_file'],__FUNCTION__.__LINE__."line");
             tracedebug("'menu", $file[0]['me_parameter'],__FUNCTION__.__LINE__."parm ");
+            if ( DEBUG ) { echo  $file[0]['me_file']," param : ",$file[0]['me_parameter'] ;}
             /*
              * Log the file we input to put in the folder test-noalyss for replaying it
              */

From 293055b621d45a44fc59773e308b7e5f4d42cb32 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Fri, 22 Jan 2021 18:33:16 +0100
Subject: [PATCH 02/39] NEW #0001886: ANC/ANCIMP/ANCGL >> Export PDF

---
 include/anc_great_ledger.inc.php          | 22 ++++++---
 include/class/anc_grandlivre.class.php    | 18 +++----
 include/class/document_export.class.php   | 60 ++++++++++++++++++++---
 include/export/export_anc_receipt_pdf.php |  5 +-
 4 files changed, 78 insertions(+), 27 deletions(-)

diff --git a/include/anc_great_ledger.inc.php b/include/anc_great_ledger.inc.php
index cfec33656..c79f15e98 100644
--- a/include/anc_great_ledger.inc.php
+++ b/include/anc_great_ledger.inc.php
@@ -10,7 +10,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 echo '<div style="content">';
 global $http;
 require_once NOALYSS_INCLUDE.'/class/anc_grandlivre.class.php';
-
+$cn=Dossier::connect();
 $grandLivre=new Anc_Grandlivre($cn);
 
 $grandLivre->get_request();
@@ -35,18 +35,24 @@ if ($result != null)
           echo _('Tout sélectionner')." ".ICheckBox::toggle_checkbox('export_pdf_bt1','export_anc_receipt_pdf');
         echo '</span>';
         $task_id=uniqid();
-        echo $grandLivre->show_button();
-        printf ('<form method="GET" id="export_anc_receipt_pdf" action="export.php" style="display:inline" onsubmit="return start_export_anc_receipt_pdf(\'%s\',\'%s\');">',
-                $task_id,
-                _("Le traitement est en cours ,  merci de patienter sans recharger la page")
-               );
+        echo $grandLivre->button_export_csv();
+        printf ('<form method="GET" id="export_anc_receipt_pdf" action="export.php" 
+            style="display:inline" onsubmit="return start_export_anc_receipt_pdf(\'%s\',\'%s\');">',
+            $task_id,
+            _("Le traitement est en cours ,  merci de patienter sans recharger la page")
+            );
         echo HtmlInput::hidden("task_id",$task_id);
+        $type_pdf=new Select_Box("type_pdf",_("Type export PDF"));
+        $type_pdf->add_value(_("Un seul PDF"),1);
+        $type_pdf->add_value(_("Un PDF par opération"),2);
+        echo $type_pdf->input();
+
         echo $grandLivre->button_export_pdf();
         echo $grandLivre->display_html();
-        echo $grandLivre->button_export_pdf();
         echo HtmlInput::get_to_hidden(array('ac','gDossier','sa'));
+        echo $grandLivre->button_export_pdf();
         echo '</form>';
-        echo $grandLivre->show_button();
+        echo $grandLivre->button_export_csv();
         ?>
 <script>
     function start_export_anc_receipt_pdf(p_task_id,p_message)
diff --git a/include/class/anc_grandlivre.class.php b/include/class/anc_grandlivre.class.php
index f6f8aade9..d6a0fe764 100644
--- a/include/class/anc_grandlivre.class.php
+++ b/include/class/anc_grandlivre.class.php
@@ -24,6 +24,7 @@
  */
 require_once NOALYSS_INCLUDE.'/class/anc_print.class.php';
 require_once NOALYSS_INCLUDE.'/lib/impress.class.php';
+require_once NOALYSS_INCLUDE."/lib/select_box.class.php";
 
 class Anc_GrandLivre extends Anc_Print
 {
@@ -162,7 +163,7 @@ class Anc_GrandLivre extends Anc_Print
     {
         if (CONVERT_GIF_PDF <> 'NOT' && PDFTK <> 'NOT')
         {
-            $r = "";
+            $r="";
             $r.= HtmlInput::hidden("to", $this->to);
             $r.= HtmlInput::hidden("from", $this->from);
             $r.= HtmlInput::hidden("pa_id", $this->pa_id);
@@ -201,7 +202,7 @@ class Anc_GrandLivre extends Anc_Print
         {
             return 0;
         }
-        $r.= '<table class="result" style="width:100%">';
+        $r.= '<table class="result" style="width:100%;border-color:transparent">';
         $ix = 0;
         $prev = 'xx';
         $idx = 0;
@@ -220,7 +221,7 @@ class Anc_GrandLivre extends Anc_Print
 		    $r.=td('') . td('') . td('');
                     $r.=td('') . td('') . td('') . td('') . td('') . td(nbm($tot_deb), ' class="num"') . td(nbm($tot_cred), ' class="num"') . td(nbm($tot_solde) . $sign, ' class="num"');
                 }
-                $r.='<tr>' . '<td colspan="7" style="width:auto">' . '<h2>' . h($row['po_name'] . ' ' . $row['po_description']) . '</td></tr>';
+                $r.='<tr>' . '<td colspan="12" style="width:auto">' . '<h2>' . h($row['po_name'] . ' ' . $row['po_description']) . '</td></tr>';
                 $r.= '<tr>' .
                         '<th>' . '</th>' .
                         '<th>' . _('Date') . '</th>' .
@@ -304,15 +305,10 @@ class Anc_GrandLivre extends Anc_Print
         return $r;
     }
       /*!
-     * \brief Show the button to export in PDF or CSV
-     * \param $url_csv url of the csv
-     * \param $url_pdf url of the pdf
-     * \param $p_string hidden data to include in the form
-     *
-     *
+     * \brief Show the button to export  CSV
      * \return string with the button
      */
-    function show_button($p_string="")
+    function button_export_csv($p_string="")
     {
         $r="";
         $r.= '<form method="GET" action="export.php"  style="display:inline">';
@@ -324,7 +320,7 @@ class Anc_GrandLivre extends Anc_Print
         $r.= HtmlInput::hidden("to_poste",$this->to_poste);
         $r.= $p_string;
         $r.= dossier::hidden();
-        $r.=HtmlInput::submit('bt_csv',"Export en CSV");
+        $r.=HtmlInput::submit('bt_csv',_("Export en CSV"));
         $r.= '</form>';
         return $r;
     }
diff --git a/include/class/document_export.class.php b/include/class/document_export.class.php
index 66d5382d0..3b36d986b 100644
--- a/include/class/document_export.class.php
+++ b/include/class/document_export.class.php
@@ -78,6 +78,29 @@ class Document_Export
         }
     }
 
+    /**
+     * Make a zip file
+     */
+    function make_zip()
+    {
+        $zip=new Zip_Extended();
+        $res=$zip->open("{$this->store_pdf}/result.zip",ZipArchive::CREATE);
+        if ($res !== true) {
+            error_log("DE89 cannot create zip file");
+            throw new Exception ( __FILE__.":".__LINE__."cannot recreate zip");
+        }
+        chdir($this->store_pdf);
+        $zip->addGlob("stamp*pdf");
+        $zip->close();
+
+    }
+    /**
+     * copy the file
+     * @param $p_source
+     * @param $target
+     * @throws Exception
+     */
+
     function move_file($p_source, $target)
     {
         $this->check_file();
@@ -94,6 +117,17 @@ class Document_Export
         header('Pragma: public');
         echo file_get_contents($this->store_pdf . '/result.pdf');
     }
+    /**
+     * @brief send the resulting PDF to the browser
+     */
+    function send_zip()
+    {
+        header('Content-Type: application/x-download');
+        header('Content-Disposition: attachment; filename="result.zip"');
+        header('Cache-Control: private, max-age=0, must-revalidate');
+        header('Pragma: public');
+        echo file_get_contents($this->store_pdf . '/result.zip');
+    }
     /**
      * @brief remove folder and its content
      */
@@ -118,8 +152,10 @@ class Document_Export
      * @brief export all the pieces in PDF and transform them into a PDF with
      * a stamp. If an error occurs then $this->feedback won't be empty
      * @param $p_array contents all the jr_id
+     * @param Progress_Bar $progress is the progress bar
+     * @param int $p_separate 1 everything in a single PDF or a ZIP with all PDF
      */
-    function export_all($p_array, Progress_Bar $progress)
+    function export_all($p_array, Progress_Bar $progress,$p_separate=1)
     {
         $this->check_file();
         if ( count($p_array)==0) return;
@@ -268,12 +304,21 @@ class Document_Export
         }
         
         $progress->set_value(93);
-        // concatenate all pdf into one
-        $this->concatenate_pdf();
-        
-        
-        ob_clean();
-        $this->send_pdf();
+
+        if ( $p_separate == 1) {
+            // concatenate all pdf into one
+            $this->concatenate_pdf();
+
+
+            ob_clean();
+            $this->send_pdf();
+
+        } else {
+            // Put all PDF In a zip file
+            $this->make_zip();
+            ob_clean();
+            $this->send_zip();
+        }
 
         $progress->set_value(100);
         // remove files from "conversion folder"
@@ -299,4 +344,5 @@ class Document_Export
             throw ($ex);
         }
     }
+
 }
diff --git a/include/export/export_anc_receipt_pdf.php b/include/export/export_anc_receipt_pdf.php
index d6d6b475b..0c6e52552 100644
--- a/include/export/export_anc_receipt_pdf.php
+++ b/include/export/export_anc_receipt_pdf.php
@@ -39,6 +39,9 @@ if ($ck == 0)
     exit();
 }
 $anc=new Document_Export();
+$type_pdf=$http->get("type_pdf","number",1);
+
 $task_id=$http->request("task_id");
 $progress=new Progress_Bar($task_id);
-$anc->export_all($ck,$progress);
+$anc->export_all($ck,$progress,$type_pdf);
+

From 7c07b7e3c5e0bf54ec5bc700076d8b6cae6af55a Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Fri, 22 Jan 2021 18:43:43 +0100
Subject: [PATCH 03/39] Bug : javascript message were unavailable

---
 include/lib/message_javascript.php | 140 ++++++++++++++---------------
 1 file changed, 70 insertions(+), 70 deletions(-)

diff --git a/include/lib/message_javascript.php b/include/lib/message_javascript.php
index caa7a589e..74d816f30 100644
--- a/include/lib/message_javascript.php
+++ b/include/lib/message_javascript.php
@@ -30,83 +30,83 @@
 <script>
 var content=new Array();
 content[0]="<?php echo htmlspecialchars(_("Cherchez en saisissant le quickcode, le poste comptable ou une partie du nom de la fiche ou de l'adresse"),ENT_QUOTES)?>";
-content[1]="<?php echo htmlspecialchars(_("(optionnel) La description est un commentaire libre qui sert à identifier cette opération",ENT_QUOTES))?>";
-content[2]="<?php echo htmlspecialchars(_("Selectionnez le journal où l'opération doit être sauvée",ENT_QUOTES))?>";
-content[3]="<?php echo htmlspecialchars(_("Les périodes comptables servent comme un second contrôle pour la date de l'opération. Modifiez dans vos préférence pour avoir une autre période par défaut. Pour ne plus avoir à changer la période aller dans COMPANY, et mettez 'Afficher la période comptable' à non",ENT_QUOTES))?>";
-content[4]="<?php echo htmlspecialchars(_("(optionnel) L'échéance est la date limite de paiement",ENT_QUOTES))?>";
-content[5]="<?php echo htmlspecialchars(_("(optionnel)Le numéro d'extrait permet de retrouver plus facilement l'extrait de banque",ENT_QUOTES))?>";
+content[1]="<?php echo htmlspecialchars(_("(optionnel) La description est un commentaire libre qui sert à identifier cette opération"),ENT_QUOTES)?>";
+content[2]="<?php echo htmlspecialchars(_("Selectionnez le journal où l'opération doit être sauvée"),ENT_QUOTES)?>";
+content[3]="<?php echo htmlspecialchars(_("Les périodes comptables servent comme un second contrôle pour la date de l'opération. Modifiez dans vos préférence pour avoir une autre période par défaut. Pour ne plus avoir à changer la période aller dans COMPANY, et mettez 'Afficher la période comptable' à non"),ENT_QUOTES)?>";
+content[4]="<?php echo htmlspecialchars(_("(optionnel) L'échéance est la date limite de paiement"),ENT_QUOTES)?>";
+content[5]="<?php echo htmlspecialchars(_("(optionnel)Le numéro d'extrait permet de retrouver plus facilement l'extrait de banque"),ENT_QUOTES)?>";
 content[6]="<?php echo htmlspecialchars(_("Indiquez ici le prix hors tva si vous êtes affilié à la tva et que vous  pouvez la déduire , sinon indiquez ici le total tva incluse et utilisez un taux tva de 0%"))?>";
-content[7]="<?php echo htmlspecialchars(_("(optionnel) Ces champs servent à contrôler que les montants correspondent à l'extrait",ENT_QUOTES))?>";
-content[8]="<?php echo htmlspecialchars(_("(optionnel) Ce montant correspond au total tva, si vous le laissez à vide, il sera calculé automatiquement en fonction du taux",ENT_QUOTES))?>";
-content[9]="<?php echo htmlspecialchars(_("Tapez le numéro de poste ou une partie du poste ou du libellé puis sur recherche, Si vous avez donné un quickcode, le poste comptable ne sera pas utilisé",ENT_QUOTES))?>";
-content[10]="<?php echo htmlspecialchars(_("ATTENTION changer le poste comptable d'une fiche <b>ne modifiera pas toutes les opérations</b> où cette fiche est utilisée",ENT_QUOTES))?>";
-content[11]="<?php echo htmlspecialchars(_("ATTENTION si le poste comptable est  vide, il sera créé automatiquement",ENT_QUOTES))?>";
-content[12]="<?php echo htmlspecialchars(_("Document généré uniquement si le mode de paiement est utilisé",ENT_QUOTES))?>";
-content[13]="<?php echo htmlspecialchars(_("Vous pouvez utiliser le % pour indiquer le poste parent",ENT_QUOTES))?>";
-content[14]="<?php echo htmlspecialchars(_("Attention, le poste comptable doit exister, il ne sera pas vérifié",ENT_QUOTES))?>";
-content[15]="<?php echo htmlspecialchars(_("Laissez à 0 pour ne rien changer",ENT_QUOTES))?>";
-content[16]="<?php echo htmlspecialchars(_("Vous devez donner la date par opération",ENT_QUOTES))?>";
-content[17]="<?php echo htmlspecialchars(_("Cliquez sur le titre d'une colonne pour trier",ENT_QUOTES))?>";
-content[18]="<?php echo htmlspecialchars(_("Donnez une partie du nom, prénom, de la description, du poste comptable, du n° de TVA,quick code ... ",ENT_QUOTES))?>";
-content[19]="<?php echo htmlspecialchars(_("Donnez une partie du nom, de la description,  du n° de TVA du poste comptable ou du quick code",ENT_QUOTES))?>";
-content[20]="<?php echo htmlspecialchars(_("Les menus ne peuvent dépendre que dans d'un menu principal ou d'un menu, si cette liste est vide, ajouter des modules ou menu principal sans donner de dépendance",ENT_QUOTES))?>";
-content[21]="<?php echo htmlspecialchars(_("Donnez un nombre entre 0 & 100",ENT_QUOTES))?>";
-content[22]="<?php echo htmlspecialchars(_("Donnez une partie du nom du dossier,du nom, du prénom ou du login pour filtrer",ENT_QUOTES))?>";
-content[23]="<?php echo htmlspecialchars(_("Donnez une partie du nom du dossier ou de la description pour filtrer",ENT_QUOTES))?>";
-content[24]="<?php echo htmlspecialchars(_("Donnez une partie du poste comptable ou du libellé pour filtrer",ENT_QUOTES))?>";
-content[25]="<?php echo htmlspecialchars(_("Donnez une partie du libellé, la date, le montant ou le numéro d'opération pour filtrer, cela n'efface pas ce qui a déjà été sélectionné",ENT_QUOTES))?>";
-content[26]="<?php echo htmlspecialchars(_("Donnez une partie du quickcode, nom, description... pour filtrer",ENT_QUOTES))?>";
-content[27]="<?php echo htmlspecialchars(_("Attention, <b>SI</b> la fiche a changé de poste comptable, c'est seulement le dernier qui est affiché",ENT_QUOTES))?>";
-content[28]="<?php echo htmlspecialchars(_("Attention Différence entre TVA calculée et donnée",ENT_QUOTES))?>";
-content[29]="<?php echo htmlspecialchars(_("Si vous ne donnez pas de nom, ce sera le nom du fichier qui sera utilisé",ENT_QUOTES))?>";
-content[30]="<?php echo htmlspecialchars(_("Peut contenir une information telle que le message structuré sur le virement",ENT_QUOTES))?>";
-content[31]="<?php echo htmlspecialchars(_("Peut contenir un numéro de bon de commande",ENT_QUOTES))?>";
+content[7]="<?php echo htmlspecialchars(_("(optionnel) Ces champs servent à contrôler que les montants correspondent à l'extrait"),ENT_QUOTES)?>";
+content[8]="<?php echo htmlspecialchars(_("(optionnel) Ce montant correspond au total tva, si vous le laissez à vide, il sera calculé automatiquement en fonction du taux"),ENT_QUOTES)?>";
+content[9]="<?php echo htmlspecialchars(_("Tapez le numéro de poste ou une partie du poste ou du libellé puis sur recherche, Si vous avez donné un quickcode, le poste comptable ne sera pas utilisé"),ENT_QUOTES)?>";
+content[10]="<?php echo htmlspecialchars(_("ATTENTION changer le poste comptable d'une fiche <b>ne modifiera pas toutes les opérations</b> où cette fiche est utilisée"),ENT_QUOTES)?>";
+content[11]="<?php echo htmlspecialchars(_("ATTENTION si le poste comptable est  vide, il sera créé automatiquement"),ENT_QUOTES)?>";
+content[12]="<?php echo htmlspecialchars(_("Document généré uniquement si le mode de paiement est utilisé"),ENT_QUOTES)?>";
+content[13]="<?php echo htmlspecialchars(_("Vous pouvez utiliser le % pour indiquer le poste parent"),ENT_QUOTES)?>";
+content[14]="<?php echo htmlspecialchars(_("Attention, le poste comptable doit exister, il ne sera pas vérifié"),ENT_QUOTES)?>";
+content[15]="<?php echo htmlspecialchars(_("Laissez à 0 pour ne rien changer"),ENT_QUOTES)?>";
+content[16]="<?php echo htmlspecialchars(_("Vous devez donner la date par opération"),ENT_QUOTES)?>";
+content[17]="<?php echo htmlspecialchars(_("Cliquez sur le titre d'une colonne pour trier"),ENT_QUOTES)?>";
+content[18]="<?php echo htmlspecialchars(_("Donnez une partie du nom, prénom, de la description, du poste comptable, du n° de TVA,quick code ... "),ENT_QUOTES)?>";
+content[19]="<?php echo htmlspecialchars(_("Donnez une partie du nom, de la description,  du n° de TVA du poste comptable ou du quick code"),ENT_QUOTES)?>";
+content[20]="<?php echo htmlspecialchars(_("Les menus ne peuvent dépendre que dans d'un menu principal ou d'un menu, si cette liste est vide, ajouter des modules ou menu principal sans donner de dépendance"),ENT_QUOTES)?>";
+content[21]="<?php echo htmlspecialchars(_("Donnez un nombre entre 0 & 100"),ENT_QUOTES)?>";
+content[22]="<?php echo htmlspecialchars(_("Donnez une partie du nom du dossier,du nom, du prénom ou du login pour filtrer"),ENT_QUOTES)?>";
+content[23]="<?php echo htmlspecialchars(_("Donnez une partie du nom du dossier ou de la description pour filtrer"),ENT_QUOTES)?>";
+content[24]="<?php echo htmlspecialchars(_("Donnez une partie du poste comptable ou du libellé pour filtrer"),ENT_QUOTES)?>";
+content[25]="<?php echo htmlspecialchars(_("Donnez une partie du libellé, la date, le montant ou le numéro d'opération pour filtrer, cela n'efface pas ce qui a déjà été sélectionné"),ENT_QUOTES)?>";
+content[26]="<?php echo htmlspecialchars(_("Donnez une partie du quickcode, nom, description... pour filtrer"),ENT_QUOTES)?>";
+content[27]="<?php echo htmlspecialchars(_("Attention, <b>SI</b> la fiche a changé de poste comptable, c'est seulement le dernier qui est affiché"),ENT_QUOTES)?>";
+content[28]="<?php echo htmlspecialchars(_("Attention Différence entre TVA calculée et donnée"),ENT_QUOTES)?>";
+content[29]="<?php echo htmlspecialchars(_("Si vous ne donnez pas de nom, ce sera le nom du fichier qui sera utilisé"),ENT_QUOTES)?>";
+content[30]="<?php echo htmlspecialchars(_("Peut contenir une information telle que le message structuré sur le virement"),ENT_QUOTES)?>";
+content[31]="<?php echo htmlspecialchars(_("Peut contenir un numéro de bon de commande"),ENT_QUOTES)?>";
 
-content[32]="<?php echo htmlspecialchars(_('Le résultat peut changer en fonction du type de journal',ENT_QUOTES));?>";
+content[32]="<?php echo htmlspecialchars(_('Le résultat peut changer en fonction du type de journal'),ENT_QUOTES);?>";
 	
-content[33]="<?php echo htmlspecialchars(_("le type vaut : ME pour Menu, PR pour les impressions,PL pour les plugins,SP pour des valeurs spéciales",ENT_QUOTES))?>";
-content[34]="<?php echo htmlspecialchars(_("Cliquez sur le code AD pour ouvrir le menu dans un nouvel onglet",ENT_QUOTES))?>";
-content[35]="<?php echo htmlspecialchars(_("Cliquez sur le chemin pour ouvrir le menu",ENT_QUOTES))?>";
-content[36]="<?php echo htmlspecialchars(_("En utilisant les dates d échéance ou de paiement, seuls les journaux de type ACH et VEN seront utilisés ,vous excluez d office les autres journaux",ENT_QUOTES))?>";
-content[37]="<?php echo htmlspecialchars(_("Les dates sont en format DD.MM.YYYY",ENT_QUOTES))?>";
-content[38]="<?php echo htmlspecialchars(_("La numérotation est propre à chaque journal. Laissez à 0 pour ne pas changer le numéro",ENT_QUOTES))?>";
-content[39]="<?php echo htmlspecialchars(_("Le préfixe des pièces doit être différent pour chaque journal, on peut aussi utiliser l'année",ENT_QUOTES))?>";
-content[40]="<?php echo htmlspecialchars(_("Laissez à 0 pour ne pas changer le numéro",ENT_QUOTES))?>";
-content[41]="<?php echo htmlspecialchars(_("Mettez le pourcentage <br> à zéro pour effacer la ligne",ENT_QUOTES))?>";
-content[42]="<?php echo htmlspecialchars(_("Selectionnez le plan qui vous intéresse avant de cliquer sur Recherche",ENT_QUOTES))?>";
-content[43]="<?php echo htmlspecialchars(_("Autoliquidation : Utilisé en même temps au crédit et au débit",ENT_QUOTES))?>";
-content[44]="<?php echo htmlspecialchars(_("Ne donnez pas ce poste comptable si ce code n'est pas utilisé à l'achat",ENT_QUOTES))?>";
-content[45]="<?php echo htmlspecialchars(_("Ne donnez pas ce poste comptable si ce code n'est pas utilisé  à la vente",ENT_QUOTES))?>";
-content[46]="<?php echo htmlspecialchars(_("Un instant svp",ENT_QUOTES))?>";
-content[47]="<?php echo htmlspecialchars(_("Vous confirmez ?",ENT_QUOTES))?>";
-content[48]="<?php echo htmlspecialchars(_("Echec ",ENT_QUOTES))?>";
-content[49]="<?php echo htmlspecialchars(_("Echec donnée manquante ou incorrecte",ENT_QUOTES))?>";
-content[50]="<?php echo htmlspecialchars(_("Vous confirmez effacement ?",ENT_QUOTES))?>";
-content[51]="<?php echo htmlspecialchars(_("Vous confirmez mise à jour ?",ENT_QUOTES))?>";
+content[33]="<?php echo htmlspecialchars(_("le type vaut : ME pour Menu, PR pour les impressions,PL pour les plugins,SP pour des valeurs spéciales"),ENT_QUOTES)?>";
+content[34]="<?php echo htmlspecialchars(_("Cliquez sur le code AD pour ouvrir le menu dans un nouvel onglet"),ENT_QUOTES)?>";
+content[35]="<?php echo htmlspecialchars(_("Cliquez sur le chemin pour ouvrir le menu"),ENT_QUOTES)?>";
+content[36]="<?php echo htmlspecialchars(_("En utilisant les dates d échéance ou de paiement, seuls les journaux de type ACH et VEN seront utilisés ,vous excluez d office les autres journaux"),ENT_QUOTES)?>";
+content[37]="<?php echo htmlspecialchars(_("Les dates sont en format DD.MM.YYYY"),ENT_QUOTES)?>";
+content[38]="<?php echo htmlspecialchars(_("La numérotation est propre à chaque journal. Laissez à 0 pour ne pas changer le numéro"),ENT_QUOTES)?>";
+content[39]="<?php echo htmlspecialchars(_("Le préfixe des pièces doit être différent pour chaque journal, on peut aussi utiliser l'année"),ENT_QUOTES)?>";
+content[40]="<?php echo htmlspecialchars(_("Laissez à 0 pour ne pas changer le numéro"),ENT_QUOTES)?>";
+content[41]="<?php echo htmlspecialchars(_("Mettez le pourcentage <br> à zéro pour effacer la ligne"),ENT_QUOTES)?>";
+content[42]="<?php echo htmlspecialchars(_("Selectionnez le plan qui vous intéresse avant de cliquer sur Recherche"),ENT_QUOTES)?>";
+content[43]="<?php echo htmlspecialchars(_("Autoliquidation : Utilisé en même temps au crédit et au débit"),ENT_QUOTES)?>";
+content[44]="<?php echo htmlspecialchars(_("Ne donnez pas ce poste comptable si ce code n'est pas utilisé à l'achat"),ENT_QUOTES)?>";
+content[45]="<?php echo htmlspecialchars(_("Ne donnez pas ce poste comptable si ce code n'est pas utilisé  à la vente"),ENT_QUOTES)?>";
+content[46]="<?php echo htmlspecialchars(_("Un instant svp"),ENT_QUOTES)?>";
+content[47]="<?php echo htmlspecialchars(_("Vous confirmez ?"),ENT_QUOTES)?>";
+content[48]="<?php echo htmlspecialchars(_("Echec "),ENT_QUOTES)?>";
+content[49]="<?php echo htmlspecialchars(_("Echec donnée manquante ou incorrecte"),ENT_QUOTES)?>";
+content[50]="<?php echo htmlspecialchars(_("Vous confirmez effacement ?"),ENT_QUOTES)?>";
+content[51]="<?php echo htmlspecialchars(_("Vous confirmez mise à jour ?"),ENT_QUOTES)?>";
 content[52]="<?php echo htmlspecialchars(_("Si vous changez de page vous perdez les reconciliations, continuez ?"),ENT_QUOTES) ?>";
-content[53]="<?php echo htmlspecialchars(_("Echec réponse",ENT_QUOTES))?>";
-content[54]="<?php echo htmlspecialchars(_("Désolé, les montants pour la comptabilité analytique sont incorrects",ENT_QUOTES))?>";
-content[55]="<?php echo htmlspecialchars(_("Maximum 15 lignes",ENT_QUOTES))?>";
-content[56]="<?php echo htmlspecialchars(_("Maximum",ENT_QUOTES))?>";
-content[57]="<?php echo htmlspecialchars(_("calculé",ENT_QUOTES))?>";
+content[53]="<?php echo htmlspecialchars(_("Echec réponse"),ENT_QUOTES)?>";
+content[54]="<?php echo htmlspecialchars(_("Désolé, les montants pour la comptabilité analytique sont incorrects"),ENT_QUOTES)?>";
+content[55]="<?php echo htmlspecialchars(_("Maximum 15 lignes"),ENT_QUOTES)?>";
+content[56]="<?php echo htmlspecialchars(_("Maximum"),ENT_QUOTES)?>";
+content[57]="<?php echo htmlspecialchars(_("calculé"),ENT_QUOTES)?>";
 content[58]="<?php echo htmlspecialchars(_("Balance incorrecte D/C")),ENT_QUOTES; ?>";
 content[59]="<?php echo htmlspecialchars(_("Action non autorisée")),ENT_QUOTES; ?>";
 content[60]="<?php echo htmlspecialchars(_("Donnée manquante ou déjà supprimée"),ENT_QUOTES) ?>";
 content[61]="<?php echo htmlspecialchars(_('Désolé, événement en cours de création à sauver')),ENT_QUOTES; ?>";
-content[62]="<?php echo htmlspecialchars(_("Cacher",ENT_QUOTES))?>";
-content[63]="<?php echo htmlspecialchars(_("Afficher",ENT_QUOTES))?>";
-content[64]="<?php echo htmlspecialchars(_("Traitement en cours",ENT_QUOTES))?>";
-content[65]="<?php echo htmlspecialchars(_("Un instant",ENT_QUOTES))?>";
-content[66]="<?php echo htmlspecialchars(_("Calculatrice",ENT_QUOTES))?>";
-content[67]="<?php echo htmlspecialchars(_('Taper une formule (ex 20*5.1) puis enter',ENT_QUOTES))?>";
+content[62]="<?php echo htmlspecialchars(_("Cacher"),ENT_QUOTES)?>";
+content[63]="<?php echo htmlspecialchars(_("Afficher"),ENT_QUOTES)?>";
+content[64]="<?php echo htmlspecialchars(_("Traitement en cours"),ENT_QUOTES)?>";
+content[65]="<?php echo htmlspecialchars(_("Un instant"),ENT_QUOTES)?>";
+content[66]="<?php echo htmlspecialchars(_("Calculatrice"),ENT_QUOTES)?>";
+content[67]="<?php echo htmlspecialchars(_('Taper une formule (ex 20*5.1) puis enter'),ENT_QUOTES)?>";
 content[68]="<?php echo htmlspecialchars(_("Calculatrice simplifiée: écrivez simplement les opérations que vous voulez puis la touche retour. exemple : 1+2+3*(1/5)"),ENT_QUOTES);?>";
-content[69]="<?php echo htmlspecialchars(_("Aucune donnée",ENT_QUOTES))?>";
-content[70]="<?php echo htmlspecialchars(_("Votre demande est en cours de traitement",ENT_QUOTES))?>";
-content[71]="<?php echo htmlspecialchars(_('Limite le type de fiche si vous choisissez la fiche à la saisie, uniquement avec journaux OD',ENT_QUOTES));?>";
-content[72]="<?php echo htmlspecialchars(_("Pour les journaux FIN, ce sera la fiche du journal",ENT_QUOTES));?>";
-content[73]="<?php echo htmlspecialchars(_("Mettre à oui pour un journal dédié uniquement aux notes de crédit ou de débit, il affichera un avertissement si le montant n'est pas en négatif",ENT_QUOTES));?>";
-content[74]="<?php echo htmlspecialchars(_('TVA due ou récupérable quand l\'opération est payée ou exécutée',ENT_QUOTES))?>";
-content[75]="<?php echo htmlspecialchars(_('Journaux Achat ou vente en mode simple, TVA ou détaillé',ENT_QUOTES))?>";
-content[76]="<?php echo htmlspecialchars(_('Il est conseillé d\'avoir un quickcode de moins de 9 car.',ENT_QUOTES))?>";
-content[77]="<?php echo htmlspecialchars(_("Permet de chercher dans le suivi pour les contacts multiples",ENT_QUOTES))?>";
+content[69]="<?php echo htmlspecialchars(_("Aucune donnée"),ENT_QUOTES)?>";
+content[70]="<?php echo htmlspecialchars(_("Votre demande est en cours de traitement"),ENT_QUOTES)?>";
+content[71]="<?php echo htmlspecialchars(_('Limite le type de fiche si vous choisissez la fiche à la saisie, uniquement avec journaux OD'),ENT_QUOTES);?>";
+content[72]="<?php echo htmlspecialchars(_("Pour les journaux FIN, ce sera la fiche du journal"),ENT_QUOTES);?>";
+content[73]="<?php echo htmlspecialchars(_("Mettre à oui pour un journal dédié uniquement aux notes de crédit ou de débit, il affichera un avertissement si le montant n'est pas en négatif"),ENT_QUOTES);?>";
+content[74]="<?php echo htmlspecialchars(_('TVA due ou récupérable quand l\'opération est payée ou exécutée'),ENT_QUOTES)?>";
+content[75]="<?php echo htmlspecialchars(_('Journaux Achat ou vente en mode simple, TVA ou détaillé'),ENT_QUOTES)?>";
+content[76]="<?php echo htmlspecialchars(_('Il est conseillé d\'avoir un quickcode de moins de 9 car.'),ENT_QUOTES)?>";
+content[77]="<?php echo htmlspecialchars(_("Permet de chercher dans le suivi pour les contacts multiples"),ENT_QUOTES)?>";
 </script>

From 21dd4ad8c652eec257817ca862627bfacc9a52ff Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sat, 23 Jan 2021 11:39:12 +0100
Subject: [PATCH 04/39] NEW #0001886: ANC/ANCIMP/ANCGL >> Export PDF Place
 properly the select_box

---
 include/anc_great_ledger.inc.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/anc_great_ledger.inc.php b/include/anc_great_ledger.inc.php
index c79f15e98..53d727df5 100644
--- a/include/anc_great_ledger.inc.php
+++ b/include/anc_great_ledger.inc.php
@@ -45,6 +45,7 @@ if ($result != null)
         $type_pdf=new Select_Box("type_pdf",_("Type export PDF"));
         $type_pdf->add_value(_("Un seul PDF"),1);
         $type_pdf->add_value(_("Un PDF par opération"),2);
+        $type_pdf->set_position("absolute");
         echo $type_pdf->input();
 
         echo $grandLivre->button_export_pdf();

From 59111506776f7197254531b6c4925efd57b1edf4 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sat, 23 Jan 2021 11:42:27 +0100
Subject: [PATCH 05/39] =?UTF-8?q?New=20#0001887:=20ANCGL=20ajout=20champs?=
 =?UTF-8?q?=20num=C3=A9ro=20action?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/class/anc_grandlivre.class.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/include/class/anc_grandlivre.class.php b/include/class/anc_grandlivre.class.php
index d6a0fe764..6f3c64fc8 100644
--- a/include/class/anc_grandlivre.class.php
+++ b/include/class/anc_grandlivre.class.php
@@ -114,7 +114,7 @@ class Anc_GrandLivre extends Anc_Print
         $pa_id_cond="";
         if ( isset ( $this->pa_id) && $this->pa_id !='')
             $pa_id_cond= "pa_id=".$this->pa_id." and";
-        $array=$this->db->get_array("	select
+        $array=$this->db->get_array("	 select
 	po_name,
 	to_char(oa_date,'DD.MM.YYYY') as oa_date,
         to_char(jr_date_paid,'DD.MM.YY') as strdate_paid,
@@ -137,7 +137,8 @@ class Anc_GrandLivre extends Anc_Print
         coalesce(oa_group,0) as oa_group,
 	case when oa_debit='t' then oa_amount else  0 end as amount_deb,
 	case when oa_debit='f' then oa_amount else  0 end as amount_cred,
-        case when oa_debit='f' then 'C' else  'D' end as deb_cred
+        case when oa_debit='f' then 'C' else  'D' end as deb_cred,
+    ac.str_action   
 	from operation_analytique as B join poste_analytique using(po_id)
 	left join jrnx using (j_id)
 	left join jrn on  (j_grpt=jr_grpt_id)
@@ -146,7 +147,12 @@ class Anc_GrandLivre extends Anc_Print
 			       	select distinct qs_client,j_id from  quant_sold qs  
 			       	union 
 					select distinct qf_bank,j_id from  quant_fin qf ) as ftiers using (j_id)
-             where $pa_id_cond oa_amount <> 0.0  $cond_poste $filter_date
+    left join (select j.jr_id,string_agg( ag_id::text,'-') as str_action 
+                from jrn j  left 
+                join action_gestion_operation ago  on (j.jr_id=ago.jr_id ) 
+                group by j.jr_id) as ac on (ac.jr_id=jrn.jr_id)					
+    where 
+        $pa_id_cond oa_amount <> 0.0  $cond_poste $filter_date
 	order by po_name,oa_date::date,qcode,j_poste");
 
 
@@ -351,6 +357,7 @@ class Anc_GrandLivre extends Anc_Print
         $aheader[]=array("title"=>'Debit','type'=>'num');
         $aheader[]=array("title"=>'Credit','type'=>'num');
         $aheader[]=array("title"=>'D/C','type'=>'string');
+        $aheader[]=array("title"=>'Action','type'=>'string');
         Impress::array_to_csv($array, $aheader,"export-anc-grandlivre");
     }
 }

From 957a19247b535467c60e670dd26dcac2f542d2ac Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sun, 24 Jan 2021 10:19:29 +0100
Subject: [PATCH 06/39] Cosmetic & code cleaning

---
 html/style-classic7.css                | 35 +++++++----
 include/ajax/ajax_card.php             | 41 +++++++------
 include/balance.inc.php                | 34 ++++++-----
 include/class/acc_ledger.class.php     |  4 +-
 include/class/fiche.class.php          | 85 +++++++++++++++-----------
 include/class/pre_operation.class.php  |  2 +-
 include/fiche.inc.php                  |  2 +-
 include/history_operation.inc.php      |  4 +-
 include/template/letter_all.php        |  2 +-
 include/template/letter_prop.php       |  2 +-
 scenario/select-box-test.php           | 31 ++++++++++
 unit-test/include/class/fiche.Test.php | 32 +++++++++-
 12 files changed, 184 insertions(+), 90 deletions(-)

diff --git a/html/style-classic7.css b/html/style-classic7.css
index 6bb8ce04d..c3612dc3b 100644
--- a/html/style-classic7.css
+++ b/html/style-classic7.css
@@ -264,6 +264,7 @@ td.mtitle {
     border-bottom-left-radius: 0px;
 
     border-collapse: collapse;
+    background-color: #366497;
 }
 @media only screen and (max-width:1250px) {
     td.mtitle {
@@ -278,7 +279,7 @@ td.mtitle {
     }
 }
 td.mtitle a.mtitle {
-    color : white;
+    color : lightgray;
     display:block;
     font-size:1rem;
     font-family:OpenSansRegular;
@@ -517,7 +518,7 @@ a.document:hover {
     margin:1px;
 }
 .input_text {
-    border:solid text #4b4b91;
+    border:1px solid #4b4b91;
     margin:1px;
     border-radius: 2px;
 }
@@ -922,7 +923,7 @@ div.inner_box  {
 /*! -webkit-box-shadow: 10px 10px 5px #888; */
 box-shadow: 15px 15px 15px #888;
 font-size:14.4px;
-font-size:0.90rem;
+font-size:0.9rem;
 }
 div.inner_box  {
     width: 85%;
@@ -930,7 +931,7 @@ div.inner_box  {
 @media only screen and (min-width: 1281px) {
 div.inner_box  {
     width: 85%;
-    /*! border-radius: 9px; */
+     border-radius: 9px; 
     /*! padding: 5px; */
     }
 }
@@ -1230,17 +1231,25 @@ h1.title {
 }
 h2.title {
  
-    color:#FFFFFF;
+    color:white;
     text-align:center;
   
     
     padding-top: 9px;
     margin-top: 0px;
     padding-bottom: 2px;
-    background-color: #366497;
-    font-size: 1.05rem;
+    background-color: #5681B7;
+    font-size: 1.1rem;
     height: 25px;
     vertical-align: middle;
+    border-bottom: white;
+    border-bottom-style: groove;
+    border-bottom-width: 2px;
+    font-style: normal;
+    font-stretch: normal;
+    font-variant-caps: all-small-caps;
+    font-family: OpenSansRegular;
+    margin-bottom: 1px;
 }
 h3.title {
     color: #0000FF;
@@ -1304,7 +1313,7 @@ div.menu2 a.mtitle:hover {
     /*! padding: 5px; */
 }
 div.menu2 table {
-    border-collapse: collapse;
+    border-collapse: separate;
     /*! border-spacing:1px; */
 }
 div.menu3 {
@@ -1977,8 +1986,8 @@ td.box {
   right: 0px;
   visibility: hidden;
   opacity: 0;
-  background: rgba(0,0,0,.3);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#90000000,endColorstr=#900000000);
+  background-color: rgba(0,0,0,.3);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#90000000,endColorstr=#90000000);
 }
 
 .smoke-base.smoke-visible {
@@ -2257,7 +2266,7 @@ div.menu2 td.mtitle, div.menu2 td.mtitle a{
     border-width: 0.1px;
     border-color:white;
     height:25px;
-    /*! border-radius: 0px 0px 0px 10px; */
+    border-radius: 4px 4px 4px 4px;
 }
 div.menu2 td.mtitle a{
     border-width:0px;
@@ -2282,7 +2291,7 @@ div.menu2 td.mtitle a{
  */
 div.bxbutton .icon
 {
-    color:white;
+    /*! color:white; */
     text-decoration:none;
     margin-left: 6px;
     margin-right:6px;
@@ -2292,6 +2301,7 @@ div.bxbutton .icon
     cursor: pointer;
     border:0px;
     height: 18px;
+    color: #f0d19a;
 }
 div.bxbutton .icon:hover
 {
@@ -2488,7 +2498,6 @@ p.info {
 /* Cell with tag */
 span.tagcell {
     border-radius:3px;
-    border:1px solid darkblue;
     padding:3px;margin:1px;
     display: inline-block;
 }    
diff --git a/include/ajax/ajax_card.php b/include/ajax/ajax_card.php
index 3c0e86d57..ce42ebc65 100644
--- a/include/ajax/ajax_card.php
+++ b/include/ajax/ajax_card.php
@@ -110,14 +110,18 @@ switch($op2)
 case 'dc':
     $f=new Fiche($cn);
     /* add title + close */
-    $html=HtmlInput::title_box(_("Détail fiche"), $ctl,"close","","y");
-    
+    $qcode=$http->request("qcode","string",false);
     // if there is no qcode then try to find it thanks the card id
-    if ( ! isset ($qcode) ){
+    if ( $qcode == false ){
         $f->id=$http->get("f_id","number");
         $qcode=$f->get_quick_code();
+    } else {
+        $f->get_by_qcode($qcode);
+
     }
-    
+    $title=$f->getLabelCategory();
+    $html=HtmlInput::title_box($title, $ctl,"close","","y");
+
     // after save , we can either show a card in readonly or update a row
     $safter_save=$http->request("after_save","string","1");
     switch ($safter_save)
@@ -134,22 +138,21 @@ case 'dc':
             break;
     }
 
-    if ( $qcode != '')
+    if ( $qcode != null)
     {
-        $f->get_by_qcode($qcode);
-	$can_modify=$g_user->check_action(FIC);
-	if ( isset($ro) )
-	  {
-	    $can_modify=0;
-	  }
-	if ( $can_modify==1)
-	  $card=$f->Display(false,$ctl);
-	else
-	  $card=$f->Display(true);
-	if ( $card == 'FNT' )
-	  {
-	    $html.='<h2 class="error">'._('Fiche non trouvée').'</h2>';
-	  }
+        $can_modify=$g_user->check_action(FIC);
+        if ( isset($ro) )
+          {
+            $can_modify=0;
+          }
+        if ( $can_modify==1)
+          $card=$f->Display(false,$ctl);
+        else
+          $card=$f->Display(true);
+        if ( $card == 'FNT' )
+          {
+            $html.='<h2 class="error">'._('Fiche non trouvée').'</h2>';
+          }
 	else
 	  {
 
diff --git a/include/balance.inc.php b/include/balance.inc.php
index f5eec775a..2b38736c7 100644
--- a/include/balance.inc.php
+++ b/include/balance.inc.php
@@ -207,7 +207,11 @@ if ( isset ($_GET['view']  ) )
 {
 
     $hid=new IHidden();
-
+    $from_periode=$http->get("from_periode","number");
+    $to_periode=$http->get("to_periode","number");
+    $from_poste=$http->get("from_poste","string");
+    $to_poste=$http->get("to_poste","string");
+    $p_filter=$http->get("p_filter");
 
     echo "<table>";
     echo '<TR>';
@@ -217,9 +221,9 @@ if ( isset ($_GET['view']  ) )
     HtmlInput::hidden("ac",$_REQUEST['ac']).
     HtmlInput::hidden("act","PDF:balance").
             HtmlInput::hidden("summary", $is_summary).
-    HtmlInput::hidden("from_periode",$_GET['from_periode']).
-    HtmlInput::hidden("to_periode",$_GET['to_periode']);
-    echo HtmlInput::hidden('p_filter',$_GET['p_filter']);
+    HtmlInput::hidden("from_periode",$from_periode).
+    HtmlInput::hidden("to_periode",$to_periode);
+    echo HtmlInput::hidden('p_filter',$p_filter);
     for ($e=0;$e<count($selected);$e++)
         if (isset($selected[$e]) && in_array ($selected[$e],$array))
             echo    HtmlInput::hidden("r_jrn[$e]",$selected[$e]);
@@ -227,8 +231,8 @@ if ( isset ($_GET['view']  ) )
         if (isset($select_cat[$e]))
             echo    HtmlInput::hidden("r_cat[$e]",$e);
 
-    echo HtmlInput::hidden("from_poste",$_GET['from_poste']).
-    HtmlInput::hidden("to_poste",$_GET['to_poste']);
+    echo HtmlInput::hidden("from_poste",$from_poste).
+    HtmlInput::hidden("to_poste",$to_poste);
     echo HtmlInput::get_to_hidden(array('lvl1','lvl2','lvl3','unsold','previous_exc'));
 
     echo "</form></TD>";
@@ -237,10 +241,10 @@ if ( isset ($_GET['view']  ) )
     HtmlInput::submit('bt_csv',"Export CSV").
     dossier::hidden().
     HtmlInput::hidden("act","CSV:balance").
-    HtmlInput::hidden("from_periode",$_GET['from_periode']).
-    HtmlInput::hidden("to_periode",$_GET['to_periode']);
+    HtmlInput::hidden("from_periode",$from_periode).
+    HtmlInput::hidden("to_periode",$to_periode);
     echo HtmlInput::get_to_hidden(array('ac'));
-    echo HtmlInput::hidden('p_filter',$_GET['p_filter']);
+    echo HtmlInput::hidden('p_filter',$p_filter);
     for ($e=0;$e<count($selected);$e++){
         if (isset($selected[$e]) && in_array ($selected[$e],$array)){
                 echo    HtmlInput::hidden("r_jrn[$e]",$selected[$e]);
@@ -250,8 +254,8 @@ if ( isset ($_GET['view']  ) )
         if (isset($select_cat[$e]))
             echo    HtmlInput::hidden("r_cat[$e]",$e);
 
-    echo   HtmlInput::hidden("from_poste",$_GET['from_poste']).
-    HtmlInput::hidden("to_poste",$_GET['to_poste']);
+    echo   HtmlInput::hidden("from_poste",$from_poste).
+    HtmlInput::hidden("to_poste",$to_poste);
     echo HtmlInput::get_to_hidden(array('unsold','previous_exc'));
 
     echo "</form></TD>";
@@ -295,9 +299,11 @@ if ( isset($_GET['view'] ) )
     $previous= (isset ($row[0]['sum_cred_previous']))?1:0;
 
     $periode=new Periode($cn);
-    $a=$periode->get_date_limit($_GET['from_periode']);
-    $b=$periode->get_date_limit($_GET['to_periode']);
-    echo "<h2 class=\"info\"> période du ".$a['p_start']." au ".$b['p_end']."</h2>";
+    $a=$periode->get_date_limit($from_periode);
+    $b=$periode->get_date_limit($to_periode);
+    echo '<h2>';
+    printf ( _("période du %s au %s"),$a['p_start'],$b['p_end']);
+    echo '</h2>';
 	echo '<span style="display:block">';
 	echo _('Cherche').Icon_Action::infobulle(24);
 	echo HtmlInput::filter_table("t_balance", "0,1","1");
diff --git a/include/class/acc_ledger.class.php b/include/class/acc_ledger.class.php
index ae10b9096..ce5ef0536 100644
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@ -883,7 +883,7 @@ class Acc_Ledger  extends jrn_def_sql
         $ret.=HtmlInput::hidden('jrn_type', $this->get_type());
         $info=Icon_Action::infobulle(0);
         $info_poste=Icon_Action::infobulle(9);
-        $ret.='<table id="quick_item" style="position:float;width:100%">';
+        $ret.='<table id="quick_item" style="width:100%">';
         $ret.='<tr>'.
                 '<th style="text-align:left">Quickcode'.$info.'</th>'.
                 '<th style="text-align:left">'._('Poste').$info_poste.'</th>'.
@@ -2040,7 +2040,7 @@ class Acc_Ledger  extends jrn_def_sql
                 echo '<input type="hidden" value="'.$id.'" name="p_jrn">';
                 $op=new Pre_operation($cn);
                 $op->p_jrn=$id;
-                $op->od_direct='t';
+
                 if ($op->count()!=0)
                 {
                     echo HtmlInput::submit('use_opd',
diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index e4942bb4a..d6a754911 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -20,7 +20,7 @@
 
 
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
-include_once("class/fiche_attr.class.php");
+require_once NOALYSS_INCLUDE."/class/fiche_attr.class.php";
 require_once NOALYSS_INCLUDE.'/lib/ispan.class.php';
 require_once NOALYSS_INCLUDE.'/lib/itva_popup.class.php';
 require_once NOALYSS_INCLUDE.'/lib/itext.class.php';
@@ -60,7 +60,7 @@ class Fiche
         $this->id=$p_id;
         $this->quick_code='';
         $this->attribut=array();
-        $f_enable='1';
+        $this->f_enable='1';
     }
     public function get_id()
     {
@@ -162,8 +162,8 @@ class Fiche
     /**
      *@brief set an attribute by a value, if the attribut array is empty
      * a call to getAttribut is performed
-     *@param the AD_ID
-     *@param the value
+     *@param int  AD_ID
+     *@param int value
      *@see constant.php table: attr_def
      */
     function setAttribut($p_ad_id,$p_value)
@@ -253,9 +253,9 @@ class Fiche
     }
     /**
      * @brief find the card with the p_attribut equal to p_value, it is not case sensitive
-     * @param $p_attribut attribute to find see table attr_def
-     * @param $p_value value in attr_value.av_text
-     * @return return ARRAY OF jft_id,f_id,fd_id,ad_id,av_text
+     * @param int $p_attribut attribute to find see table attr_def
+     * @param string $p_value value in attr_value.av_text
+     * @return array returns ARRAY OF jft_id,f_id,fd_id,ad_id,av_text
      */
     function seek($p_attribut,$p_value)
     {
@@ -281,30 +281,36 @@ class Fiche
 
     /*!
      **************************************************
-     * \brief  Return array of card from the frd family
+     * \brief  Count the nb of card with the reference card id frd_id
      *
      * \param $p_frd_id the fiche_def_ref.frd_id
      * \param $p_search p_search is a filter on the name
      * \param $p_sql extra sql condition
      *
-     * \return array of fiche object
+     * \return nb of item found
      */
     function count_by_modele($p_frd_id,$p_search="",$p_sql="")
     {
-        $sql="select *
-             from
-             fiche join fiche_Def using (fd_id)
-             where frd_id=".$p_frd_id;
+
         if ( $p_search != "" )
         {
-            $a=sql_string($p_search);
-            $sql="select * from vw_fiche_attr where frd_id=".$p_frd_id.
-                 " and vw_name ilike '%$p_search%'";
+            $result = $this->cn->get_value("select count(*) from 
+                        vw_fiche_attr 
+                        where 
+                        frd_id=$1 
+                        and vw_name ilike '%'||$2||'%'",
+                    [$p_frd_id,$p_search]);
+            return $result;
+        } else {
+            $result = $this->cn->get_value("select count(*)
+                                 from
+                                 fiche join fiche_Def using (fd_id)
+                                 where frd_id=$1 ".sql_string($p_sql)
+                ,[$p_frd_id]);
+            return $result;
         }
 
-        $Ret=$this->cn->exec_sql($sql.$p_sql);
 
-        return Database::num_row($Ret) ;
     }
     /*!
      **************************************************
@@ -375,8 +381,8 @@ class Fiche
     /***
      * @brief  return the string of the given attribute
      *        (attr_def.ad_id)
-     * @param $p_ad_id the AD_ID from attr_def.ad_id
-     * @param $p_return 1 return NOTFOUND otherwise an empty string
+     * @param int  $p_ad_id  AD_ID from attr_def.ad_id
+     * @param int $p_return 1 return NOTFOUND otherwise an empty string
      * @see constant.php
      * @return string
      */
@@ -591,6 +597,17 @@ class Fiche
         return $r;
     }
 
+    /**
+     *
+     * @return string with the category
+     */
+    function getLabelCategory()
+    {
+        $type_card=$this->cn->get_value('select fd_label '
+            . ' from fiche_def join fiche using (fd_id) where f_id=$1',
+            array($this->id));
+        return $type_card;
+    }
 
     /*!
      * \brief  Display object instance, getAttribute
@@ -605,14 +622,9 @@ class Fiche
     {
         $this->GetAttribut();
         $attr=$this->attribut;
-        /* show card type here */
-        $type_card=$this->cn->get_value('select fd_label '
-                . ' from fiche_def join fiche using (fd_id) where f_id=$1',
-                array($this->id));
         $ret="";
-        $ret.=h2(_("Catégorie")." ".$type_card, 'style="display:inline"');
-        $ret.='<span style="margin-right:5px;float:right">'.
-                _('id fiche').':'.$this->id."</span>";
+        $ret.='<span style="margin-right:5px;float:right;font-size:80%">'.
+                _('id').':'.$this->id."</span>";
         $ret.="<table style=\"width:98%;margin:1%\">";
         if (empty($attr))
         {
@@ -849,8 +861,12 @@ class Fiche
         try
         {
             $this->cn->start();
-            
-            $Ret=$this->cn->exec_sql("insert into fiche(f_id,f_enable,fd_id) value ($1,$2,$3)",
+
+            // by default the card is available
+            if ( !isset ($p_array['f_enable'])) {
+                $p_array['f_enable']=1;
+            }
+            $Ret=$this->cn->exec_sql("insert into fiche(f_id,f_enable,fd_id) values ($1,$2,$3)",
                     array($fiche_id, $p_array['f_enable'],$p_fiche_def));
             
             // parse the $p_array array
@@ -1806,6 +1822,7 @@ class Fiche
     function Summary($p_search="",$p_action="",$p_sql="",$p_amount=false)
     {
         global $g_user;
+        $http=new HttpInput();
         $bank=new Acc_Parm_Code($this->cn,'BANQUE');
         $cash=new Acc_Parm_Code($this->cn,'CAISSE');
         $cc=new Acc_Parm_Code($this->cn,'COMPTE_COURANT');
@@ -1826,8 +1843,8 @@ class Fiche
 
         $all_tiers=$this->count_by_modele($this->fiche_def_ref,"",$p_sql.$filter_amount);
         // Get offset and page variable
-        $offset=( isset ($_REQUEST['offset'] )) ?$_REQUEST['offset']:0;
-        $page=(isset($_REQUEST['page']))?$_REQUEST['page']:1;
+        $offset=$http->request("offset","number",0);
+        $page=$http->request("page","number",1);
         $bar=navigation_bar($offset,$all_tiers,$_SESSION[SESSION_KEY.'g_pagesize'],$page);
 
         // set a filter ?
@@ -2140,7 +2157,7 @@ class Fiche
                 {
                     case 'cred':
                         if (!isset($jrn))
-                            throw ('Erreur pas de valeur pour jrn');
+                            throw Exception('Erreur pas de valeur pour jrn');
                         $filter_jrn=$this->cn->make_list("select jrn_def_fiche_cred from jrn_Def where jrn_def_id=$1",
                                 array($jrn));
                         $filter_fd_id=" fd_id in (".$filter_jrn.")";
@@ -2148,7 +2165,7 @@ class Fiche
                         break;
                     case 'deb':
                         if (!isset($jrn))
-                            throw ('Erreur pas de valeur pour jrn');
+                            throw Exception('Erreur pas de valeur pour jrn');
                         $filter_jrn=$this->cn->make_list("select jrn_def_fiche_deb from jrn_Def where jrn_def_id=$1",
                                 array($jrn));
                         $filter_fd_id=" fd_id in (".$filter_jrn.")";
@@ -2156,7 +2173,7 @@ class Fiche
                         break;
                     case 'filter':
                         if (!isset($jrn))
-                            throw ('Erreur pas de valeur pour jrn');
+                            throw Exception('Erreur pas de valeur pour jrn');
                         $filter_jrn=$this->cn->make_list("select jrn_def_fiche_deb from jrn_Def where jrn_def_id=$1",
                                 array($jrn));
 
diff --git a/include/class/pre_operation.class.php b/include/class/pre_operation.class.php
index 4a6ad1805..43c1aef04 100644
--- a/include/class/pre_operation.class.php
+++ b/include/class/pre_operation.class.php
@@ -40,7 +40,7 @@ class Pre_operation
     private  $jrn_type;					/*!< $jrn_type */
     private  $name;						/*!< $name name of the predef. operation */
     private  $detail;                /*!< Pre_operation_detail object */
-    private  $od_direct ;    /*!< Compatibility for ACH in direct mode, only for ODS */
+    var     $od_direct ;    /*!< Compatibility for ACH in direct mode, only for ODS */
     private  $od_id;         /*!< id of the Predefined Operation */
     private $isloaded;
     private $description; /*!< description of the predefined operation */
diff --git a/include/fiche.inc.php b/include/fiche.inc.php
index 39f118988..b5c547940 100644
--- a/include/fiche.inc.php
+++ b/include/fiche.inc.php
@@ -132,7 +132,7 @@ if ( $allcard == 0 ){
 if ($array == null && $allcard == 0 && $histo->selected != 3 )
 {
         echo '<div class="content">';
-	echo '<h2 class="info2"> '._('Aucune fiche trouvée').'</h2>';
+	echo '<h2 class="error"> '._('Aucune fiche trouvée').'</h2>';
 	echo $str_add_card;
         echo '</div>';
 	return;
diff --git a/include/history_operation.inc.php b/include/history_operation.inc.php
index ed6f5168b..69a03599a 100644
--- a/include/history_operation.inc.php
+++ b/include/history_operation.inc.php
@@ -94,13 +94,13 @@ if (!isset($p_array['date_start']))
 	list($date_start, $date_end) = $per->get_date_limit();
 	$p_array['date_start'] = $date_start;
 	$p_array['date_end'] = $date_end;
-	$msg='<h2 class="info2">'.sprintf(_("Période %s au %s "),$date_start,$date_end).'</h2>';
+	$msg='<h2 class="">'.sprintf(_("Période %s au %s "),$date_start,$date_end).'</h2>';
 }
 else
 {
     $date_start=$http->get("date_start","string","");
     $date_end=$http->get("date_end","string","");
-    $msg='<h2 class="info2">'.sprintf(_("Période %s au %s "),$date_start,$date_end) .'</h2>';
+    $msg='<h2 class="">'.sprintf(_("Période %s au %s "),$date_start,$date_end) .'</h2>';
 
 }
 /*  compute the sql stmt */
diff --git a/include/template/letter_all.php b/include/template/letter_all.php
index 32f4e867e..6f51bf237 100644
--- a/include/template/letter_all.php
+++ b/include/template/letter_all.php
@@ -10,7 +10,7 @@ global $g_failed;
 
 if ( count($this->content) == 0 ) :
 ?>
-  <h2 class="info2"><?php echo _('Désolé aucun résultat trouvé')?></h2>
+  <h2 class="error"><?php echo _('Désolé aucun résultat trouvé')?></h2>
 
 <?php exit();
   endif;?>
diff --git a/include/template/letter_prop.php b/include/template/letter_prop.php
index 558cff0f4..6489cee4d 100644
--- a/include/template/letter_prop.php
+++ b/include/template/letter_prop.php
@@ -8,7 +8,7 @@ require_once  NOALYSS_INCLUDE.'/class/acc_reconciliation.class.php';
 $gDossier=dossier::id();
 if ( count($this->content) == 0 ) :
 ?>
-  <h2 class="info2"><?php echo _('Désolé aucun résultat trouvé')?></h2>
+  <h2 class="error"><?php echo _('Désolé aucun résultat trouvé')?></h2>
 
     <?php
   else :
diff --git a/scenario/select-box-test.php b/scenario/select-box-test.php
index d9dc0a916..d439de502 100644
--- a/scenario/select-box-test.php
+++ b/scenario/select-box-test.php
@@ -3,6 +3,37 @@
     <script src="prototype.js"></script>
 
     <style>
+        /* The container <div> - needed to position the dropdown content */
+        .select_box{
+            position: relative;
+            display: inline-block;
+        }
+
+        /* Dropdown Content (Hidden by Default) */
+        .dropdown-content {
+            display: none;
+            position: absolute;
+            background-color: #f9f9f9;
+            min-width: 160px;
+            box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
+            z-index: 1;
+        }
+
+        /* Links inside the dropdown */
+        .dropdown-content a {
+            color: black;
+            padding: 12px 16px;
+            text-decoration: none;
+            display: block;
+        }
+
+        /* Change color of dropdown links on hover */
+        .dropdown-content a:hover {background-color: #f1f1f1}
+
+        /* Show the dropdown menu on hover */
+        .dropdown:hover .dropdown-content {
+            display: block;
+        }
       .select_box {
       border:solid 0.5px darkblue;
       background:white;
diff --git a/unit-test/include/class/fiche.Test.php b/unit-test/include/class/fiche.Test.php
index 08e2cf425..ae083224f 100644
--- a/unit-test/include/class/fiche.Test.php
+++ b/unit-test/include/class/fiche.Test.php
@@ -20,6 +20,8 @@ class FicheTest extends TestCase
      */
     protected function setUp()
     {
+        include 'global.php';
+        $this->object=new Fiche($g_connection);
     }
 
     /**
@@ -37,7 +39,7 @@ class FicheTest extends TestCase
      */
     public function testCmp_name()
     {
-       include 'global.php';
+        global $g_connection;
        $fiche=new \Fiche($g_connection,21);
        $fiche_2=new \Fiche($g_connection,25);
        $this->assertGreaterThan(\Fiche::cmp_name($fiche, $fiche_2),0);
@@ -49,7 +51,7 @@ class FicheTest extends TestCase
      */
     public function testGet_bk_account()
     {
-     include 'global.php';
+        include 'global.php';
      $this->object=new Fiche($g_connection);
      $result=$this->object->get_bk_account();
      $this->assertEquals(gettype($result),'array');
@@ -84,4 +86,30 @@ class FicheTest extends TestCase
         $this->assertEquals($a_result[0][24]["deb_montant"],204.71);
     }
 
+    /**
+     * @covers Fiche::count_by_modele()
+     */
+    public function testCount_by_modele()
+    {
+
+        $nb=$this->object->count_by_modele(1,"","");
+        $this->assertEquals(4,$nb,"number of Sales Card ");
+        $nb=$this->object->count_by_modele(3,"eau","");
+        $this->assertEquals(1,$nb,"Purchase card water ");
+        $nb=$this->object->count_by_modele(3,"EAU","");
+        $this->assertEquals(1,$nb,"Purchase card water ");
+        $nb=$this->object->count_by_modele(3,"ZZ","");
+        $this->assertEquals(0,$nb,"no  card  found");
+        $nb=$this->object->count_by_modele(3000,"","");
+        $this->assertEquals(0,$nb,"no  card found");
+        $nb=$this->object->count_by_modele(3,"","");
+        $this->assertEquals(7,$nb,"Purchase cards ");
+        // attempt to inject SQL command, you must get an error
+        try {
+            $nb=@$this->object->count_by_modele(3,""," and 1';delete from jrn;");
+            $this->assertFalse(true,"Inject SQL command");
+        }  catch(Exception $e) {
+            $this->assertTrue(true,"Inject SQL command");
+        }
+    }
 }

From 846c5a8eea6cc196e845c201ea47d2387bec85c6 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Mon, 25 Jan 2021 18:40:20 +0100
Subject: [PATCH 07/39] Improve : Select_Box , placement

---
 html/js/infobulle.js                      |  44 +++++++++
 include/lib/select_box.class.php          | 110 ++--------------------
 include/template/ledger_detail_bottom.php |   2 +-
 scenario/select-box-test.php              |  35 ++++---
 4 files changed, 75 insertions(+), 116 deletions(-)

diff --git a/html/js/infobulle.js b/html/js/infobulle.js
index 48ae712ae..f283d5ce7 100644
--- a/html/js/infobulle.js
+++ b/html/js/infobulle.js
@@ -65,3 +65,47 @@ function displayBulle(p_comment)  {
     d.style.left=posX+offsetX+"px";
     d.style.visibility="visible";
 }
+
+/**
+ *
+ * @param p_name
+ * @see select_box.class.php
+ */
+function displaySelectBox(p_name) {
+    try {
+        if (! document.getElementById("select_box_content") ) {
+
+            var newDiv=new Element("div");
+            newDiv.id="select_box_content";
+            document.body.appendChild(newDiv);
+            newDiv.addClassName("select_box");
+            $("select_box_content").onmouseleave=function() {
+                try {
+                    var newDiv=$("select_box_content");
+                    newDiv.setStyle({display:"none"});
+                } catch(e) {
+                    alert(e.message);
+                }
+            }
+        } else {
+            var newDiv=document.getElementById("select_box_content");
+        }
+        newDiv.innerHTML=$("select_box"+p_name).innerHTML;
+        var viewport = document.viewport.getDimensions();
+        newDiv.style.top=posY+"px";
+
+        newDiv.style.left=document.getElementById(p_name+"_bt").offsetLeft+"px";
+        newDiv.setStyle({display:"block",position:"absolute","z-index":999});
+
+        if ( $("search_"+p_name+"_list") ) {
+            var sTmp = newDiv.innerHTML;
+            var regex=new RegExp(p_name+"_list","g");
+            sTmp = sTmp.replace(regex,p_name+"_t_list");
+            newDiv.innerHTML=sTmp;
+            $("search_"+p_name+"_t_list").focus();
+        }
+    } catch(e) {
+        alert(e.message);
+    }
+
+}
diff --git a/include/lib/select_box.class.php b/include/lib/select_box.class.php
index 85b768b09..d3a0088f5 100644
--- a/include/lib/select_box.class.php
+++ b/include/lib/select_box.class.php
@@ -109,109 +109,14 @@ class Select_Box
         switch ($this->position)
         {
             case 'absolute':
-                // Show when click
-                $javascript=sprintf('
-                    $("%s_bt").onclick=function() {
-                        try {
-                          
-                            
-                            if (! document.getElementById("select_box%s") ) {
-                            
-                                var newDiv=new Element("div");
-                                newDiv.id="select_box%s";
-                                document.body.appendChild(newDiv);
-                                newDiv.addClassName("select_box");
-                                $("select_box%s").onmouseleave=function() {
-                                        try {
-                                           var newDiv=$("select_box%s");
-                                           newDiv.setStyle({display:"none"});
-                                        } catch(e) {
-                                             alert(e.message);
-                                        }
-                                       }
-                            } else {
-                                 var newDiv=document.getElementById("select_box%s");
-                            }
-                            newDiv.innerHTML=$("select_box%s").innerHTML;
-                            var pos=$("%s_bt").cumulativeOffset();
-                            var nTop=pos.top;
-                            var viewport = document.viewport.getDimensions();
-                            if ( nTop> viewport.height-newDiv.getHeight()-20) { nTop-=newDiv.getHeight()-5}
-                            
-                            newDiv.setStyle({display:"block",position:"absolute",top:nTop+"px",left:pos.left+5+"px","z-index":999});
-                           
-                           if ( $("search_%s") ) { $("search_%s").focus();}
-                        } catch(e) {
-                             alert(e.message);
-                        }
-                       }
-                        ', $this->id, $this->id, $this->id,$this->id, $this->id, $this->id, $this->id, $this->id, $list_id, $list_id);
-
-                break;
             case "normal":
-
-                // Show when click
-                $javascript=sprintf('$("%s_bt").onclick=function() {
-                        try {
-                           var newDiv=$("select_box%s");
-                           var pos=$("%s_bt").cumulativeOffset();
-                           newDiv.setStyle({display:"block",position:"fixed",top:pos.top+25+"px",left:pos.left+5+"px"});
-
-                           if ( $("search_%s") ) { $("search_%s").focus();}
-
-                        } catch(e) {
-                             alert(e.message);
-                        }
-                       }
-                        ', $this->id, $this->id, $this->id, $list_id, $list_id);
-                // Hide when out of the zone
-                $javascript.=sprintf('$("select_box%s").onmouseleave=function() {
-                try {
-                   var newDiv=$("select_box%s");
-                   newDiv.setStyle({display:"none"});
-                } catch(e) {
-                     alert(e.message);
-                }
-               }', $this->id, $this->id);
-                break;
             case "in-absolute":
                 // Show when click
                 $javascript=sprintf('
                     $("%s_bt").onclick=function() {
-                        try {
-                          
-                            
-                            if (! document.getElementById("select_box_content") ) {
-                            
-                                var newDiv=new Element("div");
-                                newDiv.id="select_box_content";
-                                document.body.appendChild(newDiv);
-                                newDiv.addClassName("select_box");
-                                $("select_box_content").onmouseleave=function() {
-                                        try {
-                                           var newDiv=$("select_box_content");
-                                           newDiv.setStyle({display:"none"});
-                                        } catch(e) {
-                                             alert(e.message);
-                                        }
-                                       }
-                            } else {
-                                 var newDiv=document.getElementById("select_box_content");
-                            }
-                            newDiv.innerHTML=$("select_box%s").innerHTML;
-                            var pos=$("%s_bt").cumulativeOffset();
-                            var nTop=pos.top;
-                            var viewport = document.viewport.getDimensions();
-                            if ( nTop> viewport.height-newDiv.getHeight()-20) { nTop-=newDiv.getHeight()-5}
-                            
-                            newDiv.setStyle({display:"block",position:"absolute",top:nTop+"px",left:pos.left+5+"px","z-index":999});
-                           
-                           if ( $("search_%s") ) { $("search_%s").focus();}
-                        } catch(e) {
-                             alert(e.message);
-                        }
+                        displaySelectBox("%s");
                        }
-                        ', $this->id, $this->id, $this->id, $list_id, $list_id);
+                        ', $this->id, $this->id);
 
                 break;
 
@@ -228,12 +133,13 @@ class Select_Box
         // Show when click
         $javascript=$this->compute_position();
 
-
-
         // display the button
-        printf('<input type="button" class="smallbutton " id="%s_bt" value="%s &#x25BE;" >', $this->id, $this->value);
-        printf('<input type="hidden" id="%s" name="%s" value="%s">', $this->id, $this->id, $this->default_value);
-        printf('<div class="select_box " id="select_box%s" style="%s">', $this->id, $this->style_box);
+        printf('<input type="button" class="smallbutton " id="%s_bt" value="%s &#x25BE;" >',
+            $this->id, $this->value);
+        printf('<input type="hidden" id="%s" name="%s" value="%s">',
+            $this->id, $this->id, $this->default_value);
+        printf('<div class="select_box " id="select_box%s" style="%s">',
+            $this->id, $this->style_box);
 
         // Show the filter if there is one, 
         if ($this->filter!="")
diff --git a/include/template/ledger_detail_bottom.php b/include/template/ledger_detail_bottom.php
index 3675ad2d1..fd22f8b40 100644
--- a/include/template/ledger_detail_bottom.php
+++ b/include/template/ledger_detail_bottom.php
@@ -14,7 +14,7 @@
 require_once NOALYSS_INCLUDE."/lib/select_box.class.php";
 
 $select_box=new \Select_Box("sb_".$jr_id, _("Autre action"));
-$select_box->set_position("in-absolute");
+$select_box->set_position("normal");
 $cn=Dossier::connect();
 // Contains all the linked actions
 $a_followup = Follow_Up::get_all_operation($jr_id);
diff --git a/scenario/select-box-test.php b/scenario/select-box-test.php
index d9dc0a916..982504509 100644
--- a/scenario/select-box-test.php
+++ b/scenario/select-box-test.php
@@ -4,15 +4,15 @@
 
     <style>
       .select_box {
-      border:solid 0.5px darkblue;
-      background:white;
-      width:455px;
-      max-width:250px;
-      padding:3px;
-      margin:0px;
-      display:none;
-      top:-17px;
-      position:absolute;
+          border:solid 0.5px darkblue;
+          background:white;
+          width:455px;
+          max-width:250px;
+          padding:3px;
+          margin:0px;
+          display:none;
+          position:absolute;
+          z-index:10;
       }
      div.select_box ul {
        list-style:none;
@@ -44,10 +44,13 @@ div.select_box a:hover,div.select_box ul li:hover {
             Le CSS est important , surtout la position, il faut qu'il soit dans 
             un élément positionné en absolu.
         </p>
+            <h2>in-absolute</h2>
         <p style="float : static">
   <?php
      require_once NOALYSS_INCLUDE.'/lib/select_box.class.php';
-     $a=new Select_Box("test","click me !");
+     $a=new Select_Box("test","position in-absolute click me !");
+     $a->set_position("in-absolute");
+
      $a->add_url("List (link)","?id=5&".Dossier::get());
      $a->add_javascript("Hello (Javascript)","alert('hello')");
      $a->add_value("Value = 10 (set value)",10);
@@ -56,10 +59,15 @@ div.select_box a:hover,div.select_box ul li:hover {
 
      echo $a->input();
      
-     ?>   
+     ?>
+        </p>
+        <h2>normal and absolute</h2>
+        <p>
      <?php
-     $a=new Select_Box("test2","click me !");
+     $a=new Select_Box("test2","position normal click me !");
      $a->set_filter(_("recherche"));
+      $a->set_position("normal");
+
      $a->add_value("Value = 10 (set value)",10);
      $a->add_value("Value = 1 (set value)",1);
      $a->add_value("Value = 17 (set value)",15);
@@ -74,7 +82,8 @@ div.select_box a:hover,div.select_box ul li:hover {
 
      echo $a->input();
      
-     ?>   
+     ?>
         </p>
+
         </div>
 </body>

From 6f1f8d562924400dc94c423b6796ed80dda94a89 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Mon, 25 Jan 2021 18:41:50 +0100
Subject: [PATCH 08/39] Improve : ANCGL , type of export mandatory

---
 include/anc_great_ledger.inc.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/anc_great_ledger.inc.php b/include/anc_great_ledger.inc.php
index 53d727df5..da412775f 100644
--- a/include/anc_great_ledger.inc.php
+++ b/include/anc_great_ledger.inc.php
@@ -45,7 +45,7 @@ if ($result != null)
         $type_pdf=new Select_Box("type_pdf",_("Type export PDF"));
         $type_pdf->add_value(_("Un seul PDF"),1);
         $type_pdf->add_value(_("Un PDF par opération"),2);
-        $type_pdf->set_position("absolute");
+        $type_pdf->set_position("in-absolute");
         echo $type_pdf->input();
 
         echo $grandLivre->button_export_pdf();
@@ -67,11 +67,16 @@ if ($result != null)
                 break;
             }
         }
+        if (document.getElementById("type_pdf").value == "-1" )
+        {
+            valid=false;
+        }
+
         if ( valid  ) {
             progress_bar_start(p_task_id,p_message);
             return true;
         } else {
-            smoke.alert("<?=_('Choisissez au moins une opération')?>");
+            smoke.alert("<?=_('Choisissez au moins une opération et le type d\'export')?>");
             return false;
         }
         

From 1666f570be5547c55aea84c4a476542bccf28055 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 26 Jan 2021 00:27:44 +0100
Subject: [PATCH 09/39] Improve : add a function for detection SQL inject

---
 include/class/fiche.class.php          |  5 +++--
 include/constant.php                   |  1 +
 include/lib/database_core.class.php    | 18 ++++++++++++++++
 unit-test/include/class/fiche.Test.php | 30 +++++++++++++++++++++++---
 4 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index e4942bb4a..b62f6d74c 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -291,10 +291,11 @@ class Fiche
      */
     function count_by_modele($p_frd_id,$p_search="",$p_sql="")
     {
-        $sql="select *
+        // Scan for SQL inject
+        $this->cn->search_sql_inject($p_sql);
              from
              fiche join fiche_Def using (fd_id)
-             where frd_id=".$p_frd_id;
+                                 where frd_id=$1 ".$p_sql
         if ( $p_search != "" )
         {
             $a=sql_string($p_search);
diff --git a/include/constant.php b/include/constant.php
index feaf0812c..55308e380 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -314,6 +314,7 @@ define ('EMAIL_LIMIT',1002);
 define ('EXC_PARAM_VALUE',1005);
 define ('EXC_PARAM_TYPE',1006);
 define ('EXC_DUPLICATE',1200);
+define ('EXC_INVALID',1400);
 define ("UNPINDG","&#xf047;");
 define ("PINDG","&#xe809;");
 
diff --git a/include/lib/database_core.class.php b/include/lib/database_core.class.php
index 2f7bc3246..d7d5cb65b 100644
--- a/include/lib/database_core.class.php
+++ b/include/lib/database_core.class.php
@@ -956,6 +956,24 @@ class DatabaseCore
     static  function nb_column($p_ret) {
         return pg_num_fields($p_ret);
     }
+    /**
+     * FInd if a SQL Select has a SQL stmt to inject or damage Data
+     * When a SELECT SQL string is build, this string could contain a SQL attempt to damage data,
+     *so the statement DELETE TRUNCATE ... are forbidden. Throw an exception EXC_INVALID
+     *
+     */
+    function search_sql_inject($p_sql)
+    {
+        $forbid_sql=array("update","delete","truncate","insert");
+        // protect against SQL inject
+        foreach ($forbid_sql as $forbid_key) {
+            if (stripos($p_sql,$forbid_key) !== false)
+            {
+                throw new Exception(_("Possible SQL inject",EXC_INVALID));
+            }
+
+        }
+    }
 
 }
 
diff --git a/unit-test/include/class/fiche.Test.php b/unit-test/include/class/fiche.Test.php
index 08e2cf425..ccd3b131a 100644
--- a/unit-test/include/class/fiche.Test.php
+++ b/unit-test/include/class/fiche.Test.php
@@ -33,7 +33,6 @@ class FicheTest extends TestCase
 
     /**
      * @covers Fiche::cmp_name
-     * @todo   Implement testCmp_name().
      */
     public function testCmp_name()
     {
@@ -45,7 +44,6 @@ class FicheTest extends TestCase
 
     /**
      * @covers Fiche::get_bk_account
-     * @todo   Implement testGet_bk_account().
      */
     public function testGet_bk_account()
     {
@@ -83,5 +81,31 @@ class FicheTest extends TestCase
         $this->assertEquals ($nb_result,3,"Size array not correct ");
         $this->assertEquals($a_result[0][24]["deb_montant"],204.71);
     }
-
+    
+    /**
+     * @covers Fiche::count_by_modele()
+     */
+    public function testCount_by_modele()
+    {
+        $nb=$this->object->count_by_modele(1,"","");
+        $this->assertEquals(4,$nb,"number of Sales Card ");
+        $nb=$this->object->count_by_modele(3,"eau","");
+        $this->assertEquals(1,$nb,"Purchase card water ");
+        $nb=$this->object->count_by_modele(3,"EAU","");
+        $this->assertEquals(1,$nb,"Purchase card water ");
+        $nb=$this->object->count_by_modele(3,"ZZ","");
+        $this->assertEquals(0,$nb,"no  card  found");
+        $nb=$this->object->count_by_modele(3000,"","");
+        $this->assertEquals(0,$nb,"no  card found");
+        $nb=$this->object->count_by_modele(3,"","");
+        $this->assertEquals(7,$nb,"Purchase cards ");
+        // attempt to inject SQL command, you must get an error
+        try {
+            $nb=@$this->object->count_by_modele(3,""," ;delete from jrn;");
+            $this->assertFalse(true,"Inject SQL command not found");
+        }  catch(Exception $e) {
+            $this->assertTrue(true,"Inject SQL command found");
+        }
+    }
+}
 }

From 1fd5f41662680373b618b4e6f2e9509ba987d976 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 26 Jan 2021 00:36:58 +0100
Subject: [PATCH 10/39] Cosmetic fix : count_by_modele

---
 html/style-classic7.css                | 11 +++++------
 include/class/fiche.class.php          |  4 +++-
 include/constant.php                   |  1 +
 include/lib/database_core.class.php    | 18 ++++++++++++++++++
 unit-test/include/class/fiche.Test.php |  8 +++-----
 5 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/html/style-classic7.css b/html/style-classic7.css
index c3612dc3b..4baeb9e06 100644
--- a/html/style-classic7.css
+++ b/html/style-classic7.css
@@ -279,16 +279,15 @@ td.mtitle {
     }
 }
 td.mtitle a.mtitle {
-    color : lightgray;
+    color : lightblue;
     display:block;
     font-size:1rem;
     font-family:OpenSansRegular;
-    /*! width:100%; */
     padding:0px;
     margin:0px;
-    height:100%;
+    height:42px;
     padding:4px 0px 0px 0px;
-    
+    border-radius:4px;
 }
 @media only screen and (max-width:1280px) {
    td.mtitle a.mtitle {
@@ -368,7 +367,7 @@ a.mtitle {
     text-decoration:none;
     display:inline;
     color: #0000FF;
-    pointer:cursor;
+    cursor: pointer;
     background-color: transparent;
 }
 a.mtitle:hover {
@@ -754,7 +753,7 @@ a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:hover  {
 }
 a#smallanchorbutton, .smallbutton, a.smallbutton,div.content a.smallbutton {
     color:#FFFFFF;
-    font-weight: bold;
+    font-weight: normal;
     text-decoration:none;
     font-family: arial,verdana,sans-serif,helvetica;
      /*! background-image: url("image/bg-submit2.gif"); */ 
diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index d6a754911..579e5fa90 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -291,6 +291,8 @@ class Fiche
      */
     function count_by_modele($p_frd_id,$p_search="",$p_sql="")
     {
+        // Scan for SQL inject
+        $this->cn->search_sql_inject($p_sql);
 
         if ( $p_search != "" )
         {
@@ -305,7 +307,7 @@ class Fiche
             $result = $this->cn->get_value("select count(*)
                                  from
                                  fiche join fiche_Def using (fd_id)
-                                 where frd_id=$1 ".sql_string($p_sql)
+                                 where frd_id=$1 ".$p_sql
                 ,[$p_frd_id]);
             return $result;
         }
diff --git a/include/constant.php b/include/constant.php
index feaf0812c..55308e380 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -314,6 +314,7 @@ define ('EMAIL_LIMIT',1002);
 define ('EXC_PARAM_VALUE',1005);
 define ('EXC_PARAM_TYPE',1006);
 define ('EXC_DUPLICATE',1200);
+define ('EXC_INVALID',1400);
 define ("UNPINDG","&#xf047;");
 define ("PINDG","&#xe809;");
 
diff --git a/include/lib/database_core.class.php b/include/lib/database_core.class.php
index 2f7bc3246..d7d5cb65b 100644
--- a/include/lib/database_core.class.php
+++ b/include/lib/database_core.class.php
@@ -956,6 +956,24 @@ class DatabaseCore
     static  function nb_column($p_ret) {
         return pg_num_fields($p_ret);
     }
+    /**
+     * FInd if a SQL Select has a SQL stmt to inject or damage Data
+     * When a SELECT SQL string is build, this string could contain a SQL attempt to damage data,
+     *so the statement DELETE TRUNCATE ... are forbidden. Throw an exception EXC_INVALID
+     *
+     */
+    function search_sql_inject($p_sql)
+    {
+        $forbid_sql=array("update","delete","truncate","insert");
+        // protect against SQL inject
+        foreach ($forbid_sql as $forbid_key) {
+            if (stripos($p_sql,$forbid_key) !== false)
+            {
+                throw new Exception(_("Possible SQL inject",EXC_INVALID));
+            }
+
+        }
+    }
 
 }
 
diff --git a/unit-test/include/class/fiche.Test.php b/unit-test/include/class/fiche.Test.php
index ae083224f..8cab78d8a 100644
--- a/unit-test/include/class/fiche.Test.php
+++ b/unit-test/include/class/fiche.Test.php
@@ -35,7 +35,6 @@ class FicheTest extends TestCase
 
     /**
      * @covers Fiche::cmp_name
-     * @todo   Implement testCmp_name().
      */
     public function testCmp_name()
     {
@@ -47,7 +46,6 @@ class FicheTest extends TestCase
 
     /**
      * @covers Fiche::get_bk_account
-     * @todo   Implement testGet_bk_account().
      */
     public function testGet_bk_account()
     {
@@ -106,10 +104,10 @@ class FicheTest extends TestCase
         $this->assertEquals(7,$nb,"Purchase cards ");
         // attempt to inject SQL command, you must get an error
         try {
-            $nb=@$this->object->count_by_modele(3,""," and 1';delete from jrn;");
-            $this->assertFalse(true,"Inject SQL command");
+            $nb=@$this->object->count_by_modele(3,""," ;delete from jrn;");
+            $this->assertFalse(true,"Inject SQL command not found");
         }  catch(Exception $e) {
-            $this->assertTrue(true,"Inject SQL command");
+            $this->assertTrue(true,"Inject SQL command found");
         }
     }
 }

From 3a194a954518f2301198525361960996a05e7e23 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 26 Jan 2021 12:29:36 +0100
Subject: [PATCH 11/39] =?UTF-8?q?Fix=20#0001277:=20<<header>>=20ne=20suppo?=
 =?UTF-8?q?rte=20pas=20caract=C3=A8res=20avec=20accent.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/class/acc_bilan.class.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/class/acc_bilan.class.php b/include/class/acc_bilan.class.php
index 51b8b5fba..a7d605af8 100644
--- a/include/class/acc_bilan.class.php
+++ b/include/class/acc_bilan.class.php
@@ -272,8 +272,8 @@ class Acc_Bilan
                 throw new Exception(_("le formulaire id n'est pas donnee"));
 
             $sql="select b_name,b_file_template,b_file_form,lower(b_type) as b_type from bilan where".
-                 " b_id = ".$this->b_id;
-            $res=$this->db->exec_sql($sql);
+                 " b_id = $1";
+            $res=$this->db->exec_sql($sql,[$this->b_id]);
 
             if ( Database::num_row($res)==0)
                 throw new Exception (_('Aucun enregistrement trouve'));
@@ -284,7 +284,7 @@ class Acc_Bilan
         }
         catch(Exception $Ex)
         {
-              record_log($e);
+            record_log($e);
             echo $Ex->getMessage();
             throw $Ex;
         }
@@ -401,7 +401,7 @@ class Acc_Bilan
         $regex="/&lt;&lt;\\$[A-Z]*[0-9]*&gt;&gt;/";
         $lt="&lt;";
         $gt="&gt;";
-	$header_txt=header_txt($this->db);
+	$header_txt=utf8_encode(header_txt($this->db));
 
         while ( !feof($p_file) )
         {
@@ -656,7 +656,8 @@ class Acc_Bilan
             ob_start();
             // save the file in a temp folder
             // create a temp directory in /tmp to unpack file and to parse it
-            $dirname=tempnam($_ENV['TMP'].DIRECTORY_SEPARATOR.'tmp','bilan_');
+            // bug PHP 7 tempnam throw a notice
+            $dirname=@tempnam($_ENV['TMP'].DIRECTORY_SEPARATOR.'tmp','bilan_');
 
 
             unlink($dirname);

From 099195eb6829b7396924f4fcc494913583de0ce1 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 26 Jan 2021 12:30:12 +0100
Subject: [PATCH 12/39] SQL upgrade

---
 include/constant.php             |   2 +-
 include/sql/patch/upgrade151.sql | 252 +++++++++++++++++++++++++++++++
 sql/upgrade.sql                  | 211 --------------------------
 unit-test/create-dossier-test.sh |   2 +-
 4 files changed, 254 insertions(+), 213 deletions(-)
 create mode 100644 include/sql/patch/upgrade151.sql

diff --git a/include/constant.php b/include/constant.php
index 55308e380..5e9302f8a 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -109,7 +109,7 @@ if ( !defined ("NOALYSS_PACKAGE_REPOSITORY")) {
 if ( ! defined ("SYSINFO_DISPLAY")) {
     define ("SYSINFO_DISPLAY",TRUE);
 }
-define ("DBVERSION",151);
+define ("DBVERSION",152);
 define ("MONO_DATABASE",25);
 define ("DBVERSIONREPO",19);
 define ('NOTFOUND','--not found--');
diff --git a/include/sql/patch/upgrade151.sql b/include/sql/patch/upgrade151.sql
new file mode 100644
index 000000000..e182000de
--- /dev/null
+++ b/include/sql/patch/upgrade151.sql
@@ -0,0 +1,252 @@
+begin;
+-- improve vw_fiche_attr
+alter table fiche add column f_enable char(1);
+update fiche set f_enable=ad_value from fiche_detail as fd1 where fd1.f_id=fiche.f_id and ad_id=54;
+alter table fiche alter f_enable set  not null;
+alter table fiche add constraint f_enable_ck  check (f_enable in ('0','1'));
+comment on column fiche.f_enable is 'value = 1 if card enable , otherwise 0 ';
+
+-- improve performance on this view
+drop index if exists fiche_detail_attr_ix;
+create index fiche_detail_attr_ix on fiche_detail (ad_id);
+
+drop view vw_fiche_attr cascade;
+
+-- add "fiche.f_enable" in the view
+create view vw_fiche_attr as SELECT a.f_id,
+                                    a.fd_id,
+                                    a.ad_value AS vw_name,
+                                    k.ad_value AS vw_first_name,
+                                    b.ad_value AS vw_sell,
+                                    c.ad_value AS vw_buy,
+                                    d.ad_value AS tva_code,
+                                    tva_rate.tva_id,
+                                    tva_rate.tva_rate,
+                                    tva_rate.tva_label,
+                                    e.ad_value AS vw_addr,
+                                    f.ad_value AS vw_cp,
+                                    j.ad_value AS quick_code,
+                                    h.ad_value AS vw_description,
+                                    i.ad_value AS tva_num,
+                                    fiche_def.frd_id,
+                                    l.ad_value AS accounting,
+                                    f_enable
+                             FROM ( SELECT fiche.f_id,
+                                           fiche.fd_id,
+                                           fiche.f_enable,
+                                           fiche_detail.ad_value
+                                    FROM fiche
+                                             LEFT JOIN fiche_detail USING (f_id)
+                                    WHERE fiche_detail.ad_id = 1) a
+                                      LEFT JOIN ( SELECT fiche_detail.f_id,
+                                                         fiche_detail.ad_value
+                                                  FROM fiche_detail
+                                                  WHERE fiche_detail.ad_id = 6) b ON a.f_id = b.f_id
+                                      LEFT JOIN ( SELECT fiche_detail.f_id,
+                                                         fiche_detail.ad_value
+                                                  FROM fiche_detail
+                                                  WHERE fiche_detail.ad_id = 7) c ON a.f_id = c.f_id
+                                      LEFT JOIN ( SELECT fiche_detail.f_id,
+                                                         fiche_detail.ad_value
+                                                  FROM fiche_detail
+                                                  WHERE fiche_detail.ad_id = 2) d ON a.f_id = d.f_id
+                                      LEFT JOIN ( SELECT fiche_detail.f_id,
+                                                         fiche_detail.ad_value
+                                                  FROM fiche_detail
+                                                  WHERE fiche_detail.ad_id = 14) e ON a.f_id = e.f_id
+                                      LEFT JOIN ( SELECT fiche_detail.f_id,
+                                                         fiche_detail.ad_value
+                                                  FROM fiche_detail
+                                                  WHERE fiche_detail.ad_id = 15) f ON a.f_id = f.f_id
+                                      LEFT JOIN ( SELECT fiche_detail.f_id,
+                                                         fiche_detail.ad_value
+                                                  FROM fiche_detail
+                                                  WHERE fiche_detail.ad_id = 23) j ON a.f_id = j.f_id
+                                      LEFT JOIN ( SELECT fiche_detail.f_id,
+                                                         fiche_detail.ad_value
+                                                  FROM fiche_detail
+                                                  WHERE fiche_detail.ad_id = 9) h ON a.f_id = h.f_id
+                                      LEFT JOIN ( SELECT fiche_detail.f_id,
+                                                         fiche_detail.ad_value
+                                                  FROM fiche_detail
+                                                  WHERE fiche_detail.ad_id = 13) i ON a.f_id = i.f_id
+                                      LEFT JOIN ( SELECT fiche_detail.f_id,
+                                                         fiche_detail.ad_value
+                                                  FROM fiche_detail
+                                                  WHERE fiche_detail.ad_id = 32) k ON a.f_id = k.f_id
+                                      LEFT JOIN tva_rate ON d.ad_value = tva_rate.tva_id::text
+                                      JOIN fiche_def USING (fd_id)
+                                      LEFT JOIN ( SELECT fiche_detail.f_id,
+                                                         fiche_detail.ad_value
+                                                  FROM fiche_detail
+                                                  WHERE fiche_detail.ad_id = 5) l ON a.f_id = l.f_id
+;
+
+create view v_detail_sale as
+WITH m AS (
+    SELECT sum(quant_sold_1.qs_price) AS htva,
+           sum(quant_sold_1.qs_vat) AS tot_vat,
+           sum(quant_sold_1.qs_vat_sided) AS tot_tva_np,
+           jrn_1.jr_id
+    FROM quant_sold quant_sold_1
+             JOIN jrnx jrnx_1 USING (j_id)
+             JOIN jrn jrn_1 ON jrnx_1.j_grpt = jrn_1.jr_grpt_id
+    GROUP BY jrn_1.jr_id
+)
+SELECT jrn.jr_id,
+       jrn.jr_date,
+       jrn.jr_date_paid,
+       jrn.jr_ech,
+       jrn.jr_tech_per,
+       jrn.jr_comment,
+       jrn.jr_pj_number,
+       jrn.jr_internal,
+       jrn.jr_def_id,
+       jrnx.j_poste,
+       jrnx.j_text,
+       jrnx.j_qcode,
+       jrn.jr_rapt,
+       quant_sold.qs_fiche AS item_card,
+       a.name AS item_name,
+       quant_sold.qs_client,
+       b.vw_name AS tiers_name,
+       b.quick_code,
+       tva_rate.tva_label,
+       tva_rate.tva_comment,
+       tva_rate.tva_both_side,
+       quant_sold.qs_vat_sided AS vat_sided,
+       quant_sold.qs_vat_code AS vat_code,
+       quant_sold.qs_vat AS vat,
+       quant_sold.qs_price AS price,
+       quant_sold.qs_quantite AS quantity,
+       quant_sold.qs_price / quant_sold.qs_quantite AS price_per_unit,
+       m.htva,
+       m.tot_vat,
+       m.tot_tva_np,
+       oc.oc_amount,
+       oc.oc_vat_amount,
+       ( SELECT currency.cr_code_iso
+         FROM currency
+         WHERE jrn.currency_id = currency.id) AS cr_code_iso
+FROM jrn
+         JOIN jrnx ON jrn.jr_grpt_id = jrnx.j_grpt
+         JOIN quant_sold USING (j_id)
+         JOIN vw_fiche_name a ON quant_sold.qs_fiche = a.f_id
+         JOIN vw_fiche_attr b ON quant_sold.qs_client = b.f_id
+         JOIN tva_rate ON quant_sold.qs_vat_code = tva_rate.tva_id
+         JOIN m ON m.jr_id = jrn.jr_id
+         LEFT JOIN operation_currency oc ON oc.j_id = jrnx.j_id;
+
+create view v_detail_purchase as
+WITH m AS (
+    SELECT sum(quant_purchase_1.qp_price) AS htva,
+           sum(quant_purchase_1.qp_vat) AS tot_vat,
+           sum(quant_purchase_1.qp_vat_sided) AS tot_tva_np,
+           jrn_1.jr_id
+    FROM quant_purchase quant_purchase_1
+             JOIN jrnx jrnx_1 USING (j_id)
+             JOIN jrn jrn_1 ON jrnx_1.j_grpt = jrn_1.jr_grpt_id
+    GROUP BY jrn_1.jr_id
+)
+SELECT jrn.jr_id,
+       jrn.jr_date,
+       jrn.jr_date_paid,
+       jrn.jr_ech,
+       jrn.jr_tech_per,
+       jrn.jr_comment,
+       jrn.jr_pj_number,
+       jrn.jr_internal,
+       jrn.jr_def_id,
+       jrnx.j_poste,
+       jrnx.j_text,
+       jrnx.j_qcode,
+       jrn.jr_rapt,
+       quant_purchase.qp_fiche AS item_card,
+       a.name AS item_name,
+       quant_purchase.qp_supplier,
+       b.vw_name AS tiers_name,
+       b.quick_code,
+       tva_rate.tva_label,
+       tva_rate.tva_comment,
+       tva_rate.tva_both_side,
+       quant_purchase.qp_vat_sided AS vat_sided,
+       quant_purchase.qp_vat_code AS vat_code,
+       quant_purchase.qp_vat AS vat,
+       quant_purchase.qp_price AS price,
+       quant_purchase.qp_quantite AS quantity,
+       quant_purchase.qp_price / quant_purchase.qp_quantite AS price_per_unit,
+       quant_purchase.qp_nd_amount AS non_ded_amount,
+       quant_purchase.qp_nd_tva AS non_ded_tva,
+       quant_purchase.qp_nd_tva_recup AS non_ded_tva_recup,
+       m.htva,
+       m.tot_vat,
+       m.tot_tva_np,
+       oc.oc_amount,
+       oc.oc_vat_amount,
+       ( SELECT currency.cr_code_iso
+         FROM currency
+         WHERE jrn.currency_id = currency.id) AS cr_code_iso
+FROM jrn
+         JOIN jrnx ON jrn.jr_grpt_id = jrnx.j_grpt
+         JOIN quant_purchase USING (j_id)
+         JOIN vw_fiche_name a ON quant_purchase.qp_fiche = a.f_id
+         JOIN vw_fiche_attr b ON quant_purchase.qp_supplier = b.f_id
+         JOIN tva_rate ON quant_purchase.qp_vat_code = tva_rate.tva_id
+         JOIN m ON m.jr_id = jrn.jr_id
+         LEFT JOIN operation_currency oc ON oc.j_id = jrnx.j_id;
+
+
+COMMENT ON VIEW vw_fiche_attr IS 'Some attribute for all cards';
+comment on view v_detail_sale is 'Summary one row by sale ';
+comment on view v_detail_purchase is 'Summary one row by purchase';
+
+-- remove
+delete from fiche_detail where ad_id=54;
+delete from attr_min  where ad_id=54;
+delete from attr_def where ad_id=54;
+delete from jnt_fic_attr where ad_id =54;
+
+
+-- open COMPANY when PARAM is choosen for profile 1
+update profile_menu set pm_default=1,p_order=1 where pm_id=54;
+
+update menu_ref set me_menu ='Nouvel achat' where me_code in ('ACH');
+update menu_ref set me_menu ='Nouvelle vente' where me_code in ('VEN');
+update menu_ref set me_menu ='Nouvelle opération' where me_code in ('ODS');
+COMMENT ON TABLE public.action_gestion_comment IS 'comment on action management';
+COMMENT ON TABLE public.action_gestion_operation IS 'Operation linked on action';
+COMMENT ON TABLE public.action_gestion_related IS 'link between action';
+COMMENT ON TABLE public.action_tags IS 'Tags link to  action';
+
+COMMENT ON TABLE public.currency IS 'currency';
+COMMENT ON TABLE public.currency_history IS 'currency values history';
+COMMENT ON TABLE public.del_action IS 'deleted actions';
+COMMENT ON TABLE public.del_jrn IS 'deleted operation';
+COMMENT ON TABLE public.del_jrnx IS 'delete operation details';
+COMMENT ON TABLE public.forecast_cat IS 'Category of forecast';
+COMMENT ON TABLE public.forecast_item IS 'items of forecast';
+COMMENT ON TABLE public.formdef IS 'Simple Report name';
+COMMENT ON TABLE public.form IS 'Simple report definition';
+COMMENT ON TABLE public.groupe_analytique IS 'Group of analytic accountancy';
+COMMENT ON TABLE public.jnt_document_option_contact IS 'Many to many table between document and contact option';
+COMMENT ON TABLE public.jnt_letter IS 'm2m tables for lettering';
+COMMENT ON TABLE public.jrn_info IS 'extra info for operation';
+COMMENT ON TABLE public.jrn_periode IS 'Period by ledger';
+COMMENT ON TABLE public.letter_cred IS 'Letter cred';
+COMMENT ON TABLE public.letter_deb IS 'letter deb';
+COMMENT ON TABLE public.menu_default IS 'default menu for certains actions';
+COMMENT ON TABLE public.menu_ref IS 'Definition of all the menu';
+COMMENT ON TABLE public.operation_currency IS 'Information about currency';
+COMMENT ON TABLE public.operation_tag IS 'Tag for operation';
+COMMENT ON TABLE public.parm_code IS 'Parameter code and accountancy';
+COMMENT ON TABLE public.profile_menu_type IS 'Type of menu';
+COMMENT ON TABLE public.quant_purchase IS 'Supplemental info for purchase';
+COMMENT ON TABLE public.stock_change IS 'Change of stock';
+COMMENT ON TABLE public.tags IS 'Tags name';
+COMMENT ON TABLE public.user_filter IS 'Filter for the search';
+COMMENT ON TABLE public.user_active_security IS 'Security for user';
+COMMENT ON TABLE public.user_sec_act IS 'Security on actions for user';
+COMMENT ON TABLE public.user_sec_jrn IS 'Security on ledger for users';
+COMMENT ON TABLE public."version" IS 'DB version';
+insert into version (val,v_description) values (152,'Comment on tables,card structure change');
+commit;
\ No newline at end of file
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index eb779b57d..e69de29bb 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -1,211 +0,0 @@
--- improve vw_fiche_attr
-alter table fiche add column f_enable char(1);
-update fiche set f_enable=ad_value from fiche_detail as fd1 where fd1.f_id=fiche.f_id and ad_id=54;
-alter table fiche alter f_enable set  not null;
-alter table fiche add constraint f_enable_ck  check (f_enable in ('0','1'));
-comment on column fiche.f_enable is 'value = 1 if card enable , otherwise 0 ';
-
--- improve performance on this view
-drop index if exists fiche_detail_attr_ix;
-create index fiche_detail_attr_ix on fiche_detail (ad_id);
-
-drop view vw_fiche_attr cascade;
-
--- add "fiche.f_enable" in the view
-create view vw_fiche_attr as SELECT a.f_id,
-    a.fd_id,
-    a.ad_value AS vw_name,
-    k.ad_value AS vw_first_name,
-    b.ad_value AS vw_sell,
-    c.ad_value AS vw_buy,
-    d.ad_value AS tva_code,
-    tva_rate.tva_id,
-    tva_rate.tva_rate,
-    tva_rate.tva_label,
-    e.ad_value AS vw_addr,
-    f.ad_value AS vw_cp,
-    j.ad_value AS quick_code,
-    h.ad_value AS vw_description,
-    i.ad_value AS tva_num,
-    fiche_def.frd_id,
-    l.ad_value AS accounting,
-   f_enable 
-   FROM ( SELECT fiche.f_id,
-            fiche.fd_id,
-            fiche.f_enable,
-            fiche_detail.ad_value
-           FROM fiche
-             LEFT JOIN fiche_detail USING (f_id)
-          WHERE fiche_detail.ad_id = 1) a
-     LEFT JOIN ( SELECT fiche_detail.f_id,
-            fiche_detail.ad_value
-           FROM fiche_detail
-          WHERE fiche_detail.ad_id = 6) b ON a.f_id = b.f_id
-     LEFT JOIN ( SELECT fiche_detail.f_id,
-            fiche_detail.ad_value
-           FROM fiche_detail
-          WHERE fiche_detail.ad_id = 7) c ON a.f_id = c.f_id
-     LEFT JOIN ( SELECT fiche_detail.f_id,
-            fiche_detail.ad_value
-           FROM fiche_detail
-          WHERE fiche_detail.ad_id = 2) d ON a.f_id = d.f_id
-     LEFT JOIN ( SELECT fiche_detail.f_id,
-            fiche_detail.ad_value
-           FROM fiche_detail
-          WHERE fiche_detail.ad_id = 14) e ON a.f_id = e.f_id
-     LEFT JOIN ( SELECT fiche_detail.f_id,
-            fiche_detail.ad_value
-           FROM fiche_detail
-          WHERE fiche_detail.ad_id = 15) f ON a.f_id = f.f_id
-     LEFT JOIN ( SELECT fiche_detail.f_id,
-            fiche_detail.ad_value
-           FROM fiche_detail
-          WHERE fiche_detail.ad_id = 23) j ON a.f_id = j.f_id
-     LEFT JOIN ( SELECT fiche_detail.f_id,
-            fiche_detail.ad_value
-           FROM fiche_detail
-          WHERE fiche_detail.ad_id = 9) h ON a.f_id = h.f_id
-     LEFT JOIN ( SELECT fiche_detail.f_id,
-            fiche_detail.ad_value
-           FROM fiche_detail
-          WHERE fiche_detail.ad_id = 13) i ON a.f_id = i.f_id
-     LEFT JOIN ( SELECT fiche_detail.f_id,
-            fiche_detail.ad_value
-           FROM fiche_detail
-          WHERE fiche_detail.ad_id = 32) k ON a.f_id = k.f_id
-     LEFT JOIN tva_rate ON d.ad_value = tva_rate.tva_id::text
-     JOIN fiche_def USING (fd_id)
-     LEFT JOIN ( SELECT fiche_detail.f_id,
-            fiche_detail.ad_value
-           FROM fiche_detail
-          WHERE fiche_detail.ad_id = 5) l ON a.f_id = l.f_id
-;
-
-create view v_detail_sale as 
- WITH m AS (
-         SELECT sum(quant_sold_1.qs_price) AS htva,
-            sum(quant_sold_1.qs_vat) AS tot_vat,
-            sum(quant_sold_1.qs_vat_sided) AS tot_tva_np,
-            jrn_1.jr_id
-           FROM quant_sold quant_sold_1
-             JOIN jrnx jrnx_1 USING (j_id)
-             JOIN jrn jrn_1 ON jrnx_1.j_grpt = jrn_1.jr_grpt_id
-          GROUP BY jrn_1.jr_id
-        )
- SELECT jrn.jr_id,
-    jrn.jr_date,
-    jrn.jr_date_paid,
-    jrn.jr_ech,
-    jrn.jr_tech_per,
-    jrn.jr_comment,
-    jrn.jr_pj_number,
-    jrn.jr_internal,
-    jrn.jr_def_id,
-    jrnx.j_poste,
-    jrnx.j_text,
-    jrnx.j_qcode,
-    jrn.jr_rapt,
-    quant_sold.qs_fiche AS item_card,
-    a.name AS item_name,
-    quant_sold.qs_client,
-    b.vw_name AS tiers_name,
-    b.quick_code,
-    tva_rate.tva_label,
-    tva_rate.tva_comment,
-    tva_rate.tva_both_side,
-    quant_sold.qs_vat_sided AS vat_sided,
-    quant_sold.qs_vat_code AS vat_code,
-    quant_sold.qs_vat AS vat,
-    quant_sold.qs_price AS price,
-    quant_sold.qs_quantite AS quantity,
-    quant_sold.qs_price / quant_sold.qs_quantite AS price_per_unit,
-    m.htva,
-    m.tot_vat,
-    m.tot_tva_np,
-    oc.oc_amount,
-    oc.oc_vat_amount,
-    ( SELECT currency.cr_code_iso
-           FROM currency
-          WHERE jrn.currency_id = currency.id) AS cr_code_iso
-   FROM jrn
-     JOIN jrnx ON jrn.jr_grpt_id = jrnx.j_grpt
-     JOIN quant_sold USING (j_id)
-     JOIN vw_fiche_name a ON quant_sold.qs_fiche = a.f_id
-     JOIN vw_fiche_attr b ON quant_sold.qs_client = b.f_id
-     JOIN tva_rate ON quant_sold.qs_vat_code = tva_rate.tva_id
-     JOIN m ON m.jr_id = jrn.jr_id
-     LEFT JOIN operation_currency oc ON oc.j_id = jrnx.j_id;
-          
-create view v_detail_purchase as          
- WITH m AS (
-         SELECT sum(quant_purchase_1.qp_price) AS htva,
-            sum(quant_purchase_1.qp_vat) AS tot_vat,
-            sum(quant_purchase_1.qp_vat_sided) AS tot_tva_np,
-            jrn_1.jr_id
-           FROM quant_purchase quant_purchase_1
-             JOIN jrnx jrnx_1 USING (j_id)
-             JOIN jrn jrn_1 ON jrnx_1.j_grpt = jrn_1.jr_grpt_id
-          GROUP BY jrn_1.jr_id
-        )
- SELECT jrn.jr_id,
-    jrn.jr_date,
-    jrn.jr_date_paid,
-    jrn.jr_ech,
-    jrn.jr_tech_per,
-    jrn.jr_comment,
-    jrn.jr_pj_number,
-    jrn.jr_internal,
-    jrn.jr_def_id,
-    jrnx.j_poste,
-    jrnx.j_text,
-    jrnx.j_qcode,
-    jrn.jr_rapt,
-    quant_purchase.qp_fiche AS item_card,
-    a.name AS item_name,
-    quant_purchase.qp_supplier,
-    b.vw_name AS tiers_name,
-    b.quick_code,
-    tva_rate.tva_label,
-    tva_rate.tva_comment,
-    tva_rate.tva_both_side,
-    quant_purchase.qp_vat_sided AS vat_sided,
-    quant_purchase.qp_vat_code AS vat_code,
-    quant_purchase.qp_vat AS vat,
-    quant_purchase.qp_price AS price,
-    quant_purchase.qp_quantite AS quantity,
-    quant_purchase.qp_price / quant_purchase.qp_quantite AS price_per_unit,
-    quant_purchase.qp_nd_amount AS non_ded_amount,
-    quant_purchase.qp_nd_tva AS non_ded_tva,
-    quant_purchase.qp_nd_tva_recup AS non_ded_tva_recup,
-    m.htva,
-    m.tot_vat,
-    m.tot_tva_np,
-    oc.oc_amount,
-    oc.oc_vat_amount,
-    ( SELECT currency.cr_code_iso
-           FROM currency
-          WHERE jrn.currency_id = currency.id) AS cr_code_iso
-   FROM jrn
-     JOIN jrnx ON jrn.jr_grpt_id = jrnx.j_grpt
-     JOIN quant_purchase USING (j_id)
-     JOIN vw_fiche_name a ON quant_purchase.qp_fiche = a.f_id
-     JOIN vw_fiche_attr b ON quant_purchase.qp_supplier = b.f_id
-     JOIN tva_rate ON quant_purchase.qp_vat_code = tva_rate.tva_id
-     JOIN m ON m.jr_id = jrn.jr_id
-     LEFT JOIN operation_currency oc ON oc.j_id = jrnx.j_id;
-          
-
-COMMENT ON VIEW vw_fiche_attr IS 'Some attribute for all cards';
-comment on view v_detail_sale is 'Summary one row by sale ';
-comment on view v_detail_purchase is 'Summary one row by purchase';
-
--- remove 
-delete from fiche_detail where ad_id=54;
-delete from attr_min  where ad_id=54;
-delete from attr_def where ad_id=54;
-delete from jnt_fic_attr where ad_id =54;
-
-
--- open COMPANY when PARAM is choosen for profile 1
-update profile_menu set pm_default=1,p_order=1 where pm_id=54;
-
diff --git a/unit-test/create-dossier-test.sh b/unit-test/create-dossier-test.sh
index 144f47113..c1484f2b9 100755
--- a/unit-test/create-dossier-test.sh
+++ b/unit-test/create-dossier-test.sh
@@ -2,7 +2,7 @@
 
 export PGCLUSTER=10/main
 DOSSIER_TEST=rel70dossier25
-FILE_TEST=dossiertest201107-1806.sql
+FILE_TEST=dossiertest210126-1111.sql
 
 dropdb $DOSSIER_TEST
 createdb $DOSSIER_TEST

From 5459b10fbe3e84712f7fd7f631879d9b87bf872c Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 26 Jan 2021 12:33:55 +0100
Subject: [PATCH 13/39] Cosmetic

---
 html/ajax_misc.php            |  2 +-
 html/js/infobulle.js          |  6 +++++-
 html/style-classic7.css       | 15 +++++++++------
 include/ajax/ajax_card.php    |  8 ++++----
 include/class/fiche.class.php |  2 +-
 include/template/menu.php     |  4 ++--
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index f0cd81541..1286976b5 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -552,7 +552,7 @@ EOF;
                 echo '<div>';
                 echo '<h1 >'.$ajrn[0]['jrn_def_name'].'</h1>';
                 if ( trim($ajrn[0]['jrn_def_description']) != "") {
-                    echo '<p style="border:1px solid;margin-top:0px">'.$ajrn[0]['jrn_def_description'].'</p>';
+                    echo '<p style="border:1px solid;margin-top:0px;padding:1rem">'.$ajrn[0]['jrn_def_description'].'</p>';
                 }
                 echo '</div>';
             }
diff --git a/html/js/infobulle.js b/html/js/infobulle.js
index f283d5ce7..bc5aa59a9 100644
--- a/html/js/infobulle.js
+++ b/html/js/infobulle.js
@@ -92,7 +92,11 @@ function displaySelectBox(p_name) {
         }
         newDiv.innerHTML=$("select_box"+p_name).innerHTML;
         var viewport = document.viewport.getDimensions();
-        newDiv.style.top=posY+"px";
+        var locPosY=posY;
+        if ( posY+offsetY+ newDiv.getHeight() > window.innerHeight -3) {
+        locPosY-=newDiv.getHeight()+20
+        }
+        newDiv.style.top=locPosY+"px";
 
         newDiv.style.left=document.getElementById(p_name+"_bt").offsetLeft+"px";
         newDiv.setStyle({display:"block",position:"absolute","z-index":999});
diff --git a/html/style-classic7.css b/html/style-classic7.css
index 4baeb9e06..331206406 100644
--- a/html/style-classic7.css
+++ b/html/style-classic7.css
@@ -353,7 +353,8 @@ td.selectedcell{
     }
 }
 .menu2 td.mtitle ,.menu2 td.selectedcell{
-    border-radius: 0px;
+    /*! border-radius: 0px; */
+    border-radius: 4px;
 }
 
 @media only screen and (max-width:955px) {
@@ -1219,7 +1220,7 @@ div.foldercontent {
     font-size:0.95rem;
     width: 95%;
     margin-left: 2.5%;
-    margin-top:7%;
+    margin-top:5rem;
 }
 
 h1.title {
@@ -1296,7 +1297,7 @@ div.menu2 a.mtitle{
     /*color: darkblue;*/
     padding:5px 0px;
     margin:0px;
-    border-radius: 5px;
+    /*! border-radius: 5px; */
     }
 div.menu2 a.mtitle:hover,div.menu a.mtitle:hover,td.mtitle a.mtitle:hover {
     /* color:#5681B7;
@@ -1308,7 +1309,7 @@ div.menu2 a.mtitle:hover,div.menu a.mtitle:hover,td.mtitle a.mtitle:hover {
     
 }
 div.menu2 a.mtitle:hover {
-    border-radius: 0px 0px;
+    /*! border-radius: 0px 0px; */
     /*! padding: 5px; */
 }
 div.menu2 table {
@@ -1540,7 +1541,8 @@ td.workday ol {
 input.inum {
     text-align:right;
     border:1px solid #0000FF;
-    margin:2px
+    margin:2px;
+    border-radius: 2px;
 }
 div.box  {
     background-color:#e4e7ed;
@@ -2264,8 +2266,9 @@ div.menu2 td.mtitle, div.menu2 td.mtitle a{
     border-style: solid;
     border-width: 0.1px;
     border-color:white;
-    height:25px;
+    height:40px;
     border-radius: 4px 4px 4px 4px;
+    /*! padding: 5px; */
 }
 div.menu2 td.mtitle a{
     border-width:0px;
diff --git a/include/ajax/ajax_card.php b/include/ajax/ajax_card.php
index ce42ebc65..9db37baeb 100644
--- a/include/ajax/ajax_card.php
+++ b/include/ajax/ajax_card.php
@@ -195,11 +195,11 @@ case 'dc':
 case 'bc':
     if ( $g_user->check_action(FICADD)==1 || $g_user->check_action(FIC)==1)
     {
-        $r=HtmlInput::title_box(_("Nouvelle fiche"), $ctl);
-	/* get cat. name */
-	$cat_name=$cn->get_value('select fd_label from fiche_def where fd_id=$1',
+	    /* get cat. name */
+	    $cat_name=$cn->get_value('select fd_label from fiche_def where fd_id=$1',
 				 array($fd_id));
-        $f=new Fiche($cn);
+        $r=HtmlInput::title_box($cat_name, $ctl);
+	        $f=new Fiche($cn);
         $r.='<form id="save_card" method="POST" onsubmit="this.ipopup=\''.$ctl.'\';save_card(this);return false;" >';
         $r.=dossier::hidden();
         $r.=(isset($ref))?HtmlInput::hidden('ref',1):'';
diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index 579e5fa90..12f7828e6 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -475,7 +475,7 @@ class Fiche
         $f=new Fiche_Def($this->cn,$p_fiche_def);
         $f->get();
         $array=$f->getAttribut();
-        $r=h2(_('Catégorie').' '.$f->label,"");
+        $r="";
         $r.='<table style="width:98%;margin:1%">';
         foreach ($array as $attr)
         {
diff --git a/include/template/menu.php b/include/template/menu.php
index ab2c2b824..74cb26144 100644
--- a/include/template/menu.php
+++ b/include/template/menu.php
@@ -35,7 +35,7 @@
 	// Display the menu
 	for($i=0;$i < count($amenu);$i++):
 	    if ( (count($amenu)==1)) {
-		$class="selectedcell";
+		$class="mtitle selectedcell";
 ?>
 	<td class="<?php echo $class?>">
             <a class="mtitle" href="do.php?gDossier=<?php echo Dossier::id()?>&ac=<?php echo $access_code?>" title="<?php echo h(gettext($amenu[$i]['me_description']))?>" >
@@ -71,7 +71,7 @@
                             $url=$a_request[0].'/'.$a_request[1];
                         }
                         $url.='/'.$amenu[$i]['me_code'];
-                        if ($url == $access_code ) $class="selectedcell";
+                        if ($url == $access_code ) $class="mtitle selectedcell";
                         $url="do.php?gDossier=".Dossier::id()."&ac=".$url;
                     }
 

From a2a31c8b3fc7e03af446c1679373aa8aa685b0f8 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Fri, 29 Jan 2021 10:50:34 +0100
Subject: [PATCH 14/39] =?UTF-8?q?New=20:=200001890:=20Avertissement=20si?=
 =?UTF-8?q?=20la=20document=20=C3=A0=20t=C3=A9l=C3=A9charger=20est=20trop?=
 =?UTF-8?q?=20gros,=20on=20ne=20peut=20soumettre=20le=20fichier?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 html/js/scripts.js                          | 45 +++++++++++++++++
 include/action.common.inc.php               |  3 +-
 include/ajax/ajax_ledger.php                | 56 ++++++++++-----------
 include/class/acc_ledger_fin.class.php      |  2 +-
 include/class/acc_ledger_purchase.class.php |  1 +
 include/class/acc_ledger_sold.class.php     |  1 +
 include/class/fiche.class.php               |  2 +-
 include/class/follow_up.class.php           |  1 +
 include/config.inc.example                  |  2 +
 include/constant.php                        |  7 ++-
 include/lib/ac_common.php                   |  2 +
 include/lib/ifile.class.php                 | 46 ++++++++++++++++-
 include/lib/message_javascript.php          |  2 +
 include/operation_ods_confirm.inc.php       |  1 +
 include/template/detail-action.php          |  9 ++++
 scenario/HtmlInput.test.php                 | 34 +++++++++++++
 16 files changed, 180 insertions(+), 34 deletions(-)

diff --git a/html/js/scripts.js b/html/js/scripts.js
index d068eaf04..04cc00b1c 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -3955,3 +3955,48 @@ var operation_tag = function (p_div)
             });
     };
 };
+
+/**
+ * Check the sum of size of all the FILES to upload
+ * @param p_object the form DOM object,
+ * @param p_max_size MAX_FILE_SIZE constant (see config.inc.php or constant.php)
+ * @returns true if the sum of filesize is greater than the limit
+ */
+function check_file_size(p_object,p_max_size)
+{
+    var sum_file=0;
+    for(var i=0;i<p_object.elements.length;i++) {
+        var a=p_object.elements[i];
+        if ( p_object.elements[i].getAttribute('type')=="file" )
+        {
+            if( p_object.elements[i].files[0]){
+
+                sum_file+=p_object.elements[i].files[0].size;
+            }
+        }
+    }
+    if ( sum_file > p_max_size) {alert_box(content[78]);return false;}
+    return true;
+}
+
+/**
+ * Check that the receipt file is not too big
+ * @see ajax_ledger.php , ledger_detail_file
+ * @param int p_max_size maximum size
+ * @param p_info name of the waiting box
+ * @returns true if  file size is less than the maximum
+ */
+function check_receipt_size(p_max_size,p_info)
+{
+    document.getElementById(p_info).style.display="inline";
+    console.debug ("param  p_max_file_size"+p_max_size);
+    var f=document.getElementById("receipt_id");
+    if ( f && f.files[0] && f.files[0].size > parseFloat(p_max_size)) {
+        document.getElementById("receipt_info_id").innerHTML=content[78];
+        document.getElementById(p_info).style.display="none";
+        return false;
+    }
+    document.getElementById("receipt_info_id").innerHTML="";
+    document.getElementById("form_file").submit();
+    return true;
+}
\ No newline at end of file
diff --git a/include/action.common.inc.php b/include/action.common.inc.php
index 4e568e55d..9c5a25e47 100644
--- a/include/action.common.inc.php
+++ b/include/action.common.inc.php
@@ -225,7 +225,8 @@ if ($sub_action == 'detail')
 	if ($g_user->can_write_action($ag_id)  == true)
 	{
             
-            echo '<form  enctype="multipart/form-data"  id="action_common_frm" class="print" action="do.php"  method="post"    style="display:inline">';
+            printf( '<form  enctype="multipart/form-data"  id="action_common_frm" class="print" action="do.php" 
+method="post"    style="display:inline" onsubmit="return check_file_size(this,%s)">',MAX_FILE_SIZE);
             echo $supl_hidden;
             echo HtmlInput::hidden('ac', $http->request('ac'));
             echo dossier::hidden();
diff --git a/include/ajax/ajax_ledger.php b/include/ajax/ajax_ledger.php
index 40cd7c486..d9ac3ec99 100644
--- a/include/ajax/ajax_ledger.php
+++ b/include/ajax/ajax_ledger.php
@@ -224,8 +224,7 @@ case 'file':
     $obj=$op->get_quant();	/* return an obj. ACH / FIN or VEN or null if nothing is found*/
     
     $repo = new Database();
-    $theme = $repo->get_value("select the_filestyle from theme where the_name=$1", array($_SESSION[SESSION_KEY.'g_theme']));
-    html_min_page_start($theme);
+    html_min_page_start($_SESSION[SESSION_KEY.'g_theme']);
 
     // if there is a receipt document
     if ( $obj->det->jr_pj_name=='')
@@ -238,7 +237,9 @@ case 'file':
         }
         if ( $access=='W')
         {
-            echo '<FORM METHOD="POST" ENCTYPE="multipart/form-data" id="form_file">';
+            $check_receipt=sprintf("check_receipt_size('%s','file%s')",
+                MAX_FILE_SIZE,$div);
+            echo '<FORM METHOD="POST" ENCTYPE="multipart/form-data" id="form_file" >';
 
             $sp=new ISpan('file'.$div);
             $sp->style="display:none;background-color:red;color:white;font-size:12px";
@@ -248,8 +249,10 @@ case 'file':
             echo dossier::hidden();
             echo HtmlInput::hidden('jr_id',$jr_id);
             echo HtmlInput::hidden('div',$div);
+            echo '<INPUT TYPE="FILE" id="receipt_id" name="pj" onchange="'.$check_receipt.'">';
+
+            echo '<p id="receipt_info_id" class="error"></p>';
 
-            echo '<INPUT TYPE="FILE" name="pj" onchange="getElementById(\'file'.$div.'\').style.display=\'inline\';submit(this);">';
             echo '</FORM>';
         }
         else
@@ -285,17 +288,20 @@ case 'file':
         {
             // Not possible to remove the file thanks a modal dialog box,
             // because of the frameset
-            $x=sprintf('<a class="smallbutton icon" style="margin-left:12;margin-right:12" href="ajax_misc.php?op=ledger&gDossier=%d&div=%s&jr_id=%s&act=rmf" onclick="return confirm(\'Effacer le document ?\')">'."x".'</a>',
-                       $gDossier,$div,$jr_id);
-            
+
+            $x=Icon_Action::trash(uniqid(),
+                sprintf("if (confirm(content[47])) {document.location.href='ajax_misc.php?op=ledger&gDossier=%d&div=%s&jr_id=%s&act=rmf'}",
+                    $gDossier,$div,$jr_id));
+
         }  
         $filename= $obj->det->jr_pj_name;
-        if ( strlen($obj->det->jr_pj_name) > 20 )
+        if ( strlen($obj->det->jr_pj_name) > 60 )
         {
-            $filename=mb_substr($obj->det->jr_pj_name,0,23);
+            $filename=mb_substr($obj->det->jr_pj_name,0,60);
         }
         echo HtmlInput::show_receipt_document($jr_id,h($filename));
         echo $x;
+        echo '<p id="receipt_info_id" class="error"></p>';
         echo '</div>';
         echo '</body></html>';
         exit();
@@ -314,29 +320,24 @@ case 'loadfile':
         // Show a link to the new file
         $op->get();
         $obj=$op->get_quant();	/* return an obj. ACH / FIN or VEN or null if nothing is found*/
-
-        echo "<html><head>";
-        $repo=new Database();
-        $theme=$repo->get_value("select the_filestyle from theme where the_name=$1",array($_SESSION[SESSION_KEY.'g_theme']));
-        echo    "   <LINK REL=\"stylesheet\" type=\"text/css\" href=\"$theme\" media=\"screen\">";
-        echo "</head>";
+        html_min_page_start($_SESSION[SESSION_KEY.'g_theme']);
 		if ( ! isset($_REQUEST['ajax']) ) echo "<body class=\"op_detail_frame\">"; else echo "<body>";
-		echo "<h2>"._("Document")."</h2>";
         echo '<div class="op_detail_frame">';
-        
+        $x="";
         // check if the user can remove a document
         if ($g_user->check_action (RMRECEIPT) == 1) {
             // Not possible to remove the file thanks a modal dialog box,
             // because of the frameset
-            $x=sprintf('<a class="mtitle" class="notice" style="margin-left:12;margin-right:12px" href="ajax_misc.php?op=ledger&gDossier=%d&div=%s&jr_id=%s&act=rmf" onclick="return confirm(\'Effacer le document ?\')">'.SMALLX.'</a>',
-                   $gDossier,$div,$jr_id);
-            echo $x;
+            $x=Icon_Action::trash(uniqid(),
+                    sprintf("if (confirm(content[47])) {document.location.href='ajax_misc.php?op=ledger&gDossier=%d&div=%s&jr_id=%s&act=rmf'}",
+                    $gDossier,$div,$jr_id));
         }
         $filename= $obj->det->jr_pj_name;
         echo HtmlInput::show_receipt_document($jr_id,h($filename));
+        echo $x;
 
         echo '</div>';
-
+        echo '</body></html>';
     }
     exit();
 /////////////////////////////////////////////////////////////////////////////
@@ -345,16 +346,14 @@ case 'loadfile':
 case 'rmf':
     if (   $access == 'W' && $g_user->check_action (RMRECEIPT) == 1)
     {
-        echo "<html><head>";
         $repo=new Database();
-        $theme=$repo->get_value("select the_filestyle from theme where the_name=$1",array($_SESSION[SESSION_KEY.'g_theme']));
-        echo    "   <LINK REL=\"stylesheet\" type=\"text/css\" href=\"$theme\" media=\"screen\">";
-        echo "</head><body class=\"op_detail_frame\">";
-		echo "<h2>"._("Document")."</h2>";
+        html_min_page_start($_SESSION[SESSION_KEY.'g_theme']);
         echo '<div class="op_detail_frame">';
+        $check_receipt=sprintf("check_receipt_size('%s','file%s')",
+            MAX_FILE_SIZE,$div);
         echo '<FORM METHOD="POST" ENCTYPE="multipart/form-data" id="form_file">';
         $sp=new ISpan('file'.$div);
-        $sp->style="display:none;width:155;height:15;background-color:red;color:white;font-size:10";
+        $sp->style="display:none;width:155px;height:15px;background-color:red;color:white;font-size:10px";
         $sp->value=_("Chargement");
         echo $sp->input();
 
@@ -363,7 +362,8 @@ case 'rmf':
         echo HtmlInput::hidden('jr_id',$jr_id);
         echo HtmlInput::hidden('div',$div);
 
-        echo '<INPUT TYPE="FILE" name="pj" onchange="getElementById(\'file'.$div.'\').style.display=\'inline\';submit(this);">';
+        echo '<INPUT TYPE="FILE" id="receipt_id" name="pj" onchange="'.$check_receipt.'">';
+        echo '<p id="receipt_info_id" class="error"></p>';
         echo '</FORM>';
         $ret=$cn->exec_sql("select jr_pj from jrn where jr_id=$1",array($jr_id));
         if (Database::num_row($ret) != 0)
diff --git a/include/class/acc_ledger_fin.class.php b/include/class/acc_ledger_fin.class.php
index 50db84369..de48fcb16 100644
--- a/include/class/acc_ledger_fin.class.php
+++ b/include/class/acc_ledger_fin.class.php
@@ -648,7 +648,7 @@ class Acc_Ledger_Fin extends Acc_Ledger
         $r.='</table>';
 		// check for upload piece
 		$file = new IFile();
-
+        $file->setAlertOnSize(true);
 		$r.="<br>"._("Ajoutez une pièce justificative")." ";
 		$r.=$file->input("pj", "");
 
diff --git a/include/class/acc_ledger_purchase.class.php b/include/class/acc_ledger_purchase.class.php
index d624af02c..a20209d4e 100644
--- a/include/class/acc_ledger_purchase.class.php
+++ b/include/class/acc_ledger_purchase.class.php
@@ -1752,6 +1752,7 @@ EOF;
         $r.='<p class="decale">';
         // check for upload piece
         $file=new IFile();
+        $file->setAlertOnSize(true);
         $file->table=0;
         $r.=_("Ajoutez une pièce justificative ");
         $r.=$file->input("pj","");
diff --git a/include/class/acc_ledger_sold.class.php b/include/class/acc_ledger_sold.class.php
index 27ec56adf..3074f76b2 100644
--- a/include/class/acc_ledger_sold.class.php
+++ b/include/class/acc_ledger_sold.class.php
@@ -988,6 +988,7 @@ EOF;
         // check for upload piece
         $file = new IFile();
         $file->table = 0;
+        $file->setAlertOnSize(true);
         $r.='<p class="decale">';
         $r.=_("Ajoutez une pièce justificative ");
         $r.=$file->input("pj", "");
diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index 12f7828e6..ba01e63a5 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -1899,7 +1899,7 @@ class Fiche
             $odd="";
              $odd  = ($i % 2 == 0 ) ? ' odd ': ' even ';
              $accounting=$tiers->strAttribut(ATTR_DEF_ACCOUNT);
-             if ( $p_action == 'bank' && $amount['debit'] <  $amount['credit']  ){
+             if ( ! empty($accounting) && $p_action == 'bank' && $amount['debit'] <  $amount['credit']  ){
                  if ( strpos($accounting,$bank->p_value)===0 || strpos($accounting,$cash->p_value)===0 || strpos($accounting,$cc->p_value)===0){
                  //put in red if c>d
                  $odd.=" notice ";
diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 1be594160..e05570689 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -401,6 +401,7 @@ class Follow_Up
         /* for new files */
         $upload=new IFile();
         $upload->name="file_upload[]";
+        $upload->setAlertOnSize(true);
         $upload->readOnly=$readonly;
         $upload->value="";
         $aAttachedFile=$this->db->get_array('select d_id,d_filename,d_description,d_mimetype,'.
diff --git a/include/config.inc.example b/include/config.inc.example
index e1be7d1be..56bbdff52 100644
--- a/include/config.inc.example
+++ b/include/config.inc.example
@@ -72,3 +72,5 @@ define ("dbname","");
 // $pdftk = /snap/bin/pdftk
 // Define a random session key if you work with different version of NOALYSS
 // define ('SESSION_KEY','abcde');
+// Max size is defined by default to 2MB, it could be also needed to modify PHP Ini file
+//    define ("MAX_FILE_SIZE",2097152);
\ No newline at end of file
diff --git a/include/constant.php b/include/constant.php
index 5e9302f8a..a76070aef 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -228,8 +228,11 @@ define ("FICHE_TYPE_ACH_SER",3);
 define ("FICHE_TYPE_ACH_MAT",7);
 define ("FICHE_TYPE_PROJET",26);
 define ("FICHE_TYPE_MATERIAL",7);
-
-/** 
+// Max size is defined by default to 2MB,
+if ( ! defined("MAX_FILE_SIZE")) {
+    define ("MAX_FILE_SIZE",2097152);
+}
+/**
  * -- pour utiliser unoconv démarrer un server libreoffice 
  * commande
  * libreoffice --headless --accept="socket,host=127.0.0.1,port=2002;urp;" --nofirststartwizard 
diff --git a/include/lib/ac_common.php b/include/lib/ac_common.php
index e4a09c26e..6f27cdf30 100644
--- a/include/lib/ac_common.php
+++ b/include/lib/ac_common.php
@@ -421,9 +421,11 @@ function html_min_page_start($p_theme="", $p_script="", $p_script2="")
     <LINK REL=\"stylesheet\" type=\"text/css\" href=\"$style\" media=\"screen\">
     <link rel=\"stylesheet\" type=\"text/css\" href=\"style-print.css\" media=\"print\">" .
     $p_script2 . "
+    <script src=\"js/prototype.js\" type=\"text/javascript\"></script>
     <script src=\"js/scripts.js\" type=\"text/javascript\"></script>
     <script src=\"js/acc_ledger.js\" type=\"text/javascript\"></script>
     <script src=\"js/smoke.js\" type=\"text/javascript\"></script>";
+    include_once NOALYSS_INCLUDE.'/lib/message_javascript.php';
     echo '</HEAD>
     ';
 
diff --git a/include/lib/ifile.class.php b/include/lib/ifile.class.php
index f5e8a3766..b952f49f4 100644
--- a/include/lib/ifile.class.php
+++ b/include/lib/ifile.class.php
@@ -25,13 +25,57 @@
 require_once NOALYSS_INCLUDE.'/lib/html_input.class.php';
 class IFile extends HtmlInput
 {
+    // if true , the size is tested and a box is displaid
+    private $alert_on_size;
+    function __construct($p_name = "", $p_value = "", $p_id = "")
+    {
+        parent::__construct($p_name, $p_value, $p_id);
+        $this->alert_on_size=false;
+    }
+
+    /**
+     * @return false
+     */
+    public function getAlertOnSize(): bool
+    {
+        return $this->alert_on_size;
+    }
+
+    /**
+     *  if true , the size is tested and a box is displaid
+     * @param false $alert_on_size
+     */
+    public function setAlertOnSize(bool $alert_on_size): void
+    {
+        $this->alert_on_size = $alert_on_size;
+    }
+
     /*!\brief show the html  input of the widget*/
     public function input($p_name=null,$p_value=null)
     {
         $this->name=($p_name==null)?$this->name:$p_name;
         $this->value=($p_value==null)?$this->value:$p_value;
         if ( $this->readOnly==true) return $this->display();
-        $r='<INPUT class="inp" TYPE="file" name="'.$this->name.'" VALUE="'.$this->value.'">';
+        if ($this->id=="") $this->id=uniqid("file_");
+        $r=sprintf('<INPUT class="inp" TYPE="file" name="%s" id="%s" value="%s">',
+            $this->name,
+            $this->id,
+            $this->value);
+        if ( $this->alert_on_size)
+        {
+            $max_size=MAX_FILE_SIZE;
+            $max_size_mb=round($max_size / 1024 /1024,2);
+            $too_large=h(_("Fichier trop grand(max = $max_size_mb MB)"));
+
+            $js_check_size=sprintf('
+            document.getElementById("%s").addEventListener("change",function () 
+            { 
+                var fFile=document.getElementById("%s");
+                if (fFile.files[0] && fFile.files[0].size>%s) { smoke.alert("%s");} 
+            });',$this->id,$this->id,$max_size,$too_large);
+            $r.=create_script($js_check_size);
+
+        }
         return $r;
 
     }
diff --git a/include/lib/message_javascript.php b/include/lib/message_javascript.php
index 74d816f30..75dd82dd6 100644
--- a/include/lib/message_javascript.php
+++ b/include/lib/message_javascript.php
@@ -109,4 +109,6 @@ content[74]="<?php echo htmlspecialchars(_('TVA due ou récupérable quand l\'op
 content[75]="<?php echo htmlspecialchars(_('Journaux Achat ou vente en mode simple, TVA ou détaillé'),ENT_QUOTES)?>";
 content[76]="<?php echo htmlspecialchars(_('Il est conseillé d\'avoir un quickcode de moins de 9 car.'),ENT_QUOTES)?>";
 content[77]="<?php echo htmlspecialchars(_("Permet de chercher dans le suivi pour les contacts multiples"),ENT_QUOTES)?>";
+<?php $file_too_large=sprintf("Fichier trop grand , taille max = %s mb",(round(MAX_FILE_SIZE/1024/1024,2)));?>
+content[78]="<?php echo htmlspecialchars($file_too_large,ENT_QUOTES)?>";
 </script>
diff --git a/include/operation_ods_confirm.inc.php b/include/operation_ods_confirm.inc.php
index e29348e5a..666d7059a 100644
--- a/include/operation_ods_confirm.inc.php
+++ b/include/operation_ods_confirm.inc.php
@@ -71,6 +71,7 @@ echo $ledger->confirm($_POST,false);
     <div id="document_div_id" style="display:none;height:185px;height:10rem">
       <?php
       $file = new IFile();
+      $file->setAlertOnSize(true);
         $file->table = 0;
         echo '<p class="decale">';
         echo _("Ajoutez une pièce justificative ");
diff --git a/include/template/detail-action.php b/include/template/detail-action.php
index b9ba1461c..78453a052 100644
--- a/include/template/detail-action.php
+++ b/include/template/detail-action.php
@@ -484,6 +484,11 @@ try {
 	docAdded=document.getElementById('add_file');
 	new_element=document.createElement('li');
 	new_element.innerHTML='<input class="inp" type="file" value="" name="file_upload[]"/><label>Description</label> <input type="input" class="input_text" name="input_desc[]" >';
+
+    new_element.innerHTML+='<span id="<?=uniqid("file")?>" onclick="document.getElementById(\'add_file\').removeChild(this.parentNode)" class="icon">&#xe80f;</span>';
+    
+    
+	
 	docAdded.appendChild(new_element);
 }
 catch(exception) { alert('<?php echo j(_('Je ne peux pas ajouter de fichier'))?>'); alert(exception.message);}
@@ -498,6 +503,10 @@ catch(exception) { alert('<?php echo j(_('Je ne peux pas ajouter de fichier'))?>
         ?>
         <label><?php echo _('Description')?></label>
         <input type="input" class="input_text" name="input_desc[]" >
+          <?php
+            $js="document.getElementById('add_file').removeChild(this.parentNode)";
+            echo Icon_Action::trash(uniqid(),$js);
+          ?>
       </li>
     </ol>
   <span   >
diff --git a/scenario/HtmlInput.test.php b/scenario/HtmlInput.test.php
index 794771e23..7abbd1233 100644
--- a/scenario/HtmlInput.test.php
+++ b/scenario/HtmlInput.test.php
@@ -125,6 +125,40 @@ $http=new HttpInput();
     ?>
     </ol>
 </form>
+<h2>
+    Fichier - IFile
+</h2>
+<form method="POST" enctype="application/x-www-form-urlencoded" onsubmit="check_size();return false;">
+
+<?php
+
+    $file=new IFILE("file_to_upload");
+    $file->id="file_to_upload";
+    echo "fichier ",$file->input();
+    echo HtmlInput::submit("file","Upload");
+?>
+</form>
+<script>
+    function check_size()
+    {
+        var aFile=document.getElementsByTagName("input");
+        console.debug("afile");
+        console.debug(aFile);
+
+        for (var i = 0;i < aFile.length;i++) {
+        if ( aFile[i].getAttribute("type")=="file" ) {
+                console.debug("file"+aFile[i].files[0].size);
+        }
+
+    }
+    }
+    document.getElementById("file_to_upload").addEventListener("change",function() {
+
+        if ( this.files[0] ) {
+            console.debug("file"+this.files[0].size);
+        }
+    });
+</script>
 <div id="debug_box"></div>
 
     
\ No newline at end of file

From d13d29f623581450d4c8abde7a3a4f8d1864311c Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Fri, 29 Jan 2021 12:20:53 +0100
Subject: [PATCH 15/39] =?UTF-8?q?New=200001893:=20Date=20remplacement=20au?=
 =?UTF-8?q?to=20des=20s=C3=A9parateurs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 html/js/scripts.js          | 10 ++++++++++
 include/lib/idate.class.php |  9 ++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/html/js/scripts.js b/html/js/scripts.js
index 04cc00b1c..5fce465d8 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -330,6 +330,16 @@ function format_number(obj, p_prec)
 
     $(obj).value = value;
 }
+
+/**
+ * Replace slash and minus by dot
+ * @param p_object
+ */
+function format_date(p_object)
+{
+    p_object.value=p_object.value.replace(/\//g,'.');
+    p_object.value=p_object.value.replace(/-/g,'.');
+}
 /**
  *@brief check if the object is hidden or show and perform the opposite,
  * show the hidden obj or hide the shown one
diff --git a/include/lib/idate.class.php b/include/lib/idate.class.php
index 8eab4fdbc..7d9d8a322 100644
--- a/include/lib/idate.class.php
+++ b/include/lib/idate.class.php
@@ -132,7 +132,7 @@ class IDate extends HtmlInput
             return $this->display();
         if ($this->id=="")             $this->id=self::generate_id($this->name);
         $autofocus=($this->autofocus)?" autofocus ":"";
-        
+        $onchange='onchange="format_date(this)"';
         $r=sprintf('
             <input type="text" name="%s" id="%s" 
                  class="input_text" 
@@ -140,14 +140,17 @@ class IDate extends HtmlInput
                  value ="%s" 
                  placeholder="%s"
                  title="%s"
-                 pattern="[0-9]{1,2}.[0-9]{1,2}.[0-9]{4}"
+                 pattern="[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{4}"
+                 %s
                 />
                 <span  class="smallbutton icon"
                 id="%s_trigger"
                 />
                 &#xe811;
                 </span>
-                ',$this->name,$this->id,$this->value,$this->placeholder,$this->title,$this->id
+                ',$this->name,$this->id,$this->value,$this->placeholder,$this->title,
+                $onchange,
+                $this->id
                 );
         // @see calendar-setup.js
         $r.=sprintf('<script type="text/javascript">

From 63ee59fcf41e1af204b6c6614fe1484e42c450e9 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sun, 31 Jan 2021 22:39:41 +0100
Subject: [PATCH 16/39] Fix: bug in gettext function

---
 include/class/acc_ledger.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/class/acc_ledger.class.php b/include/class/acc_ledger.class.php
index ce5ef0536..2fa5e9831 100644
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@ -1087,7 +1087,7 @@ class Acc_Ledger  extends jrn_def_sql
                 throw new Exception(
                         sprintf ( 
                                 _('Vous utilisez le mode strict la dernière operation est la date du %s
-                vous ne pouvez pas encoder à une date antérieure',$last_date)),
+                vous ne pouvez pas encoder à une date antérieure'),$last_date),
                 15);
         }
 

From cd6ddfc78e5d18e18fea065f5b8a8c12cd562736 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 2 Feb 2021 17:36:48 +0100
Subject: [PATCH 17/39] ICard Improve doc and test

---
 include/lib/icard.class.php | 49 ++++++++++++++++++++++++++++++++++---
 scenario/HtmlInput.test.php | 11 +++++++++
 2 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/include/lib/icard.class.php b/include/lib/icard.class.php
index f1dc2367f..e0c171d88 100644
--- a/include/lib/icard.class.php
+++ b/include/lib/icard.class.php
@@ -120,7 +120,45 @@ require_once NOALYSS_INCLUDE.'/lib/function_javascript.php';
 
 class ICard extends HtmlInput
 {
-
+    //!< $fct ,by default it is update_value called BEFORE the querystring is send
+    var $fct;
+    
+    //!< $dblclick action if double click
+    var $dblclick;
+    
+    //!< $callback , 
+    var $callback;
+    
+    //!< $choice 
+    var $choice;
+    
+    //!< $indicator, text displaid when searching
+    var $indicator;
+    
+    //!< $choice_create 1 , display a (+) button , default 1
+    var $choice_create;
+    
+    //!< $autocomplete : 1 enable - 0 disable
+    var $autocomplete;
+    
+    //!< $style supplemental CSS 
+    var $style='  ';
+    
+    //!< $accvis account_visible =1 otherwise 0, default 1
+    var $accvis; 
+    
+    //!< $limit Max of row show
+    var $limit;
+    
+    //!< $amount_from_type : accountancy , sell or purchase price
+    var $amount_from_type;
+    
+    //!< $typecard : type of card
+    var $typecard;
+    
+    //!< $autocomplete_file , ajax file used for autocompletion (see Ajax.Autocompleter)
+    private $autocomplete_file;
+    
     function __construct($name="", $value="", $p_id="")
     {
         parent::__construct($name, $value);
@@ -137,6 +175,8 @@ class ICard extends HtmlInput
         $this->accvis=1; //!< account_visible =1 otherwise 0
         $this->limit=12; //!< Max of row show
         $this->amount_from_type=''; //!< in the follow up ,when a card is selected you take Prix Vente or Prix Achat 
+        $this->typecard='all';
+        $this->autocomplete_file="fid_card.php";
     }
    
     /**
@@ -155,7 +195,8 @@ class ICard extends HtmlInput
     }
 
   
-    /**\brief set the javascript callback function
+    /**
+     * \brief set the javascript callback function
      * by default it is update_value called BEFORE the querystring is send
      *
      * \param $p_name callback function name
@@ -256,12 +297,12 @@ class ICard extends HtmlInput
 
             $query=http_build_query([ 'gDossier'=>Dossier::id(),'e'=>$this->typecard,'limit'=>$this->limit]);
             
-            $javascript=sprintf('try { new Ajax.Autocompleter("%s","%s","fid_card.php?%s",'.
+            $javascript=sprintf('try { new Ajax.Autocompleter("%s","%s","%s?%s",'.
                     '{paramName:"FID",minChars:1,indicator:%s, '.
                     'callback:%s, '.
                     'limit:%s,'.
                     ' afterUpdateElement:%s});} catch (e){alert(e.message);};',
-                    $this->id, $this->choice, $query, $this->indicator,
+                    $this->id, $this->choice, $this->autocomplete_file,$query, $this->indicator,
                     $this->callback, $this->limit, $this->fct);
 
             $javascript=create_script($javascript.$this->dblclick);
diff --git a/scenario/HtmlInput.test.php b/scenario/HtmlInput.test.php
index 7abbd1233..54675cb38 100644
--- a/scenario/HtmlInput.test.php
+++ b/scenario/HtmlInput.test.php
@@ -135,9 +135,12 @@ $http=new HttpInput();
     $file=new IFILE("file_to_upload");
     $file->id="file_to_upload";
     echo "fichier ",$file->input();
+    
     echo HtmlInput::submit("file","Upload");
 ?>
+    <p>Vérifier le changement de taille fichier dans la console JS</p>
 </form>
+
 <script>
     function check_size()
     {
@@ -159,6 +162,14 @@ $http=new HttpInput();
         }
     });
 </script>
+<h2>ICArd</h2>
+<h3>Aucun param suppl.</h3>
+<?php
+    $icard=new ICard("test");
+    echo $icard->input();
+    echo $icard->search();
+?>
+    
 <div id="debug_box"></div>
 
     
\ No newline at end of file

From ce18adbf491417b33feb91e6feacdf1cae587fad Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 3 Feb 2021 17:13:50 +0100
Subject: [PATCH 18/39] =?UTF-8?q?New=20:=20Task=20#1894:=20Gestion=20:=20a?=
 =?UTF-8?q?jout=20un=20champs=20param=C3=A9trable=20pour=20videoconf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../action_document_type_mtable.class.php     | 17 +++++++++
 include/class/document_option.class.php       | 35 ++++++++++++++++++-
 include/constant.php                          |  5 ++-
 include/sql/patch/upgrade152.sql              |  7 ++++
 .../action_document_type_mtable_input.php     | 14 +++++++-
 include/template/detail-action.php            | 15 +++++++-
 6 files changed, 89 insertions(+), 4 deletions(-)
 create mode 100644 include/sql/patch/upgrade152.sql

diff --git a/include/class/action_document_type_mtable.class.php b/include/class/action_document_type_mtable.class.php
index 574d8ac29..3443c6a84 100644
--- a/include/class/action_document_type_mtable.class.php
+++ b/include/class/action_document_type_mtable.class.php
@@ -85,6 +85,8 @@ class Action_Document_Type_MTable extends Manage_Table_SQL
         $this->other['seq']=$http->request("seq", "string", 0);
         $this->other['select_option_operation']=$http->request("select_option_operation", "string", null);
         $this->other['select_comment']=$http->request("select_comment", "string", null);
+        $this->other['videoconf_server']=$http->request('videoconf_server',"string",0);
+        $this->other['videoconf_server_url']=$http->request('videoconf_server_url',"string",DEFAULT_SERVER_VIDEO_CONF);
         $this->other["cor_id"]=$http->request("cor_id","array",[]);
         $nb_corid=count($this->other["cor_id"]);
         $http->set_empty(0);
@@ -126,7 +128,9 @@ class Action_Document_Type_MTable extends Manage_Table_SQL
             $error++;
         }
         if ($error>0)
+        {
             return false;
+        }
         return true;
     }
 
@@ -278,6 +282,19 @@ class Action_Document_Type_MTable extends Manage_Table_SQL
                         $this->other['followup_comment'],
                         $this->other['select_comment']
                     ]);
+            
+        // Save videoconf setting
+        if ( $this->other['videoconf_server'] == 1 && trim($this->other['videoconf_server_url'])=="") {
+            $this->other['videoconf_server_url']=DEFAULT_SERVER_VIDEO_CONF;
+        }
+        $cn->exec_sql("insert into document_option (do_code,document_type_id,do_enable,do_option) values ($1,$2,$3,$4) 
+                on conflict on constraint document_option_un
+                do update set do_enable=$3,do_option=$4 ", 
+                    [   "videoconf_server", 
+                        $object_sql->dt_id, 
+                        $this->other['videoconf_server'],
+                        $this->other['videoconf_server_url']
+                    ]);
         
         // Option contact to save
         $cn->exec_sql("delete from jnt_document_option_contact where document_type_id=$1",[$object_sql->dt_id]);
diff --git a/include/class/document_option.class.php b/include/class/document_option.class.php
index 30630b21d..d515a51ba 100644
--- a/include/class/document_option.class.php
+++ b/include/class/document_option.class.php
@@ -162,5 +162,38 @@ class Document_Option
         }
         return $return;
     }
-
+    
+     /**
+     * returns true there is a videoconf enable
+     * 
+     * @param int $p_document_type Document_Type.dt_id
+     * @return boolean
+     */
+    static function is_enable_video_conf ($p_document_type)
+    {
+         $return=false;
+        $cn=Dossier::connect();
+        if ($cn->get_value("select do_enable from document_option where document_type_id=$1 and do_code = $2",
+                        [$p_document_type, 'videoconf_server'])=='1')
+        {
+            $return=true;
+        }
+        return $return;
     }
+    
+     /**
+     * returns the videoconf server
+     * 
+     * @param int $p_document_type Document_Type.dt_id
+     * @return string with url to videoconf server
+     */
+    static function option_video_conf($p_document_type)
+    {
+        $cn=Dossier::connect();
+        $option_operation = $cn->get_value("select do_option from document_option where document_type_id=$1 "
+                . " and do_code = $2",
+                        [$p_document_type, 'videoconf_server']);
+        return $option_operation;
+    }
+
+}
diff --git a/include/constant.php b/include/constant.php
index a76070aef..d4513b0f6 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -109,7 +109,7 @@ if ( !defined ("NOALYSS_PACKAGE_REPOSITORY")) {
 if ( ! defined ("SYSINFO_DISPLAY")) {
     define ("SYSINFO_DISPLAY",TRUE);
 }
-define ("DBVERSION",152);
+define ("DBVERSION",153);
 define ("MONO_DATABASE",25);
 define ("DBVERSIONREPO",19);
 define ('NOTFOUND','--not found--');
@@ -334,3 +334,6 @@ if ( ! defined ("NOALYSS_URL")) {
             dirname($_SERVER['PHP_SELF']);
     define ("NOALYSS_URL",$base);
 }
+if (!defined ("DEFAULT_SERVER_VIDEO_CONF")) {
+    define ("DEFAULT_SERVER_VIDEO_CONF","https://www.free-solutions.org/");
+}
\ No newline at end of file
diff --git a/include/sql/patch/upgrade152.sql b/include/sql/patch/upgrade152.sql
new file mode 100644
index 000000000..5f93e8b60
--- /dev/null
+++ b/include/sql/patch/upgrade152.sql
@@ -0,0 +1,7 @@
+begin;
+insert into document_option (do_code,document_type_id,do_enable,do_option) 
+    select 'videoconf_server',dt_id,'1','https://www.free-solutions.org/' 
+    from 
+document_type;
+insert into version (val,v_description) values (153,'Add videoconf server');
+commit;
\ No newline at end of file
diff --git a/include/template/action_document_type_mtable_input.php b/include/template/action_document_type_mtable_input.php
index 455036667..8a2ed0bc1 100644
--- a/include/template/action_document_type_mtable_input.php
+++ b/include/template/action_document_type_mtable_input.php
@@ -119,7 +119,19 @@ echo $select_comment_type->input();
 ?>
         </li> 
     </ul>
-
+    <li>
+        <?php
+        $i=new ICheckBox("videoconf_server",1);
+        $checked = (Document_Option::is_enable_video_conf($table->dt_id)==true) ?1:0;
+        $i->set_check($checked);
+        
+        echo $i->input();
+        echo _("Serveur de videoconf");
+        $itVideoconfServer=new IText("videoconf_server_url");
+        $itVideoconfServer->value=Document_Option::option_video_conf($table->dt_id);
+        echo $itVideoconfServer->input();
+        ?>
+    </li>
 </div>
 <div>
      <h3 class="info" sytle="margin-block: 4px"><?php echo _("Options contact") ?></h3>
diff --git a/include/template/detail-action.php b/include/template/detail-action.php
index 78453a052..9d59d6851 100644
--- a/include/template/detail-action.php
+++ b/include/template/detail-action.php
@@ -62,12 +62,25 @@ $uniq=uniqid("tab",TRUE);
             ?>
           </td>
           </Tr>
+<?php 
+//----------------------- Video Conf --------------------------------------------------------------------------------
+if (Document_Option::is_enable_video_conf($this->dt_id)):?>          
+          <tr>
+              <td><?=_("VideoConf")?></td>
+              <td><A href="<?=Document_Option::option_video_conf($this->dt_id)?>" target="_blank">
+    <?=_("Salle de réunion")?>
+                  </a>
+          </tr>
+<?php endif;?>          
 	<tr>
           <TD colspan="2">
              <?php echo $spcontact->input(); ?>
           </td>
           </Tr>
-          <?php if ($this->ag_id > 0 && Document_Option::is_enable_contact_multiple($this->dt_id)): ?>
+<?php 
+//----------------------- Contact Multiple ----------------------------------------------------------------------------
+if ($this->ag_id > 0 && Document_Option::is_enable_contact_multiple($this->dt_id)): 
+    ?>
           <tr>
               <td>
                   <?php echo _('Autres concernés')?>

From 9b70b9dc5765a128be4a58d83f5038725cc9d765 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 3 Feb 2021 18:03:11 +0100
Subject: [PATCH 19/39] Set Version 8.1 + logo + bug SQL script 151

---
 doc/developper/Doxyfile                   |   2 +-
 html/image/{logo8000.png => logo8100.png} | Bin 36368 -> 35588 bytes
 html/index.php                            |   2 +-
 html/install.php                          |   2 +-
 html/style-classic7.css                   |   1 +
 include/sql/patch/upgrade151.sql          |   1 +
 6 files changed, 5 insertions(+), 3 deletions(-)
 rename html/image/{logo8000.png => logo8100.png} (51%)

diff --git a/doc/developper/Doxyfile b/doc/developper/Doxyfile
index bbe229171..766c242a6 100644
--- a/doc/developper/Doxyfile
+++ b/doc/developper/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = noalyss
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = Version-7.2
+PROJECT_NUMBER         = Version-8.1
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
diff --git a/html/image/logo8000.png b/html/image/logo8100.png
similarity index 51%
rename from html/image/logo8000.png
rename to html/image/logo8100.png
index ee5fc4bda583a521caad1eeb25b9faee0fd55e4d..da1ccdf25f7b25f4345721b86397d6f7865910ce 100644
GIT binary patch
delta 17046
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

delta 17832
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
GGywo0hjWMk

diff --git a/html/index.php b/html/index.php
index b6ce4ccb4..c8b8b65bd 100644
--- a/html/index.php
+++ b/html/index.php
@@ -191,7 +191,7 @@ if (isset ($_REQUEST['reconnect']) && isset ($_REQUEST['backurl'])) {
 }
 echo '
 
-<IMG SRC="image/logo8000.png" id="logo_id" alt="NOALYSS">
+<IMG SRC="image/logo8100.png" id="logo_id" alt="NOALYSS">
 <form id="login_frm" action="login.php" method="post" name="loginform">'.
         '<h1>Noalyss</h1>'.
        $goto .
diff --git a/html/install.php b/html/install.php
index 7e4ff5d8f..a01059dae 100644
--- a/html/install.php
+++ b/html/install.php
@@ -83,7 +83,7 @@
 </head>
 <body>
 <p align="center">
-  <IMG SRC="image/logo8000.png" style="width: 30%;z-index:-1;position:fixed;top:30%;margin-left: 20%;opacity: 0.2" alt="NOALYSS">
+  <IMG SRC="image/logo8100.png" style="width: 30%;z-index:-1;position:fixed;top:30%;margin-left: 20%;opacity: 0.2" alt="NOALYSS">
 </p>
 <h1>NOALYSS : comptabilité - accountancy </h1>
 
diff --git a/html/style-classic7.css b/html/style-classic7.css
index 331206406..5b9d1852d 100644
--- a/html/style-classic7.css
+++ b/html/style-classic7.css
@@ -2304,6 +2304,7 @@ div.bxbutton .icon
     border:0px;
     height: 18px;
     color: #f0d19a;
+    font-size: 87%;
 }
 div.bxbutton .icon:hover
 {
diff --git a/include/sql/patch/upgrade151.sql b/include/sql/patch/upgrade151.sql
index e182000de..3ba6e77f0 100644
--- a/include/sql/patch/upgrade151.sql
+++ b/include/sql/patch/upgrade151.sql
@@ -2,6 +2,7 @@ begin;
 -- improve vw_fiche_attr
 alter table fiche add column f_enable char(1);
 update fiche set f_enable=ad_value from fiche_detail as fd1 where fd1.f_id=fiche.f_id and ad_id=54;
+update fiche set f_enable='1' where f_enable is null;
 alter table fiche alter f_enable set  not null;
 alter table fiche add constraint f_enable_ck  check (f_enable in ('0','1'));
 comment on column fiche.f_enable is 'value = 1 if card enable , otherwise 0 ';

From 7fd114a8ecf9ad173a049142450f755652d0db56 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 3 Feb 2021 18:17:22 +0100
Subject: [PATCH 20/39] Place of recover_link

---
 html/index.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/html/index.css b/html/index.css
index 313560e97..437daa09a 100644
--- a/html/index.css
+++ b/html/index.css
@@ -228,9 +228,9 @@ BODY {
         width: 24rem;
     }
     #recover_link {
-        position:absolute;
-        top:397px;
+        position:fixed;
         left:539px;
+        bottom:2px;
         background-color: white;
         width:auto;
         
@@ -274,9 +274,9 @@ BODY {
         width: 24rem;
     }
     #recover_link {
-        position:absolute;
-        top:55%;
+        position:fixed;
         left:55%;
+        bottom:20px;
         background-color: white;
         margin-top:0px;
     }

From bd6775e4c52f94735de213e86b36e86e0fe06435 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 4 Feb 2021 14:14:52 +0100
Subject: [PATCH 21/39] Fix : Menu problem when 2 duplicate menus

---
 html/do.php | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/html/do.php b/html/do.php
index 2b677236c..bd80cfb75 100644
--- a/html/do.php
+++ b/html/do.php
@@ -254,29 +254,20 @@ if (isset($_REQUEST['ac']))
       pm_id_v3,pm_id_v2,pm_id_v1
     from v_menu_profile where code= upper($1)  and p_id=$2',
             array($AC,$user_profile));
-    
 
     try {        
-        if ( count($amenu_id) != 1 ) {
-            // if AC is a simple code and this menu can be accessed 
-            // we should find the first menu which used it and change the
-            // request AC to it
-            $pm_id=$cn->get_array('select pm_id from profile_menu '
-                    . ' where lower(me_code)=lower($1) and p_id=$2',
-                    array($AC,$user_profile));
-            if ( count($pm_id) > 0 ) {
-                show_menu($pm_id[0]['pm_id']);
-                return;
-            } else {
-                throw new Exception(_('Erreur menu'),10);
-            }
+        if (count($amenu_id) == 0 ) { throw new Exception(_('Erreur menu'),10);}
+        if ( count($amenu_id)> 1)     {
+            $tmp=$amenu_id[0];
+            $amenu_id=[];
+            $amenu_id[0]=$tmp;
         }
         $amenu_id=complete_default_menu($amenu_id,$user_profile);
     
         $AC=rebuild_access_code($amenu_id);
     
         put_global(array(array("key"=>"ac","value"=>$AC)));        
-        $module_id=$cn->get_value('select 
+        $module_id=$cn->get_value('select distinct
             case when pm_id_v3 = 0 then (case when pm_id_v2 = 0 then pm_id_v1 else pm_id_v2 end) else pm_id_v3 end 
             from 
             v_menu_profile 

From b29076e4a7218c7dec058aabe937b6af8662b97c Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 4 Feb 2021 14:15:15 +0100
Subject: [PATCH 22/39] Compatibility PHP7.0

---
 include/lib/ifile.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/lib/ifile.class.php b/include/lib/ifile.class.php
index b952f49f4..5abcb8bb7 100644
--- a/include/lib/ifile.class.php
+++ b/include/lib/ifile.class.php
@@ -36,7 +36,7 @@ class IFile extends HtmlInput
     /**
      * @return false
      */
-    public function getAlertOnSize(): bool
+    public function getAlertOnSize()
     {
         return $this->alert_on_size;
     }
@@ -45,7 +45,7 @@ class IFile extends HtmlInput
      *  if true , the size is tested and a box is displaid
      * @param false $alert_on_size
      */
-    public function setAlertOnSize(bool $alert_on_size): void
+    public function setAlertOnSize(bool $alert_on_size)
     {
         $this->alert_on_size = $alert_on_size;
     }

From 06d51c0abbabbc85f85d34dbf0c624cb3b325635 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 4 Feb 2021 15:51:51 +0100
Subject: [PATCH 23/39] Bug = if double click on a card returns nothing

---
 include/ajax/ajax_card.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/ajax/ajax_card.php b/include/ajax/ajax_card.php
index 9db37baeb..809ac727e 100644
--- a/include/ajax/ajax_card.php
+++ b/include/ajax/ajax_card.php
@@ -113,7 +113,12 @@ case 'dc':
     $qcode=$http->request("qcode","string",false);
     // if there is no qcode then try to find it thanks the card id
     if ( $qcode == false ){
-        $f->id=$http->get("f_id","number");
+        $f->id=$http->get("f_id","number","0");
+        if ( $f->id==0) {
+            $html=HtmlInput::title_box(_("Fiche"), $ctl,"close","","y");
+            $html.='<h2 class="error">'._('Aucune fiche demandée').'</h2>';
+            break;
+        }
         $qcode=$f->get_quick_code();
     } else {
         $f->get_by_qcode($qcode);

From ee543225e7bbef065073c91092e86f51b79e9c04 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 4 Feb 2021 15:59:45 +0100
Subject: [PATCH 24/39] cosmetic : position inner_box on larger screen

---
 html/js/card.js         |  3 ++-
 html/style-classic7.css | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/html/js/card.js b/html/js/card.js
index 428c38426..d5e334e9d 100644
--- a/html/js/card.js
+++ b/html/js/card.js
@@ -596,7 +596,8 @@ function fill_ipopcard(obj)
     if ( nTop > 300 ) {
         nTop=170;
     }
-    var str_top=fixed_position(250,nTop)
+    var str_top="top:"+calcy(nTop)+"px";
+
     var str_style=str_top+";width:45em;height:auto;position:absolute";
 
     var popup={'id':  content,'cssclass':'inner_box','style':str_style,'html':loading(),'drag':false};
diff --git a/html/style-classic7.css b/html/style-classic7.css
index 5b9d1852d..daefc5af6 100644
--- a/html/style-classic7.css
+++ b/html/style-classic7.css
@@ -917,7 +917,7 @@ div.inner_box  {
     overflow:hidden;
     z-index:3;
     position:absolute;
-    left:10%;
+    left : 5px;
     border:1px solid #00008B;
 -moz-box-shadow: 10px 10px 5px #888;
 /*! -webkit-box-shadow: 10px 10px 5px #888; */
@@ -933,6 +933,7 @@ div.inner_box  {
     width: 85%;
      border-radius: 9px; 
     /*! padding: 5px; */
+    left:10%;
     }
 }
 div.op_detail_title {
@@ -1804,13 +1805,12 @@ li.highlight a,tr.highlight a{
     color: inherit;
 }
 /*******************************************************************************
- * Inner_box on a smaller screen
+ * Inner_box on a larger screen
  *******************************************************************************/
 @media only screen and (min-width: 1280px) {
     div.inner_box  {
-        width: 95%;
-        left:2%;
-        /*! margin-bottom: 2%; */
+        width: 75%;
+        left:5%;
         padding-bottom: 10px;
         }
 }

From 79ecb68033507be4d8679082a260734e3fe22939 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Fri, 5 Feb 2021 15:57:13 +0100
Subject: [PATCH 25/39] We split Database in DatabaseCore and Database

---
 include/database/attr_def_sql.class.php           | 2 +-
 include/database/contact_option_ref_sql.class.php | 2 +-
 include/database/document_state_sql.class.php     | 2 +-
 include/database/document_type_sql.class.php      | 2 +-
 include/database/fiche_def_ref_sql.class.php      | 2 +-
 include/database/jrn_def_sql.class.php            | 2 +-
 include/database/jrn_periode_sql.class.php        | 2 +-
 include/database/menu_ref_sql.class.php           | 2 +-
 include/database/op_predef_sql.class.php          | 2 +-
 include/database/parm_periode_sql.class.php       | 2 +-
 include/database/payment_method_sql.class.php     | 2 +-
 include/database/poste_analytique_sql.class.php   | 2 +-
 include/database/tag_group_sql.class.php          | 2 +-
 include/database/tva_rate_sql.class.php           | 2 +-
 include/database/user_filter_sql.class.php        | 2 +-
 include/database/v_tva_rate_sql.class.php         | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/include/database/attr_def_sql.class.php b/include/database/attr_def_sql.class.php
index 450a1203a..c4160b6c7 100644
--- a/include/database/attr_def_sql.class.php
+++ b/include/database/attr_def_sql.class.php
@@ -29,7 +29,7 @@ require_once NOALYSS_INCLUDE.'/class/database.class.php';
 class Attr_def_SQL extends Noalyss_SQL
 {
 
-    function __construct(Database $p_cn, $p_id=-1)
+    function __construct(DatabaseCore $p_cn, $p_id=-1)
     {
         $this->table="public.attr_def";
         $this->primary_key="ad_id";
diff --git a/include/database/contact_option_ref_sql.class.php b/include/database/contact_option_ref_sql.class.php
index 5e3906094..969235f08 100644
--- a/include/database/contact_option_ref_sql.class.php
+++ b/include/database/contact_option_ref_sql.class.php
@@ -31,7 +31,7 @@ require_once NOALYSS_INCLUDE.'/class/database.class.php';
 class Contact_option_ref_SQL extends Noalyss_SQL
 {
 
-    function __construct(Database $p_cn, $p_id=-1)
+    function __construct(DatabaseCore $p_cn, $p_id=-1)
     {
         $this->table="public.contact_option_ref";
         $this->primary_key="cor_id";
diff --git a/include/database/document_state_sql.class.php b/include/database/document_state_sql.class.php
index 8b6ae7fc2..a4fbef988 100644
--- a/include/database/document_state_sql.class.php
+++ b/include/database/document_state_sql.class.php
@@ -29,7 +29,7 @@ require_once NOALYSS_INCLUDE.'/class/database.class.php';
 class Document_State_SQL extends Noalyss_SQL
 {
 
-    function __construct(Database $p_cn, $p_id=-1)
+    function __construct(DatabaseCore $p_cn, $p_id=-1)
     {
         $this->table="public.document_state";
         $this->primary_key="s_id";
diff --git a/include/database/document_type_sql.class.php b/include/database/document_type_sql.class.php
index cd493e3aa..36e2d5b36 100644
--- a/include/database/document_type_sql.class.php
+++ b/include/database/document_type_sql.class.php
@@ -35,7 +35,7 @@ require_once NOALYSS_INCLUDE.'/class/database.class.php';
 class Document_type_SQL extends Noalyss_SQL
 {
 
-    function __construct(Database $p_cn, $p_id=-1)
+    function __construct(DatabaseCore $p_cn, $p_id=-1)
     {
         $this->table="public.document_type";
         $this->primary_key="dt_id";
diff --git a/include/database/fiche_def_ref_sql.class.php b/include/database/fiche_def_ref_sql.class.php
index c952648c4..c895dde4a 100644
--- a/include/database/fiche_def_ref_sql.class.php
+++ b/include/database/fiche_def_ref_sql.class.php
@@ -34,7 +34,7 @@ require_once NOALYSS_INCLUDE.'/class/database.class.php';
 class Fiche_def_ref_SQL extends Noalyss_SQL
 {
 
-    function __construct(Database $p_cn, $p_id=-1)
+    function __construct(DatabaseCore $p_cn, $p_id=-1)
     {
         $this->table="public.fiche_def_ref";
         $this->primary_key="frd_id";
diff --git a/include/database/jrn_def_sql.class.php b/include/database/jrn_def_sql.class.php
index 413e4d267..e1dd8a493 100644
--- a/include/database/jrn_def_sql.class.php
+++ b/include/database/jrn_def_sql.class.php
@@ -29,7 +29,7 @@ require_once NOALYSS_INCLUDE.'/class/database.class.php';
 class Jrn_def_SQL extends Noalyss_SQL
 {
 
-    function __construct(Database $p_cn, $p_id=-1)
+    function __construct(DatabaseCore $p_cn, $p_id=-1)
     {
         $this->table="public.jrn_def";
         $this->primary_key="jrn_def_id";
diff --git a/include/database/jrn_periode_sql.class.php b/include/database/jrn_periode_sql.class.php
index 9f440455f..4dfe90546 100644
--- a/include/database/jrn_periode_sql.class.php
+++ b/include/database/jrn_periode_sql.class.php
@@ -34,7 +34,7 @@ require_once NOALYSS_INCLUDE.'/class/database.class.php';
 class Jrn_periode_SQL extends Noalyss_SQL
 {
 
-    function __construct(Database $p_cn, $p_id=-1)
+    function __construct(DatabaseCore $p_cn, $p_id=-1)
     {
         $this->table="public.jrn_periode";
         $this->primary_key="id";
diff --git a/include/database/menu_ref_sql.class.php b/include/database/menu_ref_sql.class.php
index 5fa6982f5..c597c9c71 100644
--- a/include/database/menu_ref_sql.class.php
+++ b/include/database/menu_ref_sql.class.php
@@ -35,7 +35,7 @@ require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php';
 class Menu_Ref_SQL extends Noalyss_SQL
 {
 
-    function __construct(Database &$p_cn, $p_id=-1)
+    function __construct(DatabaseCore &$p_cn, $p_id=-1)
     {
         $this->table="public.menu_ref";
         $this->primary_key="me_code";
diff --git a/include/database/op_predef_sql.class.php b/include/database/op_predef_sql.class.php
index 8ae979c52..3bf2c80ed 100644
--- a/include/database/op_predef_sql.class.php
+++ b/include/database/op_predef_sql.class.php
@@ -29,7 +29,7 @@ require_once NOALYSS_INCLUDE.'/class/database.class.php';
 class Op_predef_SQL extends Noalyss_SQL
 {
 
-    function __construct(Database $p_cn,$p_id=-1)
+    function __construct(DatabaseCore $p_cn,$p_id=-1)
     {
         $this->table = "public.op_predef";
         $this->primary_key = "od_id";
diff --git a/include/database/parm_periode_sql.class.php b/include/database/parm_periode_sql.class.php
index 18991e97a..c9fc7ac98 100644
--- a/include/database/parm_periode_sql.class.php
+++ b/include/database/parm_periode_sql.class.php
@@ -35,7 +35,7 @@ require_once NOALYSS_INCLUDE.'/class/database.class.php';
 class Parm_periode_SQL extends Noalyss_SQL
 {
 
-function __construct(Database $p_cn,$p_id=-1)
+function __construct(DatabaseCore $p_cn,$p_id=-1)
   {
   $this->table = "public.parm_periode";
   $this->primary_key = "p_id";
diff --git a/include/database/payment_method_sql.class.php b/include/database/payment_method_sql.class.php
index 2154e9509..52adfa770 100644
--- a/include/database/payment_method_sql.class.php
+++ b/include/database/payment_method_sql.class.php
@@ -32,7 +32,7 @@ require_once NOALYSS_INCLUDE.'/class/database.class.php';
 class Payment_method_SQL extends Noalyss_SQL
 {
 
-    function __construct(Database $p_cn, $p_id=-1)
+    function __construct(DatabaseCore $p_cn, $p_id=-1)
     {
         $this->table="public.payment_method";
         $this->primary_key="mp_id";
diff --git a/include/database/poste_analytique_sql.class.php b/include/database/poste_analytique_sql.class.php
index a99b8a250..ed17f4d9b 100644
--- a/include/database/poste_analytique_sql.class.php
+++ b/include/database/poste_analytique_sql.class.php
@@ -35,7 +35,7 @@ require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php';
 class Poste_analytique_SQL extends Noalyss_SQL
 {
 
-    function __construct(Database $p_cn, $p_id=-1)
+    function __construct(DatabaseCore $p_cn, $p_id=-1)
     {
         $this->table="public.poste_analytique";
         $this->primary_key="po_id";
diff --git a/include/database/tag_group_sql.class.php b/include/database/tag_group_sql.class.php
index 279232377..ec82dedb8 100644
--- a/include/database/tag_group_sql.class.php
+++ b/include/database/tag_group_sql.class.php
@@ -30,7 +30,7 @@ require_once NOALYSS_INCLUDE.'/class/database.class.php';
 class Tag_group_SQL extends Noalyss_SQL
 {
 
-function __construct(Database $p_cn,$p_id=-1)
+function __construct(DatabaseCore $p_cn,$p_id=-1)
   {
   $this->table = "public.tag_group";
   $this->primary_key = "tg_id";
diff --git a/include/database/tva_rate_sql.class.php b/include/database/tva_rate_sql.class.php
index f23d98b52..9ad5d693f 100644
--- a/include/database/tva_rate_sql.class.php
+++ b/include/database/tva_rate_sql.class.php
@@ -31,7 +31,7 @@ require_once NOALYSS_INCLUDE.'/class/database.class.php';
 class Tva_rate_SQL extends Noalyss_SQL
 {
 
-    function __construct(Database $p_cn, $p_id=-1)
+    function __construct(DatabaseCore $p_cn, $p_id=-1)
     {
         $this->table="public.tva_rate";
         $this->primary_key="tva_id";
diff --git a/include/database/user_filter_sql.class.php b/include/database/user_filter_sql.class.php
index 55b59beab..3a1557da3 100644
--- a/include/database/user_filter_sql.class.php
+++ b/include/database/user_filter_sql.class.php
@@ -31,7 +31,7 @@ require_once NOALYSS_INCLUDE.'/class/database.class.php';
 class User_filter_SQL extends Noalyss_SQL
 {
 
-    function __construct(Database $p_cn, $p_id=-1)
+    function __construct(DatabaseCore $p_cn, $p_id=-1)
     {
         $this->table="public.user_filter";
         $this->primary_key="id";
diff --git a/include/database/v_tva_rate_sql.class.php b/include/database/v_tva_rate_sql.class.php
index 19c63fe3c..0b3de4c30 100644
--- a/include/database/v_tva_rate_sql.class.php
+++ b/include/database/v_tva_rate_sql.class.php
@@ -31,7 +31,7 @@ require_once NOALYSS_INCLUDE.'/class/database.class.php';
 class V_Tva_Rate_SQL extends Noalyss_SQL
 {
 
-    function __construct(Database $p_cn, $p_id=-1)
+    function __construct(DatabaseCore $p_cn, $p_id=-1)
     {
         $this->table="public.v_tva_rate";
         $this->primary_key="tva_id";

From 800247692d11492607ad5619a39245df6902f972 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sun, 7 Feb 2021 09:47:20 +0100
Subject: [PATCH 26/39] Cosmetic

---
 html/index.css                         |  5 ++--
 html/js/managetable.js                 |  7 ++++-
 html/style-classic7.css                | 40 +++++++++++++-------------
 include/class/fiche.class.php          |  2 +-
 include/lib/manage_table_sql.class.php |  4 ++-
 5 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/html/index.css b/html/index.css
index 437daa09a..0e0b06718 100644
--- a/html/index.css
+++ b/html/index.css
@@ -142,7 +142,7 @@ BODY {
         position:absolute;
         z-index:-1;
         height:auto;
-        width:10%;
+        width:125px;
         left:1%;
         top:30px;
 
@@ -196,11 +196,12 @@ BODY {
     }
     #recover_link {
         position:absolute;
-        margin-top:397px;
+        /*! margin-top:397px; */
         left:1px;
         background-color: white;
         bottom: initial;
         width: 20rem;
+        bottom: 30px;
     }
 }
 @media only screen and (min-width : 1100px) {
diff --git a/html/js/managetable.js b/html/js/managetable.js
index b6f2795de..da5b8605f 100644
--- a/html/js/managetable.js
+++ b/html/js/managetable.js
@@ -74,7 +74,7 @@ var ManageTable = function (p_table_name)
 {
     this.callback = "ajax.php"; //!< File to call
     this.control = "dtr"; //<! Prefix Id of dialog box, table, row
-    this.mt_style={position: "fixed", top:  '15%', width: "auto", "margin-left": "20%"};
+    this.mt_style={position: "fixed", top:  '15%', width: "auto", "max-width":"60%","margin-left": "20%"};
     this.sort_column=0;
     this.param = {"table": p_table_name, "ctl_id": this.control}; //<! default value to pass
     this.set_style=function(p_json) {
@@ -311,6 +311,11 @@ var ManageTable = function (p_table_name)
                     var obj = {id: control, "cssclass": "inner_box", "html": loading()};
                     add_div(obj);
                     var pos = calcy(250);
+                    if (window.innerWidth < 1200) {
+                        here.mt_style["margin-left"]="2%";
+                        here.mt_style["max-width"]="80%";
+                    }
+                    console.log(here.mt_style);
                     $(obj.id).setStyle(here.mt_style);
                     $(obj.id).update(x['html']);
                 } catch (e) {
diff --git a/html/style-classic7.css b/html/style-classic7.css
index daefc5af6..220667928 100644
--- a/html/style-classic7.css
+++ b/html/style-classic7.css
@@ -40,13 +40,13 @@ input{
     font-family: 'OpenSansRegular';
     padding : 2px;
      margin:2px;
-    border:solid 1px #4b4b91; 
+    border:1px solid #4b4b91; 
     font-size:14px;
     color:#4b4b91;
     
 }
 input:focus {
-    border:solid 1px orange;
+    border:1px solid orange;
     margin:1px;
     background-color:  lightyellow;
 }
@@ -64,7 +64,7 @@ table.sortable, table.table_large, table.result  ,table.resultfooter {
     border-spacing:  1px;
    /*border-collapse:collapse; */
     
-    border:1px #5D90CD solid;
+    border:1px solid #5D90CD;
     border-radius: 10px;
     -moz-border-radius: 10px;
     -webkit-border-radius: 10px;
@@ -238,7 +238,7 @@ table.document th{
 }
 
 table.mtitle {
-    border:0;
+    border:0px;
     text-align:center;
     /*! border-spacing: 0; */
 }
@@ -246,7 +246,7 @@ td.mshort {
     height:15px;
     width:60px;
     text-align:center;
-    border:  1px solid;
+    border:  1px solid transparent;
     color:#5D90CD ;
     background-color:#DDE6FF;
 }
@@ -287,7 +287,7 @@ td.mtitle a.mtitle {
     margin:0px;
     height:42px;
     padding:4px 0px 0px 0px;
-    border-radius:4px;
+    border-radius:6px;
 }
 @media only screen and (max-width:1280px) {
    td.mtitle a.mtitle {
@@ -512,7 +512,7 @@ a.document:hover {
 
 }
 .input_text_ro {
-    border:solid 1px #0000FF;
+    border:1px solid  #0000FF;
     background:#EDEDED;
     color:#0000FF;
     margin:1px;
@@ -523,7 +523,7 @@ a.document:hover {
     border-radius: 2px;
 }
 .input_text:focus {
-   border:solid 1px orange;
+   border:1px solid orange;
     margin:1px;
     background-color:  lightyellow;
 }
@@ -685,7 +685,7 @@ div.content div.pc_calendar tr{
 }
 div.pc_calendar td{
     width:14%;
-    border:#879ED4 solid 1px;
+    border:1px solid  #879ED4 ;
 }
 
 div.pc_calendar td.weekend {
@@ -805,7 +805,7 @@ a#smallanchorbutton, .smallbutton, a.smallbutton,div.content a.smallbutton .butt
     font-family: SansationLight;
 }
 td.tool {
-    border: solid 1px gray;
+    border: 1px solid gray;
     background-color: #FFFFFF;
     border-bottom-width: 2px;
     text-align:center;
@@ -820,7 +820,7 @@ td.tool {
     }
 }
 td.toolselected  {
-    border: solid 1px gray;
+    border: 1px solid gray;
     color: #FFFFFF;
     border-bottom-width: 2px;
     text-align:center;
@@ -917,7 +917,7 @@ div.inner_box  {
     overflow:hidden;
     z-index:3;
     position:absolute;
-    left : 5px;
+    left:10%;
     border:1px solid #00008B;
 -moz-box-shadow: 10px 10px 5px #888;
 /*! -webkit-box-shadow: 10px 10px 5px #888; */
@@ -933,7 +933,6 @@ div.inner_box  {
     width: 85%;
      border-radius: 9px; 
     /*! padding: 5px; */
-    left:10%;
     }
 }
 div.op_detail_title {
@@ -1272,7 +1271,7 @@ div.myfieldset
     margin-top: 5px;
     margin-left:5px;
     margin-right: 5px;
-    border:#EDF3FF 2px groove;
+    border:2px groove #EDF3FF ;
     border-radius: 4px;
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
@@ -1344,14 +1343,14 @@ div.menu3 {
     font-size : 1.2em;
 }*/
 textarea.itextarea{
-    border:solid #0000FF 1px;
+    border:1px solid #0000FF ;
     width:90%;
     margin-left:5%;
     height:120px;
 }
 
 textarea.itextarea:focus {
-    border:solid 1px orange;
+    border:1px solid orange;
     background-color:  lightyellow;
 }
 div#notice {
@@ -1805,12 +1804,13 @@ li.highlight a,tr.highlight a{
     color: inherit;
 }
 /*******************************************************************************
- * Inner_box on a larger screen
+ * Inner_box on a smaller screen
  *******************************************************************************/
 @media only screen and (min-width: 1280px) {
     div.inner_box  {
-        width: 75%;
-        left:5%;
+        width: 95%;
+        left:2%;
+        /*! margin-bottom: 2%; */
         padding-bottom: 10px;
         }
 }
@@ -2227,7 +2227,7 @@ div.content a.arrow {
  * Select box : list of actions
  */
 .select_box {
-    border:solid 0.5px darkblue;
+    border:0.5px  solid darkblue;
     background:white;
     width:455px;
     max-width:250px;
diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index ba01e63a5..3405c940f 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -808,7 +808,7 @@ class Fiche
         $enable_is->readOnly=$p_readonly;
                 
         $ret.=tr( 
-                td(_("Actif")).td($enable_is->input())
+                td(_("Actif"),'class="input_text"').td($enable_is->input(),'class="input_text"')
                 );
         
         
diff --git a/include/lib/manage_table_sql.class.php b/include/lib/manage_table_sql.class.php
index b0e8cfa1f..f0a3e645e 100644
--- a/include/lib/manage_table_sql.class.php
+++ b/include/lib/manage_table_sql.class.php
@@ -124,7 +124,9 @@ class Manage_Table_SQL
         // By default no js sort
         $this->sort_column="";
         $this->dialog_box="dtr";
-        $this->dialogbox_style=array("position"=> "fixed", "top"=>  '15%',"width"=> "auto", "margin-left"=> "20%");
+        $this->dialogbox_style=array("position"=> "fixed", "top"=>  '15%',"width"=> "auto", 
+            "max-width"=>"60%",
+            "margin-left"=> "20%");
     }
     /**
      * send the XML headers for the ajax call 

From 9d6cb61886b0efa4e0bd195534058093bad9c4c7 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 11 Feb 2021 10:50:34 +0100
Subject: [PATCH 27/39] Protect SQL , utilisation de bind variable

---
 include/class/fiche.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index 3405c940f..7c1257887 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -193,10 +193,10 @@ class Fiche
                    fiche
              natural join fiche_detail
 	     join jnt_fic_attr on (jnt_fic_attr.fd_id=fiche.fd_id and fiche_detail.ad_id=jnt_fic_attr.ad_id)
-             join attr_def on (attr_def.ad_id=fiche_detail.ad_id) where f_id=".$this->id.
+             join attr_def on (attr_def.ad_id=fiche_detail.ad_id) where f_id=$1".
              " order by jnt_order";
 
-        $Ret=$this->cn->exec_sql($sql);
+        $Ret=$this->cn->exec_sql($sql,[$this->id]);
         if ( ($Max=Database::num_row($Ret)) == 0 )
             return ;
         for ($i=0;$i<$Max;$i++)

From 812b2a8cf89da527cd304f0ac1d0eb0b2f477089 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 11 Feb 2021 10:50:52 +0100
Subject: [PATCH 28/39] documentation

---
 include/class/fiche_def.class.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/class/fiche_def.class.php b/include/class/fiche_def.class.php
index ddae639a1..a16c02d44 100644
--- a/include/class/fiche_def.class.php
+++ b/include/class/fiche_def.class.php
@@ -34,14 +34,14 @@ require_once NOALYSS_INCLUDE.'/lib/iradio.class.php';
  */
 class Fiche_Def
 {
-    var $cn;           // database connection
-    var $id;			// id (fiche_def.fd_id
-    var $label;			// fiche_def.fd_label
-    var $class_base;		// fiche_def.fd_class_base
-    var $fiche_def;		// fiche_def.frd_id = fiche_def_ref.frd_id
-    var $create_account;		// fd_create_account: flag
+    var $cn;           //!< database connection
+    var $id;			//!< id (fiche_def.fd_id
+    var $label;			//!< fiche_def.fd_label
+    var $class_base;		//!< fiche_def.fd_class_base
+    var $fiche_def;		//!< fiche_def.frd_id = fiche_def_ref.frd_id
+    var $create_account;		//!< fd_create_account: flag
     var $all;
-    var $attribut;		// get from attr_xxx tables
+    var $attribut;		//!< get from attr_xxx tables
     function __construct($p_cn,$p_id = 0)
     {
         $this->cn=$p_cn;
@@ -75,10 +75,10 @@ class Fiche_Def
     function getAttribut()
     {
         $sql="select * from jnt_fic_attr ".
-             " natural join attr_def where fd_id=".$this->id.
+             " natural join attr_def where fd_id= $1".
              " order by jnt_order";
 
-        $Ret=$this->cn->exec_sql($sql);
+        $Ret=$this->cn->exec_sql($sql,[$this->id]);
 
         if ( ($Max=Database::num_row($Ret)) == 0 )
             return ;

From e858180c1c6e248b9bdb6fa6bf966a3f615d14e9 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 11 Feb 2021 10:51:54 +0100
Subject: [PATCH 29/39] Manage_Table_SQL : flag to display a dynamic filter on
 the top of the table, default yes

---
 include/lib/manage_table_sql.class.php | 30 ++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/include/lib/manage_table_sql.class.php b/include/lib/manage_table_sql.class.php
index f0a3e645e..ff50a7bcf 100644
--- a/include/lib/manage_table_sql.class.php
+++ b/include/lib/manage_table_sql.class.php
@@ -82,6 +82,7 @@ class Manage_Table_SQL
     protected $a_info; //!< Array with the infotip
     protected $sort_column; //!< javascript sort , if empty there is no js sort
     protected $dialog_box; //!< ID of the dialog box which display the result of the ajax calls
+    protected $search_table; //!< boolean , by default true ,it is possible to search in the table, 
     const UPDATABLE=1;
     const VISIBLE=2;
 
@@ -127,8 +128,29 @@ class Manage_Table_SQL
         $this->dialogbox_style=array("position"=> "fixed", "top"=>  '15%',"width"=> "auto", 
             "max-width"=>"60%",
             "margin-left"=> "20%");
+        $this->search_table=true;
     }
     /**
+     * Get if we can search in the table
+     * @return boolean
+     */
+    public function get_search_table()
+    {
+        return $this->search_table;
+    }
+
+    /**
+     * Set the table searchable or not
+     * @param boolean  : true we can search 
+     * @return $this
+     */
+    public function set_search_table($search_table)
+    {
+        $this->search_table=$search_table;
+        return $this;
+    }
+
+        /**
      * send the XML headers for the ajax call 
      */
     function send_header()
@@ -680,7 +702,10 @@ function check()
                 $visible++;
             }
         }
-        echo _('Cherche')." ".HtmlInput::filter_table("tb".$this->object_name, $result, 1);
+        if ( $this->get_search_table() )
+        {
+            echo _('Cherche')." ".HtmlInput::filter_table("tb".$this->object_name, $result, 1);
+        }
         
         // Set a sort on a column if sort_column is not empty
         if ( $this->sort_column =="")
@@ -1023,7 +1048,8 @@ function check()
     }
     /**
      * @brief Save the record from Request into the DB and returns an XML
-     * to update the Html Element
+     * to update the Html Element. The function check() will be called before saving
+     * @see check
      * @return \DOMDocument
      */
     function ajax_save()

From 0873261c873f7f5d39e753b19bca4ecc1626ca68 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 11 Feb 2021 18:45:55 +0100
Subject: [PATCH 30/39] Update doc

---
 include/lib/data_sql.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/lib/data_sql.class.php b/include/lib/data_sql.class.php
index ac5e6d94f..2fe0698b6 100644
--- a/include/lib/data_sql.class.php
+++ b/include/lib/data_sql.class.php
@@ -27,13 +27,13 @@
 
 /**
  * @brief this an abstract class , all the SQL class, like noalyss_sql (table), 
- * Acc_Plan_SQL (based on a SQL not a table).
+ * Acc_Plan_SQL (based on a SQL not a table) or a view.
  * 
  * You must create a class extending this one, in the constructor
  * these variables have to be defined
  * 
  *   - table = name of the view or empty
- *   - select = name of the select
+ *   - sql = sql statement
  *   - name = array of column name, match between logic and actual name
  *   - type = array , match between column and type of data
  *   - default = array of column with a default value

From faaeb16c0554520803032af4490d354ac3129daa Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Mon, 15 Feb 2021 22:33:24 +0100
Subject: [PATCH 31/39] Cosmetic Document Option

---
 include/template/action_document_type_mtable_input.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/template/action_document_type_mtable_input.php b/include/template/action_document_type_mtable_input.php
index 8a2ed0bc1..16924b848 100644
--- a/include/template/action_document_type_mtable_input.php
+++ b/include/template/action_document_type_mtable_input.php
@@ -118,7 +118,6 @@ $select_comment_type->set_value(Document_Option::option_comment($table->dt_id));
 echo $select_comment_type->input();
 ?>
         </li> 
-    </ul>
     <li>
         <?php
         $i=new ICheckBox("videoconf_server",1);
@@ -132,6 +131,7 @@ echo $select_comment_type->input();
         echo $itVideoconfServer->input();
         ?>
     </li>
+    </ul>
 </div>
 <div>
      <h3 class="info" sytle="margin-block: 4px"><?php echo _("Options contact") ?></h3>

From aab7567c6905198b4da2fcec5b17ed60aa690ae2 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 24 Feb 2021 13:37:19 +0100
Subject: [PATCH 32/39] Bug : Bank , no warning if balance incorrect when the
 first amount is 0 Protect $_REQUEST , do no replace the first amount when it
 is corrected

---
 include/class/acc_ledger_fin.class.php | 19 +++++++++++++------
 include/compta_fin.inc.php             | 20 ++++++++++++--------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/include/class/acc_ledger_fin.class.php b/include/class/acc_ledger_fin.class.php
index de48fcb16..1aea14b4b 100644
--- a/include/class/acc_ledger_fin.class.php
+++ b/include/class/acc_ledger_fin.class.php
@@ -218,16 +218,23 @@ class Acc_Ledger_Fin extends Acc_Ledger
 			throw new Exception('Il n\'y a aucune opération', 12);
 
 		/* Check if the last_saldo and first_saldo are correct */
-		if (strlen(trim($last_sold)) != 0 && isNumber($last_sold) &&
-				strlen(trim($first_sold)) != 0 && isNumber($first_sold))
+		if (strlen(trim($last_sold)) != 0 
+                        && isNumber($last_sold) 
+                        && strlen(trim($first_sold)) != 0 
+                        && isNumber($first_sold)
+                    )
 		{
 			$diff = $last_sold - $first_sold;
 			$diff = round($diff, 2) - round($tot_amount, 2);
-			if ($first_sold != 0 && $last_sold != 0)
+                        $calc=bcadd($first_sold,$tot_amount,4);
+			if ($first_sold != 0 || $last_sold != 0)
 			{
-				if ($diff != 0)
-					throw new Exception('Le montant de l\'extrait est incorrect' .
-							$tot_amount . ' extrait ' . $diff, 13);
+				if ($diff != 0) {
+					throw new Exception(sprintf( _('Le montant de l\'extrait [%s] est incorrect,'.
+                                                " solde calculé [%s] , différence de [%s]") ,
+                                                $last_sold,$calc,$diff),13);
+                                    
+                                }
 			}
 		}
 	}
diff --git a/include/compta_fin.inc.php b/include/compta_fin.inc.php
index 5a60d628a..c9730f8e1 100644
--- a/include/compta_fin.inc.php
+++ b/include/compta_fin.inc.php
@@ -28,10 +28,10 @@ require_once NOALYSS_INCLUDE.'/lib/ipopup.class.php';
 global $g_user,$g_parameter;
 
 $gDossier=dossier::id();
-
+$http=new HttpInput();
 
 $cn=Dossier::connect();
-$menu_action="?ledger_type=fin&ac=".$_REQUEST['ac']."&".dossier::get();
+$menu_action="?ledger_type=fin&ac=".$http->request('ac')."&".dossier::get();
 
 $Ledger=new Acc_Ledger_Fin($cn,0);
 
@@ -40,7 +40,9 @@ $Ledger=new Acc_Ledger_Fin($cn,0);
 //--------------------------------------------------------------------------------
 
 if ( isset($_REQUEST['p_jrn']))
-	$Ledger->id=$_REQUEST['p_jrn'];
+{
+    $Ledger->id=$http->request('p_jrn',"number");
+}
 else
 {
 	$def_ledger=$Ledger->get_first('fin');
@@ -137,7 +139,7 @@ if ( $p_msg !="" ) echo '<span class="warning">'.$p_msg.'</span>';
 
 echo '<form class="print" name="form_detail" enctype="multipart/form-data" class="print" METHOD="POST">';
 echo HtmlInput::hidden('ledger_type','fin');
-echo HtmlInput::hidden('ac',$_REQUEST['ac']);
+echo HtmlInput::hidden('ac',$http->request("ac"));
 $array=( isset($correct))?$_POST:null;
 
 // show select ledger
@@ -149,13 +151,15 @@ try
     echo HtmlInput::submit('save',_('Sauve'));
     echo HtmlInput::reset(_('Effacer'));
 
+    $script="update_name();";
     if ( ! isset($_REQUEST['e_date'])&& $g_parameter->MY_DATE_SUGGEST=='Y')
     {
-            echo create_script(" get_last_date();ajax_saldo('first_sold');");
-    }else {
-            echo create_script(" ajax_saldo('first_sold');");
+            $script.=" get_last_date();";
     }
-    echo create_script(" update_name()");
+    if ( ! isset ($_REQUEST['first_sold']) ) {
+            $script.=" ajax_saldo('first_sold');";
+    }
+    echo create_script($script);
 } catch (Exception $ex) {
     echo $ex->getMessage();
 }

From 8bac5ddfb811e525985b65a663dc55c1ead12c61 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 9 Mar 2021 13:01:03 +0100
Subject: [PATCH 33/39] Bug limit card

---
 html/fid_card.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/html/fid_card.php b/html/fid_card.php
index 23080cc93..91ec491af 100644
--- a/html/fid_card.php
+++ b/html/fid_card.php
@@ -106,7 +106,9 @@ else
 {
     if (isset($_REQUEST['type']))
     {
-        if ($_REQUEST['type']=='gl' || $_REQUEST['type']=='') $filter_card='';
+        if ($_REQUEST['type']=='gl' || $_REQUEST['type']=='') {
+		    $filter_card='';
+        }
         else
         {
             $get_cred='jrn_def_fiche_cred';
@@ -168,7 +170,7 @@ if ($sql != false && sizeof($sql) != 0 )
     echo '</ul>';
     if (count($sql) > 12)
     {
-        printf ('<i>...'._('Résultat limité à 12').'  ...</i>');
+        printf ('<i>...'._('Résultat limité à %s').'  ...</i>',$limit);
     }
 }
 else

From 92f1140987d88739cba200b8b41576c355cd41d0 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 9 Mar 2021 13:02:44 +0100
Subject: [PATCH 34/39] Add a new parameter to title_box to enlarge the div, by
 default for all input dialog box of ManageTable

---
 html/js/scripts.js                     | 14 +++++++++
 html/style-classic7.css                | 20 +++++++++++++
 include/lib/html_input.class.php       |  5 +++-
 include/lib/icon_action.class.php      |  7 +++++
 include/lib/manage_table_sql.class.php | 40 +++++++++++++++++++++-----
 scenario/icon_actionTest.php           |  5 ++++
 6 files changed, 83 insertions(+), 8 deletions(-)

diff --git a/html/js/scripts.js b/html/js/scripts.js
index 5fce465d8..8218c27ca 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -4009,4 +4009,18 @@ function check_receipt_size(p_max_size,p_info)
     document.getElementById("receipt_info_id").innerHTML="";
     document.getElementById("form_file").submit();
     return true;
+}
+/**
+ * @brief toggle size of a div : fullsize or normal
+ * 
+ */
+function full_size(p_div) {
+    div_dom=document.getElementById(p_div);
+    if ( ! div_dom ) return;
+    if ( div_dom.hasClassName('fullsize')) {
+       div_dom.removeClassName('fullsize');$('size_'+p_div).innerHTML='&#xe82a;';
+    } else {
+        div_dom.addClassName('fullsize');$('size_'+p_div).innerHTML='&#xe83d;';
+    }
+    
 }
\ No newline at end of file
diff --git a/html/style-classic7.css b/html/style-classic7.css
index 220667928..0ceb33a39 100644
--- a/html/style-classic7.css
+++ b/html/style-classic7.css
@@ -2667,3 +2667,23 @@ span.tagcell {
 	padding: 0.25em 1em 0.25em 1em;
 	font-family: bold;
 }
+/**
+ * set a element full size
+ */
+.fullsize {
+    width:100% !important;
+    height: 100% !important;
+    overflow:auto !important;
+    top:0px !important;
+    position:fixed !important;
+    left:0px !important;
+}
+
+ /*********************************************
+ * If a input is incorrect
+  */
+ .input-error {
+     border:1px dotted red !important;
+     color:darkred !important;
+
+ }
\ No newline at end of file
diff --git a/include/lib/html_input.class.php b/include/lib/html_input.class.php
index e43c0ff53..3ed7595fc 100755
--- a/include/lib/html_input.class.php
+++ b/include/lib/html_input.class.php
@@ -837,7 +837,7 @@ class HtmlInput
      * @return type
      */
     static function title_box($p_name, $p_div, $p_mod="close", $p_js="",
-            $p_draggable="n")
+            $p_draggable="n",$p_enlarge='n')
     {
         $p_div=strip_tags($p_div);
         $r='<div class="bxbutton">';
@@ -847,6 +847,9 @@ class HtmlInput
         {
             $r.=Icon_Action::draggable($p_div);
         }
+        if ( $p_enlarge=='y') {
+            $r.=Icon_Action::full_size($p_div);
+        }
         if ($p_mod=='close')
         {
             $r.=Icon_Action::close($p_div, $p_js);
diff --git a/include/lib/icon_action.class.php b/include/lib/icon_action.class.php
index eef3a58a4..e9837127f 100644
--- a/include/lib/icon_action.class.php
+++ b/include/lib/icon_action.class.php
@@ -390,4 +390,11 @@ class Icon_Action
         if ( $p_value == 0 ) { return \Icon_Action::checked($p_id, $p_javascript); }
         if ( $p_value == 1 ) { return \Icon_Action::unchecked($p_id, $p_javascript);}
     }
+    static function full_size($p_div) {
+        $js=sprintf("full_size('%s')",$p_div);
+        $icon="&#xe82a;";
+        $r=sprintf('<span id="size_%s" onclick="%s" class="icon smallicon">%s</span>',
+                $p_div,$js,$icon);
+        return $r;
+    }
 }
diff --git a/include/lib/manage_table_sql.class.php b/include/lib/manage_table_sql.class.php
index ff50a7bcf..2b56a3ea8 100644
--- a/include/lib/manage_table_sql.class.php
+++ b/include/lib/manage_table_sql.class.php
@@ -88,7 +88,9 @@ class Manage_Table_SQL
 
     private $icon_mod; //!< place of right or left the icon update or mod, default right, accepted value=left,right,first column for mod
     private $icon_del; //!< place of right or left the icon update or mod, default right, accepted value=left,right
-    private $dialogbox_style;
+    private $dialogbox_style; 
+    private $button_add_top;  //!< place of the button add on the top, by default true
+    protected $title; //! < give the title of the diabox , default is Data
     /**
      * @brief Constructor : set the label to the column name,
      * the order of the column , set the properties and the
@@ -129,6 +131,20 @@ class Manage_Table_SQL
             "max-width"=>"60%",
             "margin-left"=> "20%");
         $this->search_table=true;
+        $this->button_add_top=true;
+        $this->title=_("Donnée");
+    }
+    /**
+     * Set the title of the diabox , default is Donnée
+     * @param type $p_title
+     */
+    function setTitle($p_title)
+    {
+        $this->title=$p_title;
+    }
+    function getTitle()
+    {
+        return $this->title;
     }
     /**
      * Get if we can search in the table
@@ -666,8 +682,18 @@ function check()
             }
         }
     }
+    public function get_button_add_top()
+    {
+        return $this->button_add_top;
+    }
 
-    /**
+    public function set_button_add_top($button_add_top)
+    {
+        $this->button_add_top=$button_add_top;
+        return $this;
+    }
+
+        /**
      * @brief display the data of the table
      * @param $p_order is the cond or order of the rows, 
      * if empty the primary key will be used
@@ -682,7 +708,7 @@ function check()
         }
         $ret=$this->table->seek($p_order, $p_array);
         $nb=Database::num_row($ret);
-        if ($this->can_append_row()==TRUE)
+        if ($this->can_append_row()==TRUE && $this->button_add_top == true)
         {
             echo HtmlInput::button_action(" "._("Ajout"),
                     sprintf("%s.input('-1','%s')", 
@@ -952,7 +978,7 @@ function check()
     /**
      * @brief display into a dialog box the datarow in order 
      * to be appended or modified. Can be override if you need
-     * a more complex form
+     * a more complex form.
      */
     function input()
     {
@@ -1132,7 +1158,7 @@ function check()
 
             ob_start();
 
-            echo HtmlInput::title_box(_("Donnée"), $this->dialog_box,"close","","y");
+            echo HtmlInput::title_box($this->getTitle(), $this->dialog_box,"close","","y","y");
             printf('<form id="frm%s_%s" method="POST" onsubmit="%s.save(\'frm%s_%s\');return false;">',
                     $this->object_name, $this->table->get_pk_value(),
                     $this->object_name, $this->object_name,
@@ -1147,10 +1173,10 @@ function check()
             $this->display_error();
             echo '<ul class="aligned-block">',
             '<li>',
-            HtmlInput::submit('update', _("OK")),
+            HtmlInput::submit('update', _("Sauver")),
             '</li>',
             '<li>',
-            HtmlInput::button_action(_("Cancel"), $close, "", "smallbutton"),
+            HtmlInput::button_action(_("Annuler"), $close, "", "smallbutton"),
             '</li>',
             '</ul>';
             echo "</form>";
diff --git a/scenario/icon_actionTest.php b/scenario/icon_actionTest.php
index 35c33a98c..c9037a14d 100644
--- a/scenario/icon_actionTest.php
+++ b/scenario/icon_actionTest.php
@@ -83,4 +83,9 @@ include_once NOALYSS_INCLUDE."/lib/icon_action.class.php";
 </p>
 <p>
     Comment<?php echo Icon_Action::comment("Allo ? l'heure d'été ?")?>
+</p>
+<p>
+<div id="enlarge_it" class="inner_box">
+    enlarge <?php echo Icon_Action::full_size("enlarge_it")?>
+</div>
 </p>
\ No newline at end of file

From f92a724c0ce655038a16967c9f61b4d979ed61a9 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Tue, 9 Mar 2021 14:28:53 +0100
Subject: [PATCH 35/39] Fix special char with input-select

---
 include/lib/inplace_edit.class.php |  2 ++
 include/lib/iselect.class.php      |  6 +++---
 scenario/inplace_edit.test.php     | 10 +++-------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/include/lib/inplace_edit.class.php b/include/lib/inplace_edit.class.php
index 2a492dd33..1868061b2 100644
--- a/include/lib/inplace_edit.class.php
+++ b/include/lib/inplace_edit.class.php
@@ -111,6 +111,7 @@ EOF;
     function value()
     {
         $v=$this->input->get_value();
+        $v=html_entity_decode($v);
          if ( $this->input instanceof ITextarea) {
             echo '<span class="input_text" id="'.$this->input->id.'edit" >';
             echo '<pre class="field_follow_up">';
@@ -140,6 +141,7 @@ EOF;
     function input() {
         ob_start();
         $v=$this->input->get_value();
+        $v=html_entity_decode($v);
         if ( $this->input instanceof ITextarea) {
             echo '<span class="" id="'.$this->input->id.'edit" >';
             echo '<pre class="field_follow_up">';
diff --git a/include/lib/iselect.class.php b/include/lib/iselect.class.php
index 35d515bed..2df854edc 100644
--- a/include/lib/iselect.class.php
+++ b/include/lib/iselect.class.php
@@ -65,7 +65,7 @@ class ISelect extends HtmlInput
         {
             $checked=($this->selected==$this->value[$i]['value'])?"SELECTED":"";
             $a.='<OPTION VALUE="'.$this->value[$i]['value'].'" '.$checked.'>';
-            $a.=$this->value[$i]['label'];
+            $a.=strip_tags($this->value[$i]['label']);
         }
         $a.="</SELECT>";
         if ( $this->table == 1 )		  $a='<td>'.$a.'</td>';
@@ -80,7 +80,7 @@ class ISelect extends HtmlInput
         {
             if ($this->selected==$this->value[$i]['value'] )
             {
-                $r=h($this->value[$i]['label']);
+                $r=htmlentities($this->value[$i]['label'],ENT_QUOTES|ENT_HTML5,'UTF-8',true);
 
             }
         }
@@ -96,7 +96,7 @@ class ISelect extends HtmlInput
         {
             if ($this->selected==$this->value[$i]['value'] )
             {
-                $r=h($this->value[$i]['label']);
+                $r=$this->value[$i]['label'];
 
             }
         }
diff --git a/scenario/inplace_edit.test.php b/scenario/inplace_edit.test.php
index aa5261aae..ff67b7d00 100644
--- a/scenario/inplace_edit.test.php
+++ b/scenario/inplace_edit.test.php
@@ -23,7 +23,7 @@
 if (!defined('ALLOWED'))
     die('Appel direct ne sont pas permis');
 //@description:Test the class Inplace_Edit , ajax and javascript
-
+$db=Dossier::connect();
 
 require_once NOALYSS_INCLUDE . '/lib/itext.class.php';
 require_once NOALYSS_INCLUDE . '/lib/inum.class.php';
@@ -44,13 +44,9 @@ if (!isset($_REQUEST["TestAjaxFile"])) {
     echo "TEXT #".$ajax_hello->input()."#";
     
     $select = new ISelect ("ajax_select");
+    $select->value=$db->make_array("select fd_id,fd_label from fiche_def order by 2");
     $select->id=uniqid("sel");
-    $select->value=[ 
-        ["value"=>1,"label"=>"ONE"],
-        ["value"=>2,"label"=>"TWO"],
-        ["value"=>3,"label"=>"THREE"],
-        ];
-    $select->selected="2";
+    $select->selected="10001";
     $ajax_select = new Inplace_Edit($select);
     $ajax_select->set_callback("ajax_test.php");
     $ajax_select->add_json_param("TestAjaxFile", __FILE__) ;

From ec47e9cdf3df62b0ebd5826b99b172336b69c27a Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 10 Mar 2021 09:31:55 +0100
Subject: [PATCH 36/39] htmlspecialchars use HTML5 and UTF8

---
 include/lib/ac_common.php | 81 +++++++++++++++++++++++++--------------
 1 file changed, 52 insertions(+), 29 deletions(-)

diff --git a/include/lib/ac_common.php b/include/lib/ac_common.php
index 6f27cdf30..05b5a91e8 100644
--- a/include/lib/ac_common.php
+++ b/include/lib/ac_common.php
@@ -32,12 +32,12 @@ require_once NOALYSS_INCLUDE.'/lib/function_javascript.php';
 
 /**
  * \brief to protect again bad characters which can lead to a cross scripting attack
-  the string to be diplayed must be protected
+  the string to be diplayed must be protected. Side effects with htmlentities, especially for
+ * the date (transform dot in &periode;) and number
  */
-
 function h($p_string)
 {
-    return htmlspecialchars($p_string);
+    return htmlspecialchars($p_string,ENT_QUOTES|ENT_HTML5,'UTF-8',true);
 }
 
 function span($p_string, $p_extra='')
@@ -47,31 +47,31 @@ function span($p_string, $p_extra='')
 
 function hi($p_string)
 {
-    return '<i>' . htmlspecialchars($p_string) . '</i>';
+    return '<i>' . h($p_string) . '</i>';
 }
 
 function hb($p_string)
 {
-    return '<b>' . htmlspecialchars($p_string) . '</b>';
+    return '<b>' . h($p_string) . '</b>';
 }
 
 function th($p_string, $p_extra='',$raw='')
 {
-    return '<th  ' . $p_extra . '>' . htmlspecialchars($p_string).$raw . '</th>';
+    return '<th  ' . $p_extra . '>' . h($p_string).$raw . '</th>';
 }
 
 function h2info($p_string)
 {
-    return '<h2 class="info">' . htmlspecialchars($p_string) . '</h2>';
+    return '<h2 class="info">' . h($p_string) . '</h2>';
 }
 
 function h2($p_string, $p_class="",$raw="")
 {
-    return '<h2 ' . $p_class . '>' . $raw.htmlspecialchars($p_string) . '</h2>';
+    return '<h2 ' . $p_class . '>' . $raw.h($p_string) . '</h2>';
 }
 function h1($p_string, $p_class="")
 {
-    return '<h1 ' . $p_class . '>' . htmlspecialchars($p_string) . '</h1>';
+    return '<h1 ' . $p_class . '>' . h($p_string) . '</h1>';
 }
 /**
  * \brief surround the string with td
@@ -522,15 +522,23 @@ function ShowItem($p_array, $p_dir='V', $class="mtitle", $class_ref="mtitle", $d
 	    $title = "";
 	    $set = "XX";
 	    if (isset($href[2]))
-		$title = $href[2];
-	    if (isset($href[3]))
-		$set = $href[3];
+            {
+                $title=$href[2];
+            }
+            if (isset($href[3]))
+            {
+                $set=$href[3];
+            }
 
-	    if ($set == $default)
-		$ret.='<TR><TD CLASS="selectedcell"><A class="' . $class_ref . '" HREF="' . $href[0] . '" title="' . $title . '" ' . $javascript . '>' . $href[1] . '</A></TD></TR>';
-	    else
-		$ret.='<TR><TD CLASS="' . $class . '"><A class="' . $class_ref . '" HREF="' . $href[0] . '" title="' . $title . '" ' . $javascript . '>' . $href[1] . '</A></TD></TR>';
-	}
+            if ($set==$default)
+            {
+                $ret.='<TR><TD CLASS="selectedcell"><A class="'.$class_ref.'" HREF="'.$href[0].'" title="'.$title.'" '.$javascript.'>'.$href[1].'</A></TD></TR>';
+            }
+            else
+            {
+                $ret.='<TR><TD CLASS="'.$class.'"><A class="'.$class_ref.'" HREF="'.$href[0].'" title="'.$title.'" '.$javascript.'>'.$href[1].'</A></TD></TR>';
+            }
+        }
     }
     //direction Horizontal
     else if ($p_dir == 'H')
@@ -685,13 +693,17 @@ function sql_filter_per($p_cn, $p_from, $p_to, $p_form='p_id', $p_field='jr_tech
             throw new Exception("SFP2"._("Date invalide"));
         }
     }
-    if ($p_from == $p_to)
-	$periode = " $p_field = (select p_id from parm_periode " .
-		" where " .
-		" p_start = to_date('$p_from','DD.MM.YYYY')) ";
+    if ($p_from==$p_to)
+    {
+        $periode=" $p_field = (select p_id from parm_periode ".
+                " where ".
+                " p_start = to_date('$p_from','DD.MM.YYYY')) ";
+    }
     else
-	$periode = "$p_field in (select p_id from parm_periode " .
-		" where p_start >= to_date('$p_from','DD.MM.YYYY') and p_end <= to_date('$p_to','DD.MM.YYYY')) ";
+    {
+        $periode="$p_field in (select p_id from parm_periode ".
+                " where p_start >= to_date('$p_from','DD.MM.YYYY') and p_end <= to_date('$p_to','DD.MM.YYYY')) ";
+    }
     return $periode;
 }
 
@@ -709,7 +721,9 @@ function alert($p_msg, $buffer=false)
     $r.= '</script>';
 
     if ($buffer)
-	return $r;
+    {
+        return $r;
+    }
     echo $r;
 }
 
@@ -719,14 +733,23 @@ function alert($p_msg, $buffer=false)
 function set_language()
 {
     // desactivate local check
-    if ( defined("LOCALE") && LOCALE==0 ) return;
-    if ( ! isset ($_SESSION[SESSION_KEY.'g_lang'])) return;
-    
+    if (defined("LOCALE")&&LOCALE==0)
+    {
+        return;
+    }
+    if (!isset($_SESSION[SESSION_KEY.'g_lang']))
+    {
+        return;
+    }
+
     /*
      * If translation is not supported by current
      */
-    if (! function_exists("bindtextdomain")) return;
-    
+    if (!function_exists("bindtextdomain"))
+    {
+        return;
+    }
+
     $dir = "";
     // set differently the language depending of the operating system
     if (what_os() == 1)

From 1ca321a1b5c0c698ae37325eed5262479a6ec8cb Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 10 Mar 2021 09:32:54 +0100
Subject: [PATCH 37/39] Bug : filter of the search and tag

---
 include/ajax/ajax_search_filter.php | 1 +
 include/class/tag.class.php         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/include/ajax/ajax_search_filter.php b/include/ajax/ajax_search_filter.php
index c27458f11..dbf010956 100644
--- a/include/ajax/ajax_search_filter.php
+++ b/include/ajax/ajax_search_filter.php
@@ -213,6 +213,7 @@ if ($op=="delete_search_operation")
 if ($op=='display_filter_tag')
 {
     $tag=$http->request("uf_tag");
+    if ( trim($tag)=="") {return;}
     $div=$http->request("div");
     $aTag=explode(',', $tag);
     if (is_array($aTag))
diff --git a/include/class/tag.class.php b/include/class/tag.class.php
index 5672adf08..5b2097e34 100644
--- a/include/class/tag.class.php
+++ b/include/class/tag.class.php
@@ -25,6 +25,7 @@ class Tag
     function __construct($p_cn,$id=-1)
     {
         $this->cn=$p_cn;
+        $id = (trim($id)=="")?-1:$id;
         $this->data=new Tag_SQL($p_cn,$id);
     }
     public function get_data()

From 2ce39d8d7fc176579a99f1e07f7aef117f036feb Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 10 Mar 2021 15:08:50 +0100
Subject: [PATCH 38/39] Improve scenario test

---
 html/test.php                        |  6 +++---
 include/lib/icon_action.class.php    | 17 +++++++++--------
 include/lib/input_checkbox.class.php |  5 +++--
 scenario/HtmlInput.test.php          | 14 ++++++++++----
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/html/test.php b/html/test.php
index d8b890a74..bdd2ef980 100644
--- a/html/test.php
+++ b/html/test.php
@@ -38,12 +38,12 @@ require_once('lib/icon_action.class.php');
 require_once ('lib/function_javascript.php');
 require_once 'class/user.class.php';
 require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
-
+html_page_start();
 global $http;
 
 $http=new HttpInput();
 
-load_all_script();
+
 $gDossier=$http->request('gDossier',"number", -1);
 if ($gDossier==-1)
 {
@@ -64,7 +64,7 @@ if (!file_exists('authorized_debug'))
     exit();
 }
 define('ALLOWED', 1);
-html_page_start("Classic");
+load_all_script();
 /******************************************************************************************************************/
 /*  Utilities 
 /******************************************************************************************************************/
diff --git a/include/lib/icon_action.class.php b/include/lib/icon_action.class.php
index e9837127f..a1dab5910 100644
--- a/include/lib/icon_action.class.php
+++ b/include/lib/icon_action.class.php
@@ -368,27 +368,28 @@ class Icon_Action
         if ( $p_value == 0 ) { return \Icon_Action::iconoff($p_id, $p_javascript,$p_style);}
     }
     
-    static function checked ($p_id,$p_javascript="") {
+    static function checked ($p_id,$p_javascript="",$p_classrange="") {
         $lock_cur="&#xe741;";
-        
-        $r=sprintf( '<span id="%s" onclick="%s" class="icon smallicon">%s</span>',
+        $r=sprintf( '<span id="%s" onclick="%s" class="icon smallicon %s" >%s</span>',
                 $p_id,
                 $p_javascript, 
+                $p_classrange,
                 $lock_cur);
         return $r;
     }
-    static function unchecked ($p_id,$p_javascript="") {
+    static function unchecked ($p_id,$p_javascript="",$p_classrange="") {
         $lock_cur="&#xf096";
         
-        $r=sprintf( '<span id="%s" onclick="%s" class="icon smallicon" >%s</span>',
+        $r=sprintf( '<span id="%s" onclick="%s" class="icon smallicon %s" >%s</span>',
                 $p_id,
                 $p_javascript, 
+                $p_classrange,
                 $lock_cur);
         return $r;
     }
-    static function checkbox ($p_id,$p_javascript="",$p_value=0) {
-        if ( $p_value == 0 ) { return \Icon_Action::checked($p_id, $p_javascript); }
-        if ( $p_value == 1 ) { return \Icon_Action::unchecked($p_id, $p_javascript);}
+    static function checkbox ($p_id,$p_javascript="",$p_value=0,$p_classrange="") {
+        if ( $p_value == 0 ) { return \Icon_Action::checked($p_id, $p_javascript,$p_classrange); }
+        if ( $p_value == 1 ) { return \Icon_Action::unchecked($p_id, $p_javascript,$p_classrange);}
     }
     static function full_size($p_div) {
         $js=sprintf("full_size('%s')",$p_div);
diff --git a/include/lib/input_checkbox.class.php b/include/lib/input_checkbox.class.php
index a81ac5780..a6d67938b 100644
--- a/include/lib/input_checkbox.class.php
+++ b/include/lib/input_checkbox.class.php
@@ -50,6 +50,7 @@ class InputCheckBox extends HtmlInput
         $this->id_hidden=$p_id;
         $this->id_icon=uniqid($p_id);
         $this->javascript="";
+        $this->classrange="";
     }
 
     function input($p_name=NULL, $p_value=0)
@@ -75,9 +76,9 @@ class InputCheckBox extends HtmlInput
                 $this->javascript);
         
         if ($this->value=='1') {
-            $r.=Icon_Action::checked($this->id_icon,$this->javascript);
+            $r.=Icon_Action::checked($this->id_icon,$this->javascript,$this->classrange);
         } else {
-            $r.=Icon_Action::unchecked($this->id_icon,$this->javascript);
+            $r.=Icon_Action::unchecked($this->id_icon,$this->javascript,$this->classrange);
         }
         return $r;
     }
diff --git a/scenario/HtmlInput.test.php b/scenario/HtmlInput.test.php
index 54675cb38..0a0c1e02f 100644
--- a/scenario/HtmlInput.test.php
+++ b/scenario/HtmlInput.test.php
@@ -92,12 +92,15 @@ $http=new HttpInput();
     for ($i = 0 ; $i < 10 ; $i ++) :
         echo '<li>';
             $check[$i]=new InputCheckBox("check[]",1,"checkid".$i);
+            $check[$i]->classrange="improvechkbox";
             echo $i, " - name = ",$check[$i]->value_container,",id = " , $check[$i]->id_icon,$check[$i]->input();
+            
         echo '</li>';
     endfor;
     ?>
     </ul>
-    
+    <aside>les selections par plage  ne fonctionnent pas encore avec les CHECKBOX améliorés</aside>
+    <script> activate_checkbox_range("improvechkbox")</script>
     <h1>Submit</h1>
     <pre>
         echo HtmlInput::submit("submit", _("Envoi"));
@@ -129,7 +132,7 @@ $http=new HttpInput();
     Fichier - IFile
 </h2>
 <form method="POST" enctype="application/x-www-form-urlencoded" onsubmit="check_size();return false;">
-
+    <span id="file-info"></span>
 <?php
 
     $file=new IFILE("file_to_upload");
@@ -147,10 +150,13 @@ $http=new HttpInput();
         var aFile=document.getElementsByTagName("input");
         console.debug("afile");
         console.debug(aFile);
-
+        var info=document.getElementById("file-info");
         for (var i = 0;i < aFile.length;i++) {
-        if ( aFile[i].getAttribute("type")=="file" ) {
+        if ( aFile[i].getAttribute("type")==="file" ) {
+            
                 console.debug("file"+aFile[i].files[0].size);
+                info.innerHTML+="file : "+aFile[i].files[0].name+":"+aFile[i].files[0].size+" bytes <br>";
+                
         }
 
     }

From f0e5fea3e0a0064a6979815289cc9b7e9bf38525 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Wed, 10 Mar 2021 15:09:21 +0100
Subject: [PATCH 39/39] create dossier

---
 unit-test/create-dossier-test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unit-test/create-dossier-test.sh b/unit-test/create-dossier-test.sh
index c1484f2b9..92bd5e117 100755
--- a/unit-test/create-dossier-test.sh
+++ b/unit-test/create-dossier-test.sh
@@ -2,7 +2,7 @@
 
 export PGCLUSTER=10/main
 DOSSIER_TEST=rel70dossier25
-FILE_TEST=dossiertest210126-1111.sql
+FILE_TEST=dossiertest210204-1402.sql
 
 dropdb $DOSSIER_TEST
 createdb $DOSSIER_TEST