From 39e01d2a75173fa8864c923731e8ce10611fae48 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Mon, 23 Sep 2024 11:32:47 +0200
Subject: [PATCH] Synchro with stable DO NOT INTEGRATE to pre-stable nor stable

---
 html/install.php                         |  2 +-
 include/lib/icard.class.php              |  3 +--
 include/lib/manage_table_sql.class.php   | 23 +++++++++--------------
 include/sql/patch/upgrade201.sql         |  4 ++--
 include/tax_summary.inc.php              |  1 -
 include/template/card_result.php         |  2 +-
 include/template/tax_summary_display.php |  2 +-
 7 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/html/install.php b/html/install.php
index b61070a90..f30d2a8a2 100644
--- a/html/install.php
+++ b/html/install.php
@@ -168,7 +168,7 @@ content[203]="<?php echo _("Utilisateur de la base de donnée postgresql")?>";
 content[204]="<?php echo _("Mot de passe de l'utilisateur de Postgresql")?>";
 content[205]="<?php echo _("Port pour postgresql")?>";
 content[206]="<?php echo _("En version mono dossier, le nom de la base de données doit être mentionné")?>";
-content[207]="<?php echo _("Vous devez choisir si NOALYSS est installé sur  un server mutualisé qui ne permet qu'une seule base de données")?>";
+content[207]="<?php echo _("Vous devez choisir si NOALYSS est installé sur l'un de vos servers ou sur un server mutualisé qui ne donne qu'une seule base de données")?>";
 content[208]="<?php echo _("Serveur postgresql")?>";
 content[209]="<?php echo _("Mot de passe administrateur, il peut être changé ensuite dans les préférences")?>";
 content[210]="<?php echo _("login administrateur")?>";
diff --git a/include/lib/icard.class.php b/include/lib/icard.class.php
index 246031414..01b5a8dc0 100644
--- a/include/lib/icard.class.php
+++ b/include/lib/icard.class.php
@@ -402,8 +402,7 @@ class ICard extends HtmlInput
         $this->callback=$p_name;
     }
 
-    /**
-     * \brief set the javascript callback function
+    /**\brief set the javascript callback function
      * by default it is update_value called AFTER an item has been selected
      * \param $p_name callback function name
      */
diff --git a/include/lib/manage_table_sql.class.php b/include/lib/manage_table_sql.class.php
index 1bcda177a..e0f2b6b39 100644
--- a/include/lib/manage_table_sql.class.php
+++ b/include/lib/manage_table_sql.class.php
@@ -824,22 +824,11 @@ function check()
         $ret=$this->table->seek($p_order, $p_array);
         return $ret;
     }
-
-    /**
-     * @brief echo the HTML to have a button add
-     * @return void
-     */
-    protected function create_button_add() {
-        echo HtmlInput::button_action(" "._("Ajout"),
-            sprintf("%s.input('-1','%s')",
-                $this->object_name,
-                $this->object_name), "xx", "smallbutton", BUTTONADD);
-    }
     /**
      * @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
-     * @param $p_array array of the bind variables of the SQL ($p_order)
+     * @param $p_array array of the bind variables
      * @note the function create_js_script MUST be called before this function
      */
     function display_table($p_order="", $p_array=NULL)
@@ -848,7 +837,10 @@ function check()
         $nb=Database::num_row($ret);
         if ($this->can_append_row()==TRUE && $this->button_add_top == true)
         {
-           echo $this->create_button_add();
+            echo HtmlInput::button_action(" "._("Ajout"),
+                    sprintf("%s.input('-1','%s')", 
+                            $this->object_name,
+                            $this->object_name), "xx", "smallbutton", BUTTONADD);
         }
         $nb_order=count($this->a_order);
         $virg=""; $result="";
@@ -888,7 +880,10 @@ function check()
         echo "</table>";
         if ($this->can_append_row()==TRUE)
         {
-            echo $this->create_button_add();
+            echo HtmlInput::button_action(" "._("Ajout"),
+                    sprintf("%s.input('-1','%s')", 
+                            $this->object_name,
+                            $this->object_name), "xx", "smallbutton", BUTTONADD);
         }
         printf('<script> alternate_row_color("tb%s");</script>',
                 $this->object_name);
diff --git a/include/sql/patch/upgrade201.sql b/include/sql/patch/upgrade201.sql
index a688665be..e608ee68e 100644
--- a/include/sql/patch/upgrade201.sql
+++ b/include/sql/patch/upgrade201.sql
@@ -1,6 +1,6 @@
 begin;
 
-drop VIEW public.v_quant_detail;
+drop VIEW if exists public.v_quant_detail;
 
 CREATE OR REPLACE VIEW public.v_quant_detail
 AS  WITH quant AS (
@@ -70,4 +70,4 @@ AS  WITH quant AS (
 ;
 
 insert into version (val,v_description) values (202,'Bug with reconcile, improve view');
-commit;
\ No newline at end of file
+commit;
diff --git a/include/tax_summary.inc.php b/include/tax_summary.inc.php
index 8230928d4..7f0b67bcb 100644
--- a/include/tax_summary.inc.php
+++ b/include/tax_summary.inc.php
@@ -63,7 +63,6 @@ if ( $http->get("do","string","no") == "display")
             echo '<span class="warning">';
             echo $e->getMessage();
             echo '</span>';
-            throw $e;
 
         }
         echo '<ul class="aligned-block">';
diff --git a/include/template/card_result.php b/include/template/card_result.php
index 1e6078e9d..4e5f7f5f5 100644
--- a/include/template/card_result.php
+++ b/include/template/card_result.php
@@ -67,7 +67,7 @@ if ( $accvis == 1 ) :
 <?php endfor; ?>
 </table>
 <span style="font-style: italic;">
-    <?php printf ( _("Nombre d'enregistrements trouvés:%s"),$total_card); ?>
+    <?php echo _("Nombre d'enregistrements trouvé:$total_card"); ?>
 </span>
 <br>
 </div>
diff --git a/include/template/tax_summary_display.php b/include/template/tax_summary_display.php
index a3cbdf9b3..c40e6983a 100644
--- a/include/template/tax_summary_display.php
+++ b/include/template/tax_summary_display.php
@@ -235,7 +235,7 @@ for ($i=0;$i < $nb_array;$i++):
             // add a link to see the detail in ajax : ajax_ledger.php
             $js_detail = $this->build_link_detail($dossier_id, $this->date_start, $this->date_end,$array[$i]['jrn_def_id'], $array[$i]['qp_vat_code']);
             ?>
-            <a href="javascript:void(0)" onclick="<?=$js_detail?>" class="super" >Détails</a>
+            <a href="javascript:void(0)" onclick="<?=$js_detail?>" class="super">Détails</a>
         </td>
         <td>
             <?=$array[$i]['tva_rate']*100?>%